Mercurial > hg > openttd

changeset 7013:4b344122f60d draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r10269) -Fix [FS#912]: station ratings were shown for all cargos instead of only the cargos that have been transported.
author rubidium <rubidium@openttd.org>
date Fri, 22 Jun 2007 17:34:04 +0000
parents e879a233044e
children d03670858cef
files src/station.h src/station_cmd.cpp
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/station.h
+++ b/src/station.h
@@ -20,7 +20,7 @@
 struct GoodsEntry {
 	GoodsEntry() :
 		acceptance(false),
-		days_since_pickup(0),
+		days_since_pickup(255),
 		rating(INITIAL_STATION_RATING),
 		last_speed(0),
 		last_age(255)
--- a/src/station_cmd.cpp
+++ b/src/station_cmd.cpp
@@ -2944,7 +2944,7 @@
 	for (CargoID i = 0; i < num_cargo; i++) {
 		GoodsEntry *ge = &st->goods[i];
 		SlObject(ge, _goods_desc);
-		if (_waiting_acceptance != 0) {
+		if (CheckSavegameVersion(68)) {
 			ge->acceptance = HASBIT(_waiting_acceptance, 15);
 			if (GB(_waiting_acceptance, 0, 12) != 0) {
 				/* Don't construct the packet with station here, because that'll fail with old savegames */
@@ -2958,6 +2958,8 @@
 				cp->days_in_transit = _cargo_days;
 				cp->feeder_share    = _cargo_feeder_share;
 				ge->cargo.Append(cp);
+			} else {
+				ge->days_since_pickup = 255;
 			}
 		}
 	}