mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r18724) -Fix [FS#3475] (r17899): refitting a non-refittable vehicle to it's default cargotype failed, causing problems for AIs

This commit is contained in:
yexo 2010-01-04 18:50:50 +00:00
parent b42e76d858
commit 27fc22a76b
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/vehicle_cmd.cpp
View File

@ -307,13 +307,11 @@ CommandCost RefitVehicle(Vehicle *v, bool only_this, CargoID new_cid, byte new_s
{
CommandCost cost(v->GetExpenseType(false));
uint total_capacity = 0;
bool success = false;
v->InvalidateNewGRFCacheOfChain();
for (; v != NULL; v = (only_this ? NULL : v->Next())) {
const Engine *e = Engine::Get(v->engine_type);
if (!e->CanCarryCargo() || !HasBit(e->info.refit_mask, new_cid)) continue;
success = true;
/* Back up the vehicle's cargo type */
CargoID temp_cid = v->cargo_type;
@ -347,7 +345,7 @@ CommandCost RefitVehicle(Vehicle *v, bool only_this, CargoID new_cid, byte new_s
}
_returned_refit_capacity = total_capacity;
return success ? cost : CMD_ERROR;
return cost;
}
/** Test if a name is unique among vehicle names.