cpp/openttd-patchpack/source Changeset - r12470:62669b41f044

Changeset - r12470:62669b41f044

Parent rev.

Child rev.

[Not reviewed]

master

0 5 0

rubidium - 15 years ago 2009-07-22 16:56:36
rubidium@openttd.org

(svn r16917) -Codechange: fix some GCC 4.5 'case X is not in enum Y' warnings

5 files changed with 33 insertions and 21 deletions:

src/ai/api/ai_road.cpp

src/rail_gui.cpp

src/rail_type.h

src/road_type.h

src/saveload/oldloader_sl.cpp

0 comments (0 inline, 0 general)

src/ai/api/ai_road.cpp

➞

Show inline comments

@@ @@ -263,47 +263,47 @@ static int32 LookupWithBuildOnSlopes(::S @@
+	}
 	switch (slope) {
 		case SLOPE_W:
 			/* A slope similar to a SLOPE_W. */
 			switch (new_roadbits) {
 				case  6: // ROAD_SE | ROAD_SW:
 				case  9: // ROAD_NE | ROAD_NW:
 				case 12: // ROAD_NE | ROAD_SE:
 				case ROAD_N:
 				case ROAD_E:
 				case ROAD_S:
 					/* Cannot build anything with a turn from the low side. */
 					return 0;
 				case  5: // ROAD_SE | ROAD_NW:
 				case 10: // ROAD_NE | ROAD_SW:
 				case ROAD_X:
 				case ROAD_Y:
 					/* A 'sloped' tile is going to be build. */
 					if ((existing_roadbits | new_roadbits) != new_roadbits) {
 						/* There is already a foundation on the tile, or at least
 						 * another slope that is not compatible with the new one. */
 						return 0;
+					}
 					/* If the start is in the low part, it is automatically
 					 * building the second part too. */
-					return ((start_roadbits & (ROAD_NE | ROAD_SE)) && !(existing_roadbits & (ROAD_SW | ROAD_NW))) ? 2 : 1;
+					return ((start_roadbits & ROAD_E) && !(existing_roadbits & ROAD_W)) ? 2 : 1;
 				default:
 					/* Roadbits causing a foundation are going to be build.
 					 * When the existing roadbits are slopes (the lower bits
 					 * are used), this cannot be done. */
 					if ((existing_roadbits | new_roadbits) == new_roadbits) return 1;
-					return (existing_roadbits & (ROAD_NE | ROAD_SE)) ? 0 : 1;
+					return (existing_roadbits & ROAD_E) ? 0 : 1;
+			}
 		case SLOPE_SW:
 			/* A slope similar to a SLOPE_SW. */
 			switch (new_roadbits) {
 				case  9: // ROAD_NE | ROAD_NW:
 				case 12: // ROAD_NE | ROAD_SE:
 				case ROAD_N:
 				case ROAD_E:
 					/* Cannot build anything with a turn from the low side. */
 					return 0;
-				case 10: // ROAD_NE | ROAD_SW:
+				case ROAD_X:
 					/* A 'sloped' tile is going to be build. */
 					if ((existing_roadbits | new_roadbits) != new_roadbits) {
 						/* There is already a foundation on the tile, or at least
 						 * another slope that is not compatible with the new one. */
 						return 0;
+					}

src/rail_gui.cpp

➞

Show inline comments

@@ @@ -1821,13 +1821,13 @@ static void SetDefaultRailGui() @@
+{
 	if (_local_company == COMPANY_SPECTATOR || !Company::IsValidID(_local_company)) return;
 	extern RailType _last_built_railtype;
 	RailType rt = (RailType)_settings_client.gui.default_rail_type;
 	if (rt >= RAILTYPE_END) {
-		if (rt == RAILTYPE_END + 2) {
+		if (rt == DEF_RAILTYPE_MOST_USED) {
 			/* Find the most used rail type */
 			RailType count[RAILTYPE_END];
 			memset(count, 0, sizeof(count));
 			for (TileIndex t = 0; t < MapSize(); t++) {
 				if (IsTileType(t, MP_RAILWAY) || IsLevelCrossingTile(t) || IsRailwayStationTile(t) ||
 						(IsTileType(t, MP_TUNNELBRIDGE) && GetTunnelBridgeTransportType(t) == TRANSPORT_RAIL)) {
@@ @@ -1838,21 +1838,21 @@ static void SetDefaultRailGui() @@
 			rt = RAILTYPE_RAIL;
 			for (RailType r = RAILTYPE_ELECTRIC; r < RAILTYPE_END; r++) {
 				if (count[r] >= count[rt]) rt = r;
+			}
 			/* No rail, just get the first available one */
-			if (count[rt] == 0) rt = RAILTYPE_END;
+			if (count[rt] == 0) rt = DEF_RAILTYPE_FIRST;
+		}
 		switch (rt) {
-			case RAILTYPE_END + 0:
+			case DEF_RAILTYPE_FIRST:
 				rt = RAILTYPE_RAIL;
 				while (rt < RAILTYPE_END && !HasRailtypeAvail(_local_company, rt)) rt++;
 				break;
-			case RAILTYPE_END + 1:
+			case DEF_RAILTYPE_LAST:
 				rt = GetBestRailtype(_local_company);
 				break;
 			default:
 				break;
+		}

src/rail_type.h

➞

Show inline comments

@@ @@ -18,13 +18,17 @@ enum RailType { @@
 	RAILTYPE_BEGIN    = 0,          ///< Used for iterations
 	RAILTYPE_RAIL     = 0,          ///< Standard non-electric rails
 	RAILTYPE_ELECTRIC = 1,          ///< Electric rails
 	RAILTYPE_MONO     = 2,          ///< Monorail
 	RAILTYPE_MAGLEV   = 3,          ///< Maglev
 	RAILTYPE_END,                   ///< Used for iterations
 	INVALID_RAILTYPE  = 0xFF        ///< Flag for invalid railtype
 	INVALID_RAILTYPE  = 0xFF,       ///< Flag for invalid railtype
 	DEF_RAILTYPE_FIRST = RAILTYPE_END, ///< Default railtype: first available
 	DEF_RAILTYPE_LAST,                 ///< Default railtype: last available
 	DEF_RAILTYPE_MOST_USED,            ///< Default railtype: most used
 };
 /** Allow incrementing of Track variables */
 DECLARE_POSTFIX_INCREMENT(RailType);
 /** Define basic enum properties */
 template <> struct EnumPropsT<RailType> : MakeEnumPropsT<RailType, byte, RAILTYPE_BEGIN, RAILTYPE_END, INVALID_RAILTYPE> {};

src/road_type.h

➞

Show inline comments

@@ @@ -48,11 +48,17 @@ enum RoadBits { @@
 	ROAD_NW   = 1U,                  ///< North-west part
 	ROAD_SW   = 2U,                  ///< South-west part
 	ROAD_SE   = 4U,                  ///< South-east part
 	ROAD_NE   = 8U,                  ///< North-east part
 	ROAD_X    = ROAD_SW | ROAD_NE,   ///< Full road along the x-axis (south-west + north-east)
 	ROAD_Y    = ROAD_NW | ROAD_SE,   ///< Full road along the y-axis (north-west + south-east)
 	ROAD_N    = ROAD_NE | ROAD_NW,   ///< Road at the two northern edges
 	ROAD_E    = ROAD_NE | ROAD_SE,   ///< Road at the two eastern edges
 	ROAD_S    = ROAD_SE | ROAD_SW,   ///< Road at the two southern edges
 	ROAD_W    = ROAD_NW | ROAD_SW,   ///< Road at the two western edges
 	ROAD_ALL  = ROAD_X  | ROAD_Y     ///< Full 4-way crossing
 };
 DECLARE_ENUM_AS_BIT_SET(RoadBits);
 #endif /* ROAD_TYPE_H */

src/saveload/oldloader_sl.cpp

➞

Show inline comments

@@ @@ -201,24 +201,26 @@ void FixOldVehicles() @@
+}
 static bool FixTTOMapArray()
+{
 	for (TileIndex t = 0; t < OLD_MAP_SIZE; t++) {
 		TileType tt = GetTileType(t);
 		if (tt == 11) {
 			/* TTO has a different way of storing monorail.
 			 * Instead of using bits in m3 it uses a different tile type. */
 			_m[t].m3 = 1; // rail type = monorail (in TTD)
 			SetTileType(t, MP_RAILWAY);
 			_m[t].m2 = 1; // set monorail ground to RAIL_GROUND_GRASS
 			tt = MP_RAILWAY;
+		}
 		switch (tt) {
 			case MP_CLEAR:
 				break;
 			case MP_RAILWAY:
 			case 11: // monorail
 				if (tt == 11) {
 					_m[t].m3 = 1; // rail type = monorail
 					_m[t].type_height &= 0x1F; // -> MP_RAILWAY
 					_m[t].m2 = 1; // set monorail ground to RAIL_GROUND_GRASS
+				}
 				switch (GB(_m[t].m5, 6, 2)) {
 					case 0: // RAIL_TILE_NORMAL
 						break;
 					case 1: // RAIL_TILE_SIGNALS
 						_m[t].m4 = (~_m[t].m5 & 1) << 2;        // signal variant (present only in OTTD)
 						SB(_m[t].m2, 6, 2, GB(_m[t].m5, 3, 2)); // signal status

0 comments (0 inline, 0 general)