diff options
| author | yexo <yexo@openttd.org> | 2009-05-15 23:55:06 +0000 |
|---|---|---|
| committer | yexo <yexo@openttd.org> | 2009-05-15 23:55:06 +0000 |
| commit | 31eff1d4c30803e09083320886630da8b28690d1 (patch) | |
| tree | b8c0c563425389a5e9514760bb5e1cc9cf0013c1 /src/vehicle.cpp | |
| parent | aea2fcd0a09fa47caf022934ba8029ec327906f7 (diff) | |
| download | openttd-31eff1d4c30803e09083320886630da8b28690d1.tar.xz | |
(svn r16315) -Codechange: move the autorenew settings to a new CompanySettings struct
Diffstat (limited to 'src/vehicle.cpp')
| -rw-r--r-- | src/vehicle.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/vehicle.cpp b/src/vehicle.cpp index 0abfa1376..454a7bb84 100644 --- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -64,8 +64,8 @@ bool Vehicle::NeedsAutorenewing(const Company *c) const * argument rather than finding it again. */ assert(c == GetCompany(this->owner)); - if (!c->engine_renew) return false; - if (this->age - this->max_age < (c->engine_renew_months * 30)) return false; + if (!c->settings.engine_renew) return false; + if (this->age - this->max_age < (c->settings.engine_renew_months * 30)) return false; if (this->age == 0) return false; // rail cars don't age and lacks a max age return true; @@ -642,9 +642,9 @@ void CallVehicleTicks() int z = v->z_pos; const Company *c = GetCompany(_current_company); - SubtractMoneyFromCompany(CommandCost(EXPENSES_NEW_VEHICLES, (Money)c->engine_renew_money)); + SubtractMoneyFromCompany(CommandCost(EXPENSES_NEW_VEHICLES, (Money)c->settings.engine_renew_money)); CommandCost res = DoCommand(0, v->index, 0, DC_EXEC, CMD_AUTOREPLACE_VEHICLE); - SubtractMoneyFromCompany(CommandCost(EXPENSES_NEW_VEHICLES, -(Money)c->engine_renew_money)); + SubtractMoneyFromCompany(CommandCost(EXPENSES_NEW_VEHICLES, -(Money)c->settings.engine_renew_money)); if (!IsLocalCompany()) continue; @@ -906,7 +906,7 @@ void AgeVehicle(Vehicle *v) if (v->Previous() != NULL || v->owner != _local_company || (v->vehstatus & VS_CRASHED) != 0) return; /* Don't warn if a renew is active */ - if (GetCompany(v->owner)->engine_renew && GetEngine(v->engine_type)->company_avail != 0) return; + if (GetCompany(v->owner)->settings.engine_renew && GetEngine(v->engine_type)->company_avail != 0) return; StringID str; if (age == -DAYS_IN_LEAP_YEAR) { |