From 7ce12e50da88b1e56f9abfd022f644fad164f03f Mon Sep 17 00:00:00 2001 From: glx Date: Fri, 1 Feb 2008 22:02:14 +0000 Subject: (svn r12037) -Codechange: replace OnNewDay_(Aircraft|RoadVeh|Ship|Train) with an OnNewDay method in the Vehicle class --- src/train_cmd.cpp | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'src/train_cmd.cpp') diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp index 891642070..612f383b1 100644 --- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -3625,38 +3625,38 @@ static void CheckIfTrainNeedsService(Vehicle *v) InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, VVW_WIDGET_START_STOP_VEH); } -void OnNewDay_Train(Vehicle *v) +void Train::OnNewDay() { - if ((++v->day_counter & 7) == 0) DecreaseVehicleValue(v); + if ((++this->day_counter & 7) == 0) DecreaseVehicleValue(this); - if (IsFrontEngine(v)) { - CheckVehicleBreakdown(v); - AgeVehicle(v); + if (IsFrontEngine(this)) { + CheckVehicleBreakdown(this); + AgeVehicle(this); - CheckIfTrainNeedsService(v); + CheckIfTrainNeedsService(this); - CheckOrders(v); + CheckOrders(this); /* update destination */ - if (v->current_order.type == OT_GOTO_STATION) { - TileIndex tile = GetStation(v->current_order.dest)->train_tile; - if (tile != 0) v->dest_tile = tile; + if (this->current_order.type == OT_GOTO_STATION) { + TileIndex tile = GetStation(this->current_order.dest)->train_tile; + if (tile != 0) this->dest_tile = tile; } - if ((v->vehstatus & VS_STOPPED) == 0) { + if ((this->vehstatus & VS_STOPPED) == 0) { /* running costs */ - CommandCost cost(EXPENSES_TRAIN_RUN, v->GetRunningCost() / 364); + CommandCost cost(EXPENSES_TRAIN_RUN, this->GetRunningCost() / 364); - v->profit_this_year -= cost.GetCost() >> 8; + this->profit_this_year -= cost.GetCost() >> 8; - SubtractMoneyFromPlayerFract(v->owner, cost); + SubtractMoneyFromPlayerFract(this->owner, cost); - InvalidateWindow(WC_VEHICLE_DETAILS, v->index); + InvalidateWindow(WC_VEHICLE_DETAILS, this->index); InvalidateWindowClasses(WC_TRAINS_LIST); } - } else if (IsTrainEngine(v)) { + } else if (IsTrainEngine(this)) { /* Also age engines that aren't front engines */ - AgeVehicle(v); + AgeVehicle(this); } } -- cgit v1.2.3-54-g00ecf