summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbjarni <bjarni@openttd.org>2005-01-26 19:43:22 +0000
committerbjarni <bjarni@openttd.org>2005-01-26 19:43:22 +0000
commit54549adc664da279a2054b673219f839d8006338 (patch)
treedca7881124ee7b0eb0ecd257dec1396341054248
parentf84607af52fed55977f7edb7015a8bbc585bb300 (diff)
downloadopenttd-54549adc664da279a2054b673219f839d8006338.tar.xz
(svn r1690) - Fix: [autoreplace] Cheaters can no longer exploit autoreplace to get vehicles, that's not invented yet
- Fix: [autoreplace] Fixed a stupid bug introduced in r1687, that made a crash if anybody tried to autoreplace anything but an aircraft
-rw-r--r--vehicle.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/vehicle.c b/vehicle.c
index 7fad142fe..ffe2e392e 100644
--- a/vehicle.c
+++ b/vehicle.c
@@ -1352,8 +1352,12 @@ int32 CmdReplaceVehicle(int x, int y, uint32 flags, uint32 p1, uint32 p2)
if (!CheckOwnership(v->owner)) return CMD_ERROR;
// makes sure that we do not replace a plane with a helicopter or vise versa
- if (HASBIT(AircraftVehInfo(old_engine_type)->subtype, 0) != HASBIT(AircraftVehInfo(new_engine_type)->subtype, 0)) return CMD_ERROR;
+ if (v->type == VEH_Aircraft) {
+ if (HASBIT(AircraftVehInfo(old_engine_type)->subtype, 0) != HASBIT(AircraftVehInfo(new_engine_type)->subtype, 0)) return CMD_ERROR;
+ }
+ // makes sure that the player can actually buy the new engine. Renewing is still allowed to outdated engines
+ if (!HASBIT(DEREF_ENGINE(new_engine_type)->player_avail, v->owner) && old_engine_type != new_engine_type) return CMD_ERROR;
switch (v->type) {
case VEH_Train: build_cost = EstimateTrainCost(RailVehInfo(new_engine_type)); break;