changeset 3984:e4ab10e99e4f draft

(svn r5173) Use map manipulation functions instead of SB()
author tron <tron@openttd.org>
date Thu, 08 Jun 2006 19:27:20 +0000
parents e5090f56234b
children b5ab3d385a75
files openttd.c
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/openttd.c
+++ b/openttd.c
@@ -1382,12 +1382,12 @@
 	if (CheckSavegameVersion(21) && !CheckSavegameVersion(15)) {
 		BEGIN_TILE_LOOP(tile, MapSizeX(), MapSizeY(), 0) {
 			if (IsTileType(tile, MP_RAILWAY)) {
-				// Clear PBS signals, move back sempahore bit to 2
 				if (HasSignals(tile)) {
 					// convert PBS signals to combo-signals
-					if (HASBIT(_m[tile].m4, 2)) SB(_m[tile].m4, 0, 2, 3);
+					if (HASBIT(_m[tile].m4, 2)) SetSignalType(tile, SIGTYPE_COMBO);
 
-					SB(_m[tile].m4, 2, 2, HASBIT(_m[tile].m4, 3));
+					// move the signal variant back
+					SetSignalVariant(tile, HASBIT(_m[tile].m4, 3) ? SIG_SEMAPHORE : SIG_ELECTRIC);
 					CLRBIT(_m[tile].m4, 3);
 				}