cpp/openttd-patchpack/source Changeset - r3104:672acaef17a9

Changeset - r3104:672acaef17a9

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

tron - 19 years ago 2006-03-01 15:03:47
tron@openttd.org

(svn r3699) Replace some magic numbers for checking for a suitable slope for a level crossing by some less magic numbers

1 file changed with 5 insertions and 10 deletions:

road_cmd.c

0 comments (0 inline, 0 general)

road_cmd.c

➞

Show inline comments

@@ @@ -261,7 +261,7 @@ return_error:; @@
+}
-static const RoadBits _valid_tileh_slopes_road[3][15] = {
 static const RoadBits _valid_tileh_slopes_road[][15] = {
 	// set of normal ones
+	{
 		ROAD_ALL, 0, 0,
@@ @@ -291,14 +291,6 @@ static const RoadBits _valid_tileh_slope @@
 		ROAD_ALL,
 		ROAD_ALL
 	},
 	// valid railway crossings on slopes
+	{
 , 0, 0, // 0, 1, 2
 , 0, 1, // 3, 4, 5
 , 1, 0, // 6, 7, 8
 , 1, 1, // 9, 10, 11
 , 1, 1, // 12, 13, 14
+	}
 };
@@ @@ -383,9 +375,12 @@ int32 CmdBuildRoad(int x, int y, uint32 @@
 				return_cmd_error(STR_1000_LAND_SLOPED_IN_WRONG_DIRECTION);
+			}
 			if (!_valid_tileh_slopes_road[2][ti.tileh]) { // prevent certain slopes
 #define M(x) (1 << (x))
 			/* Level crossings may only be built on these slopes */
 			if (!HASBIT(M(14) | M(13) | M(11) | M(10) | M(7) | M(5) | M(0), ti.tileh)) {
 				return_cmd_error(STR_1000_LAND_SLOPED_IN_WRONG_DIRECTION);
+			}
 #undef M
 			if (ti.map5 == 2) {
 				if (pieces & ROAD_Y) goto do_clear;

0 comments (0 inline, 0 general)