diff options
| author | bjarni <bjarni@openttd.org> | 2005-11-18 23:41:03 +0000 |
|---|---|---|
| committer | bjarni <bjarni@openttd.org> | 2005-11-18 23:41:03 +0000 |
| commit | 22a46798378768271af6b90cd41327155a909dd2 (patch) | |
| tree | 3dd0d12983f0eaa08af460475f1f8b0a2c961d75 /water_cmd.c | |
| parent | 40ec9bb1235a2231f0c883baaae73e106c67f1cf (diff) | |
| download | openttd-22a46798378768271af6b90cd41327155a909dd2.tar.xz | |
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
This means that any user attempt to remove a rear engine will tell the user to move the front engine instead
This fixes the assert when moving multiheaded engines (introduced in r3144)
Note: to make old savegames use this feature, some engines might be turned around in order to link engines in pairs
-Codechange: train subtype is now a bitmask
This allows fast access to info like if it is a wagon or engine and if it is in front and so on
Note: savegame version bump
Diffstat (limited to 'water_cmd.c')
| -rw-r--r-- | water_cmd.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/water_cmd.c b/water_cmd.c index 8530e2cb7..a942cf1ef 100644 --- a/water_cmd.c +++ b/water_cmd.c @@ -15,6 +15,7 @@ #include "sound.h" #include "depot.h" #include "vehicle_gui.h" +#include "train.h" const SpriteID _water_shore_sprites[15] = { 0, @@ -598,7 +599,7 @@ static void FloodVehicle(Vehicle *v) v = GetFirstVehicleInChain(v); u = v; - if (v->subtype == TS_Front_Engine) pass = 4; // driver + if (IsFrontEngine(v)) pass = 4; // driver // crash all wagons, and count passangers BEGIN_ENUM_WAGONS(v) |