mirror/OpenTTD
1
0
Fork 1
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-08-26 07:59:09 +00:00
Code Issues Activity

(svn r3075) -PBS: Keep track reservation state while building and removing a waypoint.

Browse Source
This commit is contained in:
peter1138
2005-10-21 06:04:17 +00:00
parent 8bf11c2e41
commit 5565abb871
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
waypoint.c
View File

@@ -14,6 +14,7 @@
#include "town.h" #include "town.h"
#include "waypoint.h" #include "waypoint.h"
#include "variables.h" #include "variables.h"
#include "pbs.h"
#include "table/sprites.h" #include "table/sprites.h"
#include "table/strings.h" #include "table/strings.h"
@@ -197,12 +198,14 @@ int32 CmdBuildTrainWaypoint(int x, int y, uint32 flags, uint32 p1, uint32 p2)
} }
if (flags & DC_EXEC) { if (flags & DC_EXEC) {
bool reserved = PBSTileReserved(tile) != 0;
ModifyTile(tile, MP_MAP5, RAIL_TYPE_WAYPOINT | dir); ModifyTile(tile, MP_MAP5, RAIL_TYPE_WAYPOINT | dir);
if (--p1 & 0x100) { // waypoint type 0 uses default graphics if (--p1 & 0x100) { // waypoint type 0 uses default graphics
// custom graphics // custom graphics
_m[tile].m3 |= 16; _m[tile].m3 |= 16;
_m[tile].m4 = p1 & 0xff; _m[tile].m4 = p1 & 0xff;
} }
if (reserved) PBSReserveTrack(tile, dir);
wp->deleted = 0; wp->deleted = 0;
wp->xy = tile; wp->xy = tile;
@@ -272,9 +275,11 @@ int32 RemoveTrainWaypoint(TileIndex tile, uint32 flags, bool justremove)
RedrawWaypointSign(wp); RedrawWaypointSign(wp);
if (justremove) { if (justremove) {
bool reserved = PBSTileReserved(tile) != 0;
ModifyTile(tile, MP_MAP5, 1<<direction); ModifyTile(tile, MP_MAP5, 1<<direction);
_m[tile].m3 &= ~16; _m[tile].m3 &= ~16;
_m[tile].m4 = 0; _m[tile].m4 = 0;
if (reserved) PBSReserveTrack(tile, direction);
} else { } else {
DoClearSquare(tile); DoClearSquare(tile);
SetSignalsOnBothDir(tile, direction); SetSignalsOnBothDir(tile, direction);