diff options
Diffstat (limited to 'src/ship_cmd.cpp')
| -rw-r--r-- | src/ship_cmd.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/ship_cmd.cpp b/src/ship_cmd.cpp index 5c8fda196..b0e806a91 100644 --- a/src/ship_cmd.cpp +++ b/src/ship_cmd.cpp @@ -170,8 +170,6 @@ static void CheckIfShipNeedsService(Vehicle *v) void Ship::OnNewDay() { - CommandCost cost(EXPENSES_SHIP_RUN); - if ((++this->day_counter & 7) == 0) DecreaseVehicleValue(this); @@ -181,10 +179,12 @@ void Ship::OnNewDay() CheckOrders(this); - if (this->vehstatus & VS_STOPPED) return; + 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 / (364 * DAY_TICKS)); - cost.AddCost(GetVehicleProperty(this, 0x0F, ShipVehInfo(this->engine_type)->running_cost) * _price.ship_running / 364); - this->profit_this_year -= cost.GetCost() >> 8; + this->profit_this_year -= cost.GetCost(); + this->running_ticks = 0; SubtractMoneyFromPlayerFract(this->owner, cost); @@ -781,6 +781,8 @@ static void AgeShipCargo(Vehicle *v) void Ship::Tick() { + if (!(this->vehstatus & VS_STOPPED)) this->running_ticks++; + AgeShipCargo(this); ShipController(this); } @@ -843,6 +845,8 @@ CommandCost CmdBuildShip(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) v->y_pos = y; v->z_pos = GetSlopeZ(x, y); + v->running_ticks = 0; + v->UpdateDeltaXY(v->direction); v->vehstatus = VS_HIDDEN | VS_STOPPED | VS_DEFPAL; |