dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r6696) -Codechange: changed all comparision for refit cargo in orders against CT_NO_REFIT to checks for valid cargo IDs

Browse Source 
This should prevent any bugs made by mixing up CT_NO_REFIT and CT_INVALID
This commit is contained in:
bjarni
2006-10-08 21:10:00 +00:00
parent ea52a6f5f0
commit 050b262ed1
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
vehicle.c
View File

@@ -1901,7 +1901,7 @@ static bool VerifyAutoreplaceRefitForOrders(const Vehicle *v, const EngineID eng
}
FOR_VEHICLE_ORDERS(u, o) {
if (o->refit_cargo == CT_NO_REFIT) continue;
if (!(o->refit_cargo < NUM_CARGO)) continue;
if (!CanRefitTo(v->engine_type, o->refit_cargo)) continue;
if (!CanRefitTo(engine_type, o->refit_cargo)) return false;
}
@@ -2530,7 +2530,7 @@ void VehicleEnterDepot(Vehicle *v)
v->current_order.type = OT_DUMMY;
v->current_order.flags = 0;
if (t.refit_cargo != CT_NO_REFIT) {
if (t.refit_cargo < NUM_CARGO) {
int32 cost;
_current_player = v->owner;