mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

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

release/0.7
frosch 2008-11-13 20:26:06 +00:00
parent f28172c5f4
commit 1a866c7552
2 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/roadveh_cmd.cpp
View File

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

2
src/train_cmd.cpp
View File

@ -2080,7 +2080,6 @@ CommandCost CmdRefitRailVehicle(TileIndex tile, uint32 flags, uint32 p1, uint32
} }
} }
if (amount != 0) {
if (new_cid != v->cargo_type) { if (new_cid != v->cargo_type) {
cost.AddCost(GetRefitCost(v->engine_type)); cost.AddCost(GetRefitCost(v->engine_type));
} }
@ -2096,7 +2095,6 @@ CommandCost CmdRefitRailVehicle(TileIndex tile, uint32 flags, uint32 p1, uint32
InvalidateWindowClassesData(WC_TRAINS_LIST, 0); InvalidateWindowClassesData(WC_TRAINS_LIST, 0);
} }
} }
}
} while ((v = v->Next()) != NULL && !only_this); } while ((v = v->Next()) != NULL && !only_this);
_returned_refit_capacity = num; _returned_refit_capacity = num;