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

Vehicle repair costs patch: whitespace fixes.

Browse Source
This commit is contained in:
Jonathan G Rennison
2015-08-04 23:39:02 +01:00
parent 7537ae2a7e
commit 938babfe7b
2 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/saveload/vehicle_sl.cpp
View File

@@ -365,19 +365,19 @@ void AfterLoadVehicles(bool part_of_load)
} }
} }
if ( IsSavegameVersionBefore( SL_REPAIRCOST )) { if (IsSavegameVersionBefore(SL_REPAIRCOST)) {
/* repair cost is value for new vehicles and each week +/256 part for old */ /* repair cost is value for new vehicles and each week +/256 part for old */
FOR_ALL_VEHICLES(v) { FOR_ALL_VEHICLES(v) {
if (!v->IsPrimaryVehicle()) continue; if (!v->IsPrimaryVehicle()) continue;
v->repair_cost = v->value; v->repair_cost = v->value;
for(int w = 0; w < v->age / 7; w++, v->repair_cost += v->repair_cost >> 8 ); for (int w = 0; w < v->age / 7; w++, v->repair_cost += v->repair_cost >> 8);
//DEBUG(misc,0, "eid#%d, value=%lld, weeks=%d/%d, repair cost=%lld", //DEBUG(misc,0, "eid#%d, value=%lld, weeks=%d/%d, repair cost=%lld",
// v->engine_type, (int64)v->value, v->age, v->max_age, (int64)v->repair_cost ); // v->engine_type, (int64)v->value, v->age, v->max_age, (int64)v->repair_cost );
if ( v->age > v->max_age ) { if (v->age > v->max_age) {
Date weeks = (v->age - v->max_age)/7; Date weeks = (v->age - v->max_age) / 7;
for(int w = 0; w < weeks; w++, v->repair_cost += v->repair_cost >> 8 ); for (int w = 0; w < weeks; w++, v->repair_cost += v->repair_cost >> 8);
//DEBUG(misc,0, "OLD: value=%lld, weeks=%d, repair cost=%lld", (int64)v->value, weeks, (int64)v->repair_cost ); //DEBUG(misc,0, "OLD: value=%lld, weeks=%d, repair cost=%lld", (int64)v->value, weeks, (int64)v->repair_cost );
} }
} }
@@ -702,7 +702,7 @@ const SaveLoad *GetVehicleDescription(VehicleType vt)
SLEG_CONDVAR( _cargo_loaded_at_xy, SLE_UINT32, 51, 67), SLEG_CONDVAR( _cargo_loaded_at_xy, SLE_UINT32, 51, 67),
SLE_CONDVAR(Vehicle, value, SLE_FILE_I32 | SLE_VAR_I64, 0, 64), SLE_CONDVAR(Vehicle, value, SLE_FILE_I32 | SLE_VAR_I64, 0, 64),
SLE_CONDVAR(Vehicle, value, SLE_INT64, 65, SL_MAX_VERSION), SLE_CONDVAR(Vehicle, value, SLE_INT64, 65, SL_MAX_VERSION),
SLE_CONDVAR(Vehicle, repair_cost, SLE_INT64, SL_REPAIRCOST, SL_MAX_VERSION), SLE_CONDVAR(Vehicle, repair_cost, SLE_INT64, SL_REPAIRCOST, SL_MAX_VERSION),
SLE_CONDVAR(Vehicle, random_bits, SLE_UINT8, 2, SL_MAX_VERSION), SLE_CONDVAR(Vehicle, random_bits, SLE_UINT8, 2, SL_MAX_VERSION),
SLE_CONDVAR(Vehicle, waiting_triggers, SLE_UINT8, 2, SL_MAX_VERSION), SLE_CONDVAR(Vehicle, waiting_triggers, SLE_UINT8, 2, SL_MAX_VERSION),

34
src/vehicle.cpp
View File

@@ -99,24 +99,28 @@ void VehicleServiceInDepot(Vehicle *v)
do { do {
v->date_of_last_service = _date; v->date_of_last_service = _date;
if ( _settings_game.vehicle.pay_for_repair && v->breakdowns_since_last_service ) { if (_settings_game.vehicle.pay_for_repair && v->breakdowns_since_last_service) {
ExpensesType type = INVALID_EXPENSES; ExpensesType type = INVALID_EXPENSES;
_current_company = v->owner; _current_company = v->owner;
switch (v->type) { switch (v->type) {
case VEH_AIRCRAFT: case VEH_AIRCRAFT:
type = EXPENSES_AIRCRAFT_RUN; type = EXPENSES_AIRCRAFT_RUN;
break; break;
case VEH_TRAIN:
type = EXPENSES_TRAIN_RUN; case VEH_TRAIN:
break; type = EXPENSES_TRAIN_RUN;
case VEH_SHIP: break;
type = EXPENSES_SHIP_RUN;
break; case VEH_SHIP:
case VEH_ROAD: type = EXPENSES_SHIP_RUN;
type = EXPENSES_ROADVEH_RUN; break;
break;
default: case VEH_ROAD:
NOT_REACHED(); type = EXPENSES_ROADVEH_RUN;
break;
default:
NOT_REACHED();
} }
assert(type != INVALID_EXPENSES); assert(type != INVALID_EXPENSES);
Money repair_cost = (v->breakdowns_since_last_service * v->repair_cost / _settings_game.vehicle.repair_cost) + 1; Money repair_cost = (v->breakdowns_since_last_service * v->repair_cost / _settings_game.vehicle.repair_cost) + 1;