cpp/openttd-patchpack/source Changeset - r10328:7e960d01082d

Changeset - r10328:7e960d01082d

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

frosch - 16 years ago 2008-11-13 20:26:06
frosch@openttd.org

(svn r14578) -Fix (r2389, r10811)[FS#Vikthor]: Allow capacity callbacks (15, 36) to return zero capacity.

2 files changed with 13 insertions and 17 deletions:

src/roadveh_cmd.cpp

src/train_cmd.cpp

0 comments (0 inline, 0 general)

src/roadveh_cmd.cpp

➞

Show inline comments

@@ @@ -2085,8 +2085,6 @@ CommandCost CmdRefitRoadVeh(TileIndex ti @@
+			}
+		}
 		if (capacity == 0) continue;
 		total_capacity += capacity;
 		if (IsHumanCompany(v->owner) && new_cid != v->cargo_type) {

src/train_cmd.cpp

➞

Show inline comments

@@ @@ -2080,21 +2080,19 @@ CommandCost CmdRefitRailVehicle(TileInde @@
+				}
+			}
 			if (amount != 0) {
 				if (new_cid != v->cargo_type) {
 					cost.AddCost(GetRefitCost(v->engine_type));
+				}
 				num += amount;
 				if (flags & DC_EXEC) {
 					v->cargo.Truncate((v->cargo_type == new_cid) ? amount : 0);
 					v->cargo_type = new_cid;
 					v->cargo_cap = amount;
 					v->cargo_subtype = new_subtype;
 					InvalidateWindow(WC_VEHICLE_DETAILS, v->index);
 					InvalidateWindow(WC_VEHICLE_DEPOT, v->tile);
 					InvalidateWindowClassesData(WC_TRAINS_LIST, 0);
+				}
 			if (new_cid != v->cargo_type) {
 				cost.AddCost(GetRefitCost(v->engine_type));
+			}
 			num += amount;
 			if (flags & DC_EXEC) {
 				v->cargo.Truncate((v->cargo_type == new_cid) ? amount : 0);
 				v->cargo_type = new_cid;
 				v->cargo_cap = amount;
 				v->cargo_subtype = new_subtype;
 				InvalidateWindow(WC_VEHICLE_DETAILS, v->index);
 				InvalidateWindow(WC_VEHICLE_DEPOT, v->tile);
 				InvalidateWindowClassesData(WC_TRAINS_LIST, 0);
+			}
+		}
 	} while ((v = v->Next()) != NULL && !only_this);

0 comments (0 inline, 0 general)