cpp/openttd-patchpack/source Changeset - r3163:2781d0c0b478

Changeset - r3163:2781d0c0b478

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

tron - 19 years ago 2006-03-08 08:51:26
tron@openttd.org

(svn r3789) Add an enum and function to handle DiagDirection changes

2 files changed with 32 insertions and 14 deletions:

direction.h

train_cmd.c

0 comments (0 inline, 0 general)

direction.h

➞

Show inline comments

@@ @@ -65,6 +65,19 @@ static inline DiagDirection ReverseDiagD @@
+}
 typedef enum DiagDirDiff {
 	DIAGDIRDIFF_SAME    = 0,
 	DIAGDIRDIFF_90RIGHT = 1,
 	DIAGDIRDIFF_REVERSE = 2,
 	DIAGDIRDIFF_90LEFT  = 3
 } DiagDirDiff;
 static inline DiagDirection ChangeDiagDir(DiagDirection d, DiagDirDiff delta)
+{
 	return (DiagDirection)((d + delta) % 4);
+}
 static inline DiagDirection DirToDiagDir(Direction dir)
+{
 	return (DiagDirection)(dir >> 1);

train_cmd.c

➞

Show inline comments

@@ @@ -1546,14 +1546,14 @@ static void ReverseTrainDirection(Vehicl @@
 	/* Check if we were approaching a rail/road-crossing */
+	{
 		TileIndex tile = v->tile;
 		int t;
 		DiagDirection dir = DirToDiagDir(v->direction);
 		/* Determine the diagonal direction in which we will exit this tile */
 		t = v->direction >> 1;
 		if (!(v->direction & 1) && v->u.rail.track != _state_dir_table[t]) {
 			t = (t - 1) & 3;
 		if (!(v->direction & 1) && v->u.rail.track != _state_dir_table[dir]) {
 			dir = ChangeDiagDir(dir, DIAGDIRDIFF_90LEFT);
+		}
 		/* Calculate next tile */
-		tile += TileOffsByDir(t);
+		tile += TileOffsByDir(dir);
 		/* Check if the train left a rail/road-crossing */
 		DisableTrainCrossing(tile);
@@ @@ -1785,13 +1785,17 @@ static TrainFindDepotData FindClosestTra @@
 		DiagDirection i;
 		i = DirToDiagDir(v->direction);
 		if (!(v->direction & 1) && v->u.rail.track != _state_dir_table[i]) i = (i + 3) & 3;
 		if (!(v->direction & 1) && v->u.rail.track != _state_dir_table[i]) {
 			i = ChangeDiagDir(i, DIAGDIRDIFF_90LEFT);
+		}
 		NewTrainPathfind(tile, 0, i, (NTPEnumProc*)NtpCallbFindDepot, &tfdd);
 		if (tfdd.best_length == (uint)-1){
 			tfdd.reverse = true;
 			// search in backwards direction
 			i = ReverseDiagDir(DirToDiagDir(v->direction));
 			if (!(v->direction & 1) && v->u.rail.track != _state_dir_table[i]) i = (i + 3) & 3;
 			if (!(v->direction & 1) && v->u.rail.track != _state_dir_table[i]) {
 				i = ChangeDiagDir(i, DIAGDIRDIFF_90LEFT);
+			}
 			NewTrainPathfind(tile, 0, i, (NTPEnumProc*)NtpCallbFindDepot, &tfdd);
+		}
+	}
@@ @@ -3107,7 +3111,8 @@ static bool TrainCheckIfLineEnds(Vehicle @@
 	TileIndex tile;
 	uint x,y;
 	uint16 break_speed;
 	DiagDirection t;
 	DiagDirection dir;
 	int t;
 	uint32 ts;
 	t = v->breakdown_ctr;
@@ @@ -3138,14 +3143,14 @@ static bool TrainCheckIfLineEnds(Vehicle @@
 		return true;*/
 	/* Determine the non-diagonal direction in which we will exit this tile */
 	t = v->direction >> 1;
 	if (!(v->direction & 1) && v->u.rail.track != _state_dir_table[t]) {
 		t = (t - 1) & 3;
 	dir = DirToDiagDir(v->direction);
 	if (!(v->direction & 1) && v->u.rail.track != _state_dir_table[dir]) {
 		dir = ChangeDiagDir(dir, DIAGDIRDIFF_90LEFT);
+	}
 	/* Calculate next tile */
-	tile += TileOffsByDir(t);
+	tile += TileOffsByDir(dir);
 	// determine the track status on the next tile.
-	ts = GetTileTrackStatus(tile, TRANSPORT_RAIL) & _reachable_tracks[t];
+	ts = GetTileTrackStatus(tile, TRANSPORT_RAIL) & _reachable_tracks[dir];
 	/* Calc position within the current tile ?? */
 	x = v->x_pos & 0xF;
@@ @@ -3166,7 +3171,7 @@ static bool TrainCheckIfLineEnds(Vehicle @@
 		if (x + 4 > 15 &&
 				(!CheckCompatibleRail(v, tile) ||
 				(IsTileDepotType(tile, TRANSPORT_RAIL) &&
-				GetDepotDirection(tile, TRANSPORT_RAIL) == t))) {
+				GetDepotDirection(tile, TRANSPORT_RAIL) == dir))) {
 			v->cur_speed = 0;
 			ReverseTrainDirection(v);
 			return false;

0 comments (0 inline, 0 general)