From db9cdd6749079590b975f6e2fe514b1206b47518 Mon Sep 17 00:00:00 2001 From: bjarni Date: Wed, 4 Oct 2006 12:01:59 +0000 Subject: (svn r6637) -Codechange: merged all (vehicle type)EnterDepot into VehicleEnterDepot() This revealed duplicated code like aircraft lists got invalidated twice Moved invalidation of the vehicle detail window to VehicleServiceInDepot() as it should always be updated when serviced --- train_cmd.c | 49 ------------------------------------------------- 1 file changed, 49 deletions(-) (limited to 'train_cmd.c') diff --git a/train_cmd.c b/train_cmd.c index 5c1abe6ae..e1c0ac017 100644 --- a/train_cmd.c +++ b/train_cmd.c @@ -3476,55 +3476,6 @@ void Train_Tick(Vehicle *v) } } - -void TrainEnterDepot(Vehicle *v, TileIndex tile) -{ - UpdateSignalsOnSegment(tile, GetRailDepotDirection(tile)); - - if (!IsFrontEngine(v)) v = GetFirstVehicleInChain(v); - - VehicleServiceInDepot(v); - - InvalidateWindow(WC_VEHICLE_DETAILS, v->index); - - v->load_unload_time_rem = 0; - v->cur_speed = 0; - - TriggerVehicle(v, VEHICLE_TRIGGER_DEPOT); - - if (v->current_order.type == OT_GOTO_DEPOT) { - Order t; - int32 cost; - - InvalidateWindow(WC_VEHICLE_VIEW, v->index); - - t = v->current_order; - v->current_order.type = OT_DUMMY; - v->current_order.flags = 0; - - _current_player = v->owner; - cost = DoCommand(v->tile, v->index, t.refit_cargo | t.refit_subtype << 8, DC_EXEC, CMD_REFIT_RAIL_VEHICLE); - if (!CmdFailed(cost) && v->owner == _local_player && cost != 0) ShowCostOrIncomeAnimation(v->x_pos, v->y_pos, v->z_pos, cost); - - if (HASBIT(t.flags, OFB_PART_OF_ORDERS)) { // Part of the orderlist? - v->u.rail.days_since_order_progr = 0; - v->cur_order_index++; - } else if (HASBIT(t.flags, OFB_HALT_IN_DEPOT)) { // User initiated? - v->vehstatus |= VS_STOPPED; - if (v->owner == _local_player) { - SetDParam(0, v->unitnumber); - AddNewsItem( - STR_8814_TRAIN_IS_WAITING_IN_DEPOT, - NEWS_FLAGS(NM_SMALL, NF_VIEWPORT|NF_VEHICLE, NT_ADVICE, 0), - v->index, - 0 - ); - } - } - } - InvalidateWindowClasses(WC_TRAINS_LIST); -} - #define MAX_ACCEPTABLE_DEPOT_DIST 16 static void CheckIfTrainNeedsService(Vehicle *v) -- cgit v1.2.3-54-g00ecf