cpp/openttd-patchpack/source Changeset - r8598:ad76237b6806

Changeset - r8598:ad76237b6806

Parent rev.

Child rev.

[Not reviewed]

master

0 5 0

smatz - 16 years ago 2008-02-18 18:35:36
smatz@openttd.org

(svn r12179) -Codechange: use GetCrossingRailTrack() and GetCrossingRailAxis() to improve code readability

5 files changed with 16 insertions and 5 deletions:

src/openttd.cpp

src/rail_cmd.cpp

src/road_cmd.cpp

src/road_map.h

src/train_cmd.cpp

0 comments (0 inline, 0 general)

src/openttd.cpp

➞

Show inline comments

@@ @@ -2390,13 +2390,13 @@ bool AfterLoadGame() @@
+				}
 				if (IsLevelCrossing(t)) {
 					Owner o = GetTileOwner(t);
 					if (!GetPlayer(o)->is_active) {
 						/* remove leftover rail piece from crossing (from very old savegames) */
 						_current_player = o;
-						DoCommand(t, 0, AxisToTrack(OtherAxis(GetCrossingRoadAxis(t))), DC_EXEC | DC_BANKRUPT, CMD_REMOVE_SINGLE_RAIL);
+						DoCommand(t, 0, GetCrossingRailTrack(t), DC_EXEC | DC_BANKRUPT, CMD_REMOVE_SINGLE_RAIL);
+					}
+				}
+			}
+		}
 		/* Convert old PF settings to new */

src/rail_cmd.cpp

➞

Show inline comments

@@ @@ -1310,13 +1310,13 @@ CommandCost CmdConvertRail(TileIndex til @@
 					cost.AddCost((GetTunnelBridgeLength(tile, endtile) + 2) * RailConvertCost(type, totype));
 				} break;
 				default: // MP_STATION, MP_ROAD
 					if (flags & DC_EXEC) {
-						Track track = (tt == MP_STATION) ? GetRailStationTrack(tile) : AxisToTrack(OtherAxis(GetCrossingRoadAxis(tile)));
+						Track track = ((tt == MP_STATION) ? GetRailStationTrack(tile) : GetCrossingRailTrack(tile));
 						YapfNotifyTrackLayoutChange(tile, track);
+					}
 					cost.AddCost(RailConvertCost(type, totype));
 					break;
+			}

src/road_cmd.cpp

➞

Show inline comments

@@ @@ -1445,13 +1445,13 @@ static void ChangeTileOwner_Road(TileInd @@
+		}
+	}
 	if (IsLevelCrossing(tile)) {
 		if (GetTileOwner(tile) == old_player) {
 			if (new_player == PLAYER_SPECTATOR) {
-				DoCommand(tile, 0, AxisToTrack(OtherAxis(GetCrossingRoadAxis(tile))), DC_EXEC | DC_BANKRUPT, CMD_REMOVE_SINGLE_RAIL);
+				DoCommand(tile, 0, GetCrossingRailTrack(tile), DC_EXEC | DC_BANKRUPT, CMD_REMOVE_SINGLE_RAIL);
 			} else {
 				SetTileOwner(tile, new_player);
+			}
+		}
+	}
+}

src/road_map.h

➞

Show inline comments

@@ @@ -203,20 +203,31 @@ static inline void SetDisallowedRoadDire @@
 static inline Axis GetCrossingRoadAxis(TileIndex t)
+{
 	assert(IsLevelCrossing(t));
 	return (Axis)GB(_m[t].m4, 6, 1);
+}
 static inline Axis GetCrossingRailAxis(TileIndex t)
+{
 	assert(IsLevelCrossing(t));
 	return OtherAxis((Axis)GetCrossingRoadAxis(t));
+}
 static inline RoadBits GetCrossingRoadBits(TileIndex tile)
+{
 	return GetCrossingRoadAxis(tile) == AXIS_X ? ROAD_X : ROAD_Y;
+}
 static inline Track GetCrossingRailTrack(TileIndex tile)
+{
 	return AxisToTrack(GetCrossingRailAxis(tile));
+}
 static inline TrackBits GetCrossingRailBits(TileIndex tile)
+{
-	return AxisToTrackBits(OtherAxis(GetCrossingRoadAxis(tile)));
+	return AxisToTrackBits(GetCrossingRailAxis(tile));
+}
 static inline bool IsCrossingBarred(TileIndex t)
+{
 	assert(IsLevelCrossing(t));
 	return HasBit(_m[t].m4, 5);

src/train_cmd.cpp

➞

Show inline comments

@@ @@ -1664,13 +1664,13 @@ static void *TrainApproachingCrossingEnu @@
  * @pre tile is a rail-road crossing
  */
 static Vehicle *TrainApproachingCrossing(TileIndex tile)
+{
 	assert(IsLevelCrossingTile(tile));
-	DiagDirection dir = AxisToDiagDir(OtherAxis(GetCrossingRoadAxis(tile)));
+	DiagDirection dir = AxisToDiagDir(GetCrossingRailAxis(tile));
 	TileIndex tile_from = tile + TileOffsByDiagDir(dir);
 	Vehicle *v = (Vehicle *)VehicleFromPos(tile_from, &tile, &TrainApproachingCrossingEnum);
 	if (v != NULL) return v;

0 comments (0 inline, 0 general)