summaryrefslogtreecommitdiff
path: root/vehicle.c
diff options
context:
space:
mode:
authorpeter1138 <peter1138@openttd.org>2006-01-12 15:52:18 +0000
committerpeter1138 <peter1138@openttd.org>2006-01-12 15:52:18 +0000
commit90aff7a026c8e833d78e932575995485c2da9e47 (patch)
tree2a159338918aa7b1a61fab6e18f4e28ae2b27950 /vehicle.c
parent28ca056d56bb716e125745c16876408527fdc278 (diff)
downloadopenttd-90aff7a026c8e833d78e932575995485c2da9e47.tar.xz
(svn r3396) - Autoreplace changes:
- Change fixed array per player to a single pool. This avoids future problems with vehicle numbers and decreases savegame size. Engine replacements from previous savegames will be lost. - Move engine replacement code from players.c to engine.c. (thanks to blathijs for rewriting this)
Diffstat (limited to 'vehicle.c')
-rw-r--r--vehicle.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/vehicle.c b/vehicle.c
index 45f7c6ee8..b7fa42aee 100644
--- a/vehicle.c
+++ b/vehicle.c
@@ -1618,7 +1618,7 @@ static int32 ReplaceVehicle(Vehicle **w, byte flags)
Vehicle *new_v = NULL;
char vehicle_name[32];
- new_engine_type = EngineReplacement(p, old_v->engine_type);
+ new_engine_type = EngineReplacementForPlayer(p, old_v->engine_type);
if (new_engine_type == INVALID_ENGINE) new_engine_type = old_v->engine_type;
cost = DoCommand(old_v->x_pos, old_v->y_pos, new_engine_type, 1, flags, CMD_BUILD_VEH(old_v->type));
@@ -1739,7 +1739,7 @@ static void MaybeReplaceVehicle(Vehicle *v)
if (!p->engine_renew ||
w->age - w->max_age < (p->engine_renew_months * 30) || // replace if engine is too old
w->max_age == 0) { // rail cars got a max age of 0
- if (!EngineHasReplacement(p, w->engine_type)) // updates to a new model
+ if (!EngineHasReplacementForPlayer(p, w->engine_type)) // updates to a new model
continue;
}