From e5abf58461db23a7b43c15bf9431599cb6484fa5 Mon Sep 17 00:00:00 2001 From: bjarni Date: Sat, 19 Mar 2005 21:16:22 +0000 Subject: [PATCH] (svn r2024) -Fix: [autoreplace] reverted all changes involving v->set_for_replacement as they caused desyncs. The bad sideeffect of this is that now no vehicle will automatically go to a depot anymore just because it is set to be autoreplaced. We will have to find a better way to solve this problem. Revisions reverted: 1640, 1707, 1709, 1710, 1712(but not the cheat prevention in this one) --- aircraft_cmd.c | 73 ++++++-------------------------------------------- roadveh_cmd.c | 45 ++++--------------------------- ship_cmd.c | 40 +++------------------------ train_cmd.c | 40 +++------------------------ vehicle.c | 2 -- vehicle.h | 2 -- 6 files changed, 21 insertions(+), 181 deletions(-) diff --git a/aircraft_cmd.c b/aircraft_cmd.c index 526acc6c5b..827614963f 100644 --- a/aircraft_cmd.c +++ b/aircraft_cmd.c @@ -410,12 +410,8 @@ int32 CmdStartStopAircraft(int x, int y, uint32 flags, uint32 p1, uint32 p2) return 0; } -/* Send an aircraft to the hangar in the next station - p1 = index of the aircraft - p2 = bit 0..15 = index of station with hangar to use (only used if bit 17 is set) - bit 16 = set v->set_for_replacement & do not stop in hangar - bit 17 = goto the hangar in airport given in bit 0..15 instead of next stop - bit 18 = clear v->set_for_replacement */ +// p1 = vehicle +// p2 = if set, the aircraft will try to goto a depot, but not stop int32 CmdSendAircraftToHangar(int x, int y, uint32 flags, uint32 p1, uint32 p2) { Vehicle *v; @@ -429,13 +425,6 @@ int32 CmdSendAircraftToHangar(int x, int y, uint32 flags, uint32 p1, uint32 p2) if (v->type != VEH_Aircraft || !CheckOwnership(v->owner)) return CMD_ERROR; - if (HASBIT(p2, 16)) v->set_for_replacement = true; //now all clients knows that the vehicle wants to be replaced - - if (HASBIT(p2, 18)) { - v->set_for_replacement = false; - return CMD_ERROR; // no need to send aircraft to a depot. We just told that it don't have to anymore - } - if (v->current_order.type == OT_GOTO_DEPOT && p2 == 0) { if (flags & DC_EXEC) { if (v->current_order.flags & OF_UNLOAD) v->cur_order_index++; @@ -1125,8 +1114,7 @@ static void ProcessAircraftOrder(Vehicle *v) if (v->current_order.type == OT_GOTO_DEPOT && (v->current_order.flags & (OF_UNLOAD | OF_FULL_LOAD)) == (OF_UNLOAD | OF_FULL_LOAD) && - !VehicleNeedsService(v) && - v->set_for_replacement == false) { + !VehicleNeedsService(v)) { v->cur_order_index++; } @@ -1530,49 +1518,11 @@ static void AircraftEventHandler_HeliTakeOff(Vehicle *v, const AirportFTAClass * AircraftNextAirportPos_and_Order(v); // check if the aircraft needs to be replaced or renewed and send it to a hangar if needed - if (v->current_order.type != OT_GOTO_DEPOT && v->owner == _local_player) { - // only the vehicle owner needs to calculate the rest (locally) - if ((_autoreplace_array[v->engine_type] != v->engine_type) || - (_patches.autorenew && v->age - v->max_age > (_patches.autorenew_months * 30))) { - - if (v->set_for_replacement) { - Station *st = GetStation(v->u.air.targetairport); - // If an airport doesn't have terminals (so no landing space for airports), - // it surely doesn't have any hangars - if (st->xy == 0 || st->airport_tile == 0 || GetAirport(st->airport_type)->terminals == NULL) - return; - /* this is not the airport, where the helicopter will be replaced - No need to make everybody check this, since it would be a waste of bandwidth */ - } - - { - bool has_hangar = HaveHangarInOrderList(v); // this info is needed twice, but we only want to loop the orders once ;) - uint32 next_airport = 0; - - if (!has_hangar) { - // the helicopter needs help to find a hangar since there are none in the schedule - SETBIT(next_airport, 17); - next_airport |= FindNearestHangar(v); - if (HASBIT(next_airport, 16)) { - /* when shared airports are allowed, a check for a rentable hangar should be added here */ - /* TODO: tell the player that he needs a hangar */ - v->set_for_replacement = false; //needed so it will check again later when the player might have build a hangar - return; // player do not own any hangars - } - } - SETBIT(next_airport, 16); - _current_player = _local_player; - DoCommandP(v->tile, v->index, next_airport, NULL, CMD_SEND_AIRCRAFT_TO_HANGAR | CMD_SHOW_NO_ERROR); - _current_player = OWNER_NONE; - } - } else { // no need to go to a depot - if (v->set_for_replacement) { - // it seems that the user clicked "Stop replacing" - _current_player = _local_player; - DoCommandP(v->tile, v->index, (1 | (1 << 2)) << 16, NULL, CMD_SEND_AIRCRAFT_TO_HANGAR | CMD_SHOW_NO_ERROR); - _current_player = OWNER_NONE; - } - } + if ((v->owner == _local_player && _autoreplace_array[v->engine_type] != v->engine_type) || + (v->owner == _local_player && _patches.autorenew && v->age - v->max_age > (_patches.autorenew_months * 30))) { + _current_player = _local_player; + DoCommandP(v->tile, v->index, 1, NULL, CMD_SEND_AIRCRAFT_TO_HANGAR | CMD_SHOW_NO_ERROR); + _current_player = OWNER_NONE; } } @@ -1636,13 +1586,6 @@ static void AircraftEventHandler_Landing(Vehicle *v, const AirportFTAClass *Airp _current_player = _local_player; DoCommandP(v->tile, v->index, 1 << 16, NULL, CMD_SEND_AIRCRAFT_TO_HANGAR | CMD_SHOW_NO_ERROR); _current_player = OWNER_NONE; - } else { // no need to go to a depot - if (v->set_for_replacement) { - // it seems that the user clicked "Stop replacing" - _current_player = _local_player; - DoCommandP(v->tile, v->index, (1 | (1 << 2)) << 16, NULL, CMD_SEND_AIRCRAFT_TO_HANGAR | CMD_SHOW_NO_ERROR); - _current_player = OWNER_NONE; - } } } } diff --git a/roadveh_cmd.c b/roadveh_cmd.c index 17d93ea854..2450387ca1 100644 --- a/roadveh_cmd.c +++ b/roadveh_cmd.c @@ -320,11 +320,6 @@ static Depot *FindClosestRoadDepot(Vehicle *v) } } -/* Send a road vehicle to the nearest depot - p1 = index of the road vehicle - p2 = bit 0 = do not stop in depot - bit 1 = set v->set_for_replacement - bit 2 = clear v->set_for_replacement */ int32 CmdSendRoadVehToDepot(int x, int y, uint32 flags, uint32 p1, uint32 p2) { Vehicle *v; @@ -337,11 +332,6 @@ int32 CmdSendRoadVehToDepot(int x, int y, uint32 flags, uint32 p1, uint32 p2) if (v->type != VEH_Road || !CheckOwnership(v->owner)) return CMD_ERROR; - if (HASBIT(p2, 0)) v->set_for_replacement = true; - if (HASBIT(p2, 2)) v->set_for_replacement = false; - - if (HASBIT(p2, 1) || HASBIT(p2, 2)) return CMD_ERROR; // vehicle has a depot in schedule. It just needed to alter set_for_replacement - if (v->current_order.type == OT_GOTO_DEPOT) { if (flags & DC_EXEC) { if (v->current_order.flags & OF_UNLOAD) @@ -359,7 +349,7 @@ int32 CmdSendRoadVehToDepot(int x, int y, uint32 flags, uint32 p1, uint32 p2) if (flags & DC_EXEC) { v->current_order.type = OT_GOTO_DEPOT; - v->current_order.flags = p2 == 0 ? OF_NON_STOP | OF_FULL_LOAD : 0; + v->current_order.flags = OF_NON_STOP | OF_FULL_LOAD; v->current_order.station = depot->index; v->dest_tile = depot->xy; InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); @@ -615,7 +605,7 @@ static void ProcessRoadVehOrder(Vehicle *v) if (v->current_order.type == OT_GOTO_DEPOT && (v->current_order.flags & (OF_UNLOAD | OF_FULL_LOAD)) == (OF_UNLOAD | OF_FULL_LOAD) && - !VehicleNeedsService(v) && !v->set_for_replacement) { + !VehicleNeedsService(v)) { v->cur_order_index++; } @@ -716,28 +706,6 @@ static void HandleRoadVehLoading(Vehicle *v) v->cur_order_index++; InvalidateVehicleOrder(v); - - if (v->current_order.type != OT_GOTO_DEPOT && v->owner == _local_player) { - // only the vehicle owner needs to calculate the rest (locally) - if ((_autoreplace_array[v->engine_type] != v->engine_type) || - (_patches.autorenew && v->age - v->max_age > (_patches.autorenew_months * 30))) { - byte flags = 1; - // the flags means, bit 0 = needs to go to depot, bit 1 = have depot in orders - if (VehicleHasDepotOrders(v)) SETBIT(flags, 1); - if (!(HASBIT(flags, 1) && v->set_for_replacement)) { - _current_player = _local_player; - DoCommandP(v->tile, v->index, flags, NULL, CMD_SEND_ROADVEH_TO_DEPOT | CMD_SHOW_NO_ERROR); - _current_player = OWNER_NONE; - } - } else { // no need to go to a depot - if (v->set_for_replacement) { - // it seems that the user clicked "Stop replacing" - _current_player = _local_player; - DoCommandP(v->tile, v->index, 1 | (1 << 2), NULL, CMD_SEND_ROADVEH_TO_DEPOT | CMD_SHOW_NO_ERROR); - _current_player = OWNER_NONE; - } - } - } } static void StartRoadVehSound(Vehicle *v) @@ -1600,10 +1568,10 @@ static void CheckIfRoadVehNeedsService(Vehicle *v) { Depot *depot; - if (_patches.servint_roadveh == 0 && !v->set_for_replacement) + if (_patches.servint_roadveh == 0) return; - if (!VehicleNeedsService(v) && !v->set_for_replacement) + if (!VehicleNeedsService(v)) return; if (v->vehstatus & VS_STOPPED) @@ -1625,10 +1593,7 @@ static void CheckIfRoadVehNeedsService(Vehicle *v) depot = FindClosestRoadDepot(v); if (depot == NULL || DistanceManhattan(v->tile, depot->xy) > 12) { - if (v->current_order.type == OT_GOTO_DEPOT && !( - DistanceManhattan(v->tile, v->dest_tile) > 25 && v->set_for_replacement)) { - /* a vehicle needs a greater distance to a depot to loose it than to find it since - they can circle forever othervise if they are in a loop with an unlucky distance */ + if (v->current_order.type == OT_GOTO_DEPOT) { v->current_order.type = OT_DUMMY; v->current_order.flags = 0; InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); diff --git a/ship_cmd.c b/ship_cmd.c index 9fd1ea1956..b8588ede18 100644 --- a/ship_cmd.c +++ b/ship_cmd.c @@ -98,10 +98,10 @@ static void CheckIfShipNeedsService(Vehicle *v) { Depot *depot; - if (_patches.servint_ships == 0 && !v->set_for_replacement) + if (_patches.servint_ships == 0) return; - if (!VehicleNeedsService(v) && !v->set_for_replacement) + if (!VehicleNeedsService(v)) return; if (v->vehstatus & VS_STOPPED) @@ -226,7 +226,7 @@ static void ProcessShipOrder(Vehicle *v) if (v->current_order.type == OT_GOTO_DEPOT && (v->current_order.flags & (OF_UNLOAD | OF_FULL_LOAD)) == (OF_UNLOAD | OF_FULL_LOAD) && - !VehicleNeedsService(v) && !v->set_for_replacement) { + !VehicleNeedsService(v)) { v->cur_order_index++; } @@ -297,28 +297,6 @@ static void HandleShipLoading(Vehicle *v) Order b = v->current_order; v->current_order.type = OT_LEAVESTATION; v->current_order.flags = 0; - - if (v->current_order.type != OT_GOTO_DEPOT && v->owner == _local_player) { - // only the vehicle owner needs to calculate the rest (locally) - if ((_autoreplace_array[v->engine_type] != v->engine_type) || - (_patches.autorenew && v->age - v->max_age > (_patches.autorenew_months * 30))) { - byte flags = 1; - // the flags means, bit 0 = needs to go to depot, bit 1 = have depot in orders - if (VehicleHasDepotOrders(v)) SETBIT(flags, 1); - if (!(HASBIT(flags, 1) && v->set_for_replacement)) { - _current_player = _local_player; - DoCommandP(v->tile, v->index, flags, NULL, CMD_SEND_SHIP_TO_DEPOT | CMD_SHOW_NO_ERROR); - _current_player = OWNER_NONE; - } - } else { // no need to go to a depot - if (v->set_for_replacement) { - // it seems that the user clicked "Stop replacing" - _current_player = _local_player; - DoCommandP(v->tile, v->index, 1 | (1 << 2), NULL, CMD_SEND_SHIP_TO_DEPOT | CMD_SHOW_NO_ERROR); - _current_player = OWNER_NONE; - } - } - } if (!(b.flags & OF_NON_STOP)) return; } @@ -1001,11 +979,6 @@ int32 CmdStartStopShip(int x, int y, uint32 flags, uint32 p1, uint32 p2) return 0; } -/* Send a ship to the nearest depot - p1 = index of the ship - p2 = bit 0 = do not stop in depot - bit 1 = set v->set_for_replacement - bit 2 = clear v->set_for_replacement */ int32 CmdSendShipToDepot(int x, int y, uint32 flags, uint32 p1, uint32 p2) { Vehicle *v; @@ -1018,11 +991,6 @@ int32 CmdSendShipToDepot(int x, int y, uint32 flags, uint32 p1, uint32 p2) if (v->type != VEH_Ship || !CheckOwnership(v->owner)) return CMD_ERROR; - if (HASBIT(p2, 0)) v->set_for_replacement = true; - if (HASBIT(p2, 2)) v->set_for_replacement = false; - - if (HASBIT(p2, 1) || HASBIT(p2, 2)) return CMD_ERROR; // vehicle has a depot in schedule. It just needed to alter set_for_replacement - if (v->current_order.type == OT_GOTO_DEPOT) { if (flags & DC_EXEC) { if (v->current_order.flags & OF_UNLOAD) v->cur_order_index++; @@ -1038,7 +1006,7 @@ int32 CmdSendShipToDepot(int x, int y, uint32 flags, uint32 p1, uint32 p2) if (flags & DC_EXEC) { v->dest_tile = depot->xy; v->current_order.type = OT_GOTO_DEPOT; - v->current_order.flags = HASBIT(p2, 0) ? 0 : OF_NON_STOP | OF_FULL_LOAD; + v->current_order.flags = OF_NON_STOP | OF_FULL_LOAD; v->current_order.station = depot->index; InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); } diff --git a/train_cmd.c b/train_cmd.c index 8047f884f1..20946bc787 100644 --- a/train_cmd.c +++ b/train_cmd.c @@ -1339,11 +1339,6 @@ static TrainFindDepotData FindClosestTrainDepot(Vehicle *v) return tfdd; } -/* Send a train to the nearest depot - p1 = index of the train - p2 = bit 0 = do not stop in depot - bit 1 = set v->set_for_replacement - bit 2 = clear v->set_for_replacement */ int32 CmdTrainGotoDepot(int x, int y, uint32 flags, uint32 p1, uint32 p2) { Vehicle *v; @@ -1356,12 +1351,6 @@ int32 CmdTrainGotoDepot(int x, int y, uint32 flags, uint32 p1, uint32 p2) if (v->type != VEH_Train || !CheckOwnership(v->owner)) return CMD_ERROR; - if (HASBIT(p2, 0)) v->set_for_replacement = true; - if (HASBIT(p2, 2)) v->set_for_replacement = false; - - if (HASBIT(p2, 1) || HASBIT(p2, 2)) return CMD_ERROR; // vehicle has a depot in schedule. It just needed to alter set_for_replacement - - if (v->current_order.type == OT_GOTO_DEPOT) { if (flags & DC_EXEC) { if (v->current_order.flags & OF_UNLOAD) { @@ -1383,7 +1372,7 @@ int32 CmdTrainGotoDepot(int x, int y, uint32 flags, uint32 p1, uint32 p2) if (flags & DC_EXEC) { v->dest_tile = tfdd.tile; v->current_order.type = OT_GOTO_DEPOT; - v->current_order.flags = HASBIT(p2, 0) ? 0 : OF_NON_STOP | OF_FULL_LOAD; + v->current_order.flags = OF_NON_STOP | OF_FULL_LOAD; v->current_order.station = GetDepotByTile(tfdd.tile)->index; InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); } @@ -1882,7 +1871,7 @@ static bool ProcessTrainOrder(Vehicle *v) if (v->current_order.type == OT_GOTO_DEPOT && (v->current_order.flags & (OF_UNLOAD | OF_FULL_LOAD)) == (OF_UNLOAD | OF_FULL_LOAD) && - !VehicleNeedsService(v) && !v->set_for_replacement) { + !VehicleNeedsService(v)) { v->cur_order_index++; } @@ -1994,27 +1983,6 @@ static void HandleTrainLoading(Vehicle *v, bool mode) v->current_order.type = OT_LEAVESTATION; v->current_order.flags = 0; - if (v->current_order.type != OT_GOTO_DEPOT && v->owner == _local_player) { - // only the vehicle owner needs to calculate the rest (locally) - if ((_autoreplace_array[v->engine_type] != v->engine_type) || - (_patches.autorenew && v->age - v->max_age > (_patches.autorenew_months * 30))) { - byte flags = 1; - // the flags means, bit 0 = needs to go to depot, bit 1 = have depot in orders - if (VehicleHasDepotOrders(v)) SETBIT(flags, 1); - if (!(HASBIT(flags, 1) && v->set_for_replacement)) { - _current_player = _local_player; - DoCommandP(v->tile, v->index, flags, NULL, CMD_TRAIN_GOTO_DEPOT | CMD_SHOW_NO_ERROR); - _current_player = OWNER_NONE; - } - } else { // no need to go to a depot - if (v->set_for_replacement) { - // it seems that the user clicked "Stop replacing" - _current_player = _local_player; - DoCommandP(v->tile, v->index, 1 | (1 << 2), NULL, CMD_TRAIN_GOTO_DEPOT | CMD_SHOW_NO_ERROR); - _current_player = OWNER_NONE; - } - } - } // If this was not the final order, don't remove it from the list. if (!(b.flags & OF_NON_STOP)) return; @@ -3012,10 +2980,10 @@ static void CheckIfTrainNeedsService(Vehicle *v) Depot *depot; TrainFindDepotData tfdd; - if (_patches.servint_trains == 0 && !v->set_for_replacement) + if (_patches.servint_trains == 0) return; - if (!VehicleNeedsService(v) && !v->set_for_replacement) + if (!VehicleNeedsService(v)) return; if (v->vehstatus & VS_STOPPED) diff --git a/vehicle.c b/vehicle.c index 9faf679e64..3aaea44978 100644 --- a/vehicle.c +++ b/vehicle.c @@ -212,7 +212,6 @@ static Vehicle *InitializeVehicle(Vehicle *v) v->string_id = 0; v->next_shared = NULL; v->prev_shared = NULL; - v->set_for_replacement = false; /* random_bits is used to pick out a random sprite for vehicles which are technical the same (newgrf stuff). Because RandomRange() results in desyncs, and because it does @@ -1433,7 +1432,6 @@ int32 CmdReplaceVehicle(int x, int y, uint32 flags, uint32 p1, uint32 p2) Engine *e; e = DEREF_ENGINE(new_engine_type); - v->set_for_replacement = false; v->reliability = e->reliability; v->reliability_spd_dec = e->reliability_spd_dec; v->age = 0; diff --git a/vehicle.h b/vehicle.h index f0a8abf6c0..d7c3aafac5 100644 --- a/vehicle.h +++ b/vehicle.h @@ -184,8 +184,6 @@ struct Vehicle { int32 profit_last_year; uint32 value; - bool set_for_replacement; // marks this vehicle to be replaced - union { VehicleRail rail; VehicleAir air;