cpp/openttd-patchpack/source Changeset - r2843:7c0bddd17594

Changeset - r2843:7c0bddd17594

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

peter1138 - 18 years ago 2006-01-08 12:44:11
peter1138@openttd.org

(svn r3391) - PBS Fix: Keep PBS reservation state when building a bridge over rail.

1 file changed with 12 insertions and 0 deletions:

tunnelbridge_cmd.c

0 comments (0 inline, 0 general)

tunnelbridge_cmd.c

➞

Show inline comments

@@ @@ -204,6 +204,7 @@ int32 CmdBuildBridge(int x, int y, uint3 @@
 	uint i;
 	int32 cost, terraformcost, ret;
 	bool allow_on_slopes;
 	bool reserved = false;
 	SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION);
@@ @@ -351,6 +352,7 @@ int32 CmdBuildBridge(int x, int y, uint3 @@
 				if (ti.map5 != 1) goto not_valid_below;
+			}
 			m5 = 0xE0;
 			reserved = PBSTileReserved(ti.tile) != 0;
 		} else if (ti.type == MP_STREET) {
 			if (direction == 0) {
 				if (ti.map5 != 5) goto not_valid_below;
@@ @@ -400,6 +402,16 @@ not_valid_below:; @@
 			_m[ti.tile].m2 = (bridge_type << 4) | m5;
 			SB(_m[ti.tile].m3, 4, 4, railtype);
 			if (ti.type == MP_RAILWAY) {
 				// Set or clear PBS reservation status. direction here is of
 				// the bridge, not the track below.
 				if (reserved) {
 					PBSReserveTrack(ti.tile, direction ? TRACK_DIAG1 : TRACK_DIAG2);
 				} else {
 					PBSClearTrack(ti.tile, direction ? TRACK_DIAG1 : TRACK_DIAG2);
+				}
+			}
 			MarkTileDirtyByTile(ti.tile);
+		}
+	}

0 comments (0 inline, 0 general)