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

(svn r23127) -Fix [FS#4819] (r23086): Don't crash when refitting default vehicles.

release/1.2
michi_cc 2011-11-06 22:14:55 +00:00
parent 09c10af480
commit a58b975fd0
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/vehicle_cmd.cpp
View File

@ -212,15 +212,19 @@ static int GetRefitCostFactor(const Vehicle *v, EngineID engine_type, CargoID ne
{ {
/* Prepare callback param with info about the new cargo type. */ /* Prepare callback param with info about the new cargo type. */
const Engine *e = Engine::Get(engine_type); const Engine *e = Engine::Get(engine_type);
const CargoSpec *cs = CargoSpec::Get(new_cid);
uint32 param1 = (cs->classes << 16) | (new_subtype << 8) | e->GetGRF()->cargo_map[new_cid];
uint16 cb_res = GetVehicleCallback(CBID_VEHICLE_REFIT_COST, param1, 0, engine_type, v); /* Is this vehicle a NewGRF vehicle? */
if (cb_res != CALLBACK_FAILED) { if (e->GetGRF() != NULL) {
*auto_refit_allowed = HasBit(cb_res, 14); const CargoSpec *cs = CargoSpec::Get(new_cid);
int factor = GB(cb_res, 0, 14); uint32 param1 = (cs->classes << 16) | (new_subtype << 8) | e->GetGRF()->cargo_map[new_cid];
if (factor >= 0x2000) factor -= 0x4000; // Treat as signed integer.
return factor; uint16 cb_res = GetVehicleCallback(CBID_VEHICLE_REFIT_COST, param1, 0, engine_type, v);
if (cb_res != CALLBACK_FAILED) {
*auto_refit_allowed = HasBit(cb_res, 14);
int factor = GB(cb_res, 0, 14);
if (factor >= 0x2000) factor -= 0x4000; // Treat as signed integer.
return factor;
}
} }
*auto_refit_allowed = e->info.refit_cost == 0; *auto_refit_allowed = e->info.refit_cost == 0;