petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r3218) -Feature: Multiheaded train engines will now stay in the same train

Browse Source 
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
This commit is contained in:
bjarni
2005-11-18 23:41:03 +00:00
parent 40ec9bb123
commit 22a4679837
17 changed files with 615 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tunnelbridge_cmd.c
View File

@@ -22,6 +22,7 @@
#include "debug.h"
#include "variables.h"
#include "bridge.h"
#include "train.h"
#include "table/bridge_land.h"
@@ -1479,7 +1480,7 @@ static uint32 VehicleEnter_TunnelBridge(Vehicle *v, TileIndex tile, int x, int y
vdir = v->direction >> 1;
if (v->u.rail.track != 0x40 && dir == vdir) {
if (v->subtype == TS_Front_Engine && fc == _tunnel_fractcoord_1[dir]) {
if (IsFrontEngine(v) && fc == _tunnel_fractcoord_1[dir]) {
if (v->spritenum < 4)
SndPlayVehicleFx(SND_05_TRAIN_THROUGH_TUNNEL, v);
return 0;
@@ -1534,7 +1535,7 @@ static uint32 VehicleEnter_TunnelBridge(Vehicle *v, TileIndex tile, int x, int y
}
}
} else if (_m[tile].m5 & 0x80) {
if (v->type == VEH_Road || (v->type == VEH_Train && v->subtype == TS_Front_Engine)) {
if (v->type == VEH_Road || (v->type == VEH_Train && IsFrontEngine(v))) {
uint h;
if (GetTileSlope(tile, &h) != 0)