From c5f0fe7c4074fc61dd54b756d2835fcf90ceaf05 Mon Sep 17 00:00:00 2001 From: glx Date: Thu, 22 Jan 2009 21:33:08 +0000 Subject: (svn r15210) -Fix: Vehicle::GetRunningCost() was wrong for ships and aircraft --- src/ship_cmd.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/ship_cmd.cpp') diff --git a/src/ship_cmd.cpp b/src/ship_cmd.cpp index ca400db87..45361fc96 100644 --- a/src/ship_cmd.cpp +++ b/src/ship_cmd.cpp @@ -159,6 +159,11 @@ static void CheckIfShipNeedsService(Vehicle *v) InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, VVW_WIDGET_START_STOP_VEH); } +Money Ship::GetRunningCost() const +{ + return GetVehicleProperty(this, 0x0F, ShipVehInfo(this->engine_type)->running_cost) * _price.ship_running; +} + void Ship::OnNewDay() { if ((++this->day_counter & 7) == 0) @@ -172,7 +177,7 @@ void Ship::OnNewDay() if (this->running_ticks == 0) return; - CommandCost cost(EXPENSES_SHIP_RUN, GetVehicleProperty(this, 0x0F, ShipVehInfo(this->engine_type)->running_cost) * _price.ship_running * this->running_ticks / (DAYS_IN_YEAR * DAY_TICKS)); + CommandCost cost(EXPENSES_SHIP_RUN, this->GetRunningCost() * this->running_ticks / (DAYS_IN_YEAR * DAY_TICKS)); this->profit_this_year -= cost.GetCost(); this->running_ticks = 0; -- cgit v1.2.3-54-g00ecf