cpp/openttd-patchpack/source Changeset - r7482:9fc80ebce275

Changeset - r7482:9fc80ebce275

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

belugas - 17 years ago 2007-08-27 23:50:56
belugas@openttd.org

(svn r10993) -Codechange: A few less magical numbers (skidd13)

1 file changed with 6 insertions and 6 deletions:

src/town_cmd.cpp

0 comments (0 inline, 0 general)

src/town_cmd.cpp

➞

Show inline comments

@@ @@ -672,7 +672,7 @@ static bool IsRoadAllowedHere(TileIndex @@
 			/* No, try to build one in the direction.
 			 * if that fails clear the land, and if that fails exit.
 			 * This is to make sure that we can build a road here later. */
-			if (CmdFailed(DoCommand(tile, (dir & 1 ? ROAD_X : ROAD_Y), 0, DC_AUTO, CMD_BUILD_ROAD)) &&
+			if (CmdFailed(DoCommand(tile, (dir & ROAD_NW ? ROAD_X : ROAD_Y), 0, DC_AUTO, CMD_BUILD_ROAD)) &&
 					CmdFailed(DoCommand(tile, 0, 0, DC_AUTO, CMD_LANDSCAPE_CLEAR)))
 				return false;
+		}
@@ @@ -695,7 +695,7 @@ no_slope: @@
 		/* If the tile is not a slope in the right direction, then
 		 * maybe terraform some. */
-		k = (dir & 1) ? SLOPE_NE : SLOPE_NW;
+		k = (dir & ROAD_NW) ? SLOPE_NE : SLOPE_NW;
 		if (k != slope && ComplementSlope(k) != slope) {
 			uint32 r = Random();
@@ @@ -939,7 +939,7 @@ static void GrowTownInTile(TileIndex* ti @@
 					 *  at any side of the new road. */
+				}
-				rcmd = (RoadBits)((1 << a) + (1 << b));
+				rcmd = (RoadBits)((ROAD_NW << a) + (ROAD_NW << b));
 				break;
+		}
@@ @@ -961,7 +961,7 @@ static void GrowTownInTile(TileIndex* ti @@
 			case TL_BETTER_ROADS:
 			case TL_ORIGINAL:
-				rcmd = (RoadBits)(1 << (block ^ 2));
+				rcmd = (RoadBits)(ROAD_NW << (block ^ 2));
 				break;
+		}
 	} else {
@@ @@ -1040,7 +1040,7 @@ static void GrowTownInTile(TileIndex* ti @@
+		}
 		_grow_town_result = 0;
-		rcmd = (RoadBits)(1 << i);
+		rcmd = (RoadBits)(ROAD_NW << i);
+	}
 	/* Return if a water tile */
@@ @@ -1138,7 +1138,7 @@ static int GrowTownAtRoad(Town *t, TileI @@
 		/* Exclude the source position from the bitmask
 		 * and return if no more road blocks available */
 		ClrBitT(mask, (block ^ 2));
-		if (mask == 0)
+		if (mask == ROAD_NONE)
 			return _grow_town_result;
 		/* Select a random bit from the blockmask, walk a step

0 comments (0 inline, 0 general)