cpp/openttd-patchpack/source Changeset - r2537:eb2232d81b9c

Changeset - r2537:eb2232d81b9c

Parent rev.

Child rev.

[Not reviewed]

master

0 12 0

tron - 18 years ago 2005-10-19 14:49:46
tron@openttd.org

(svn r3066) Constify the parameter of GetSlopeZ_*()

12 files changed with 31 insertions and 26 deletions:

clear_cmd.c

dummy_land.c

industry_cmd.c

openttd.h

rail_cmd.c

road_cmd.c

station_cmd.c

town_cmd.c

tree_cmd.c

tunnelbridge_cmd.c

unmovable_cmd.c

water_cmd.c

0 comments (0 inline, 0 general)

clear_cmd.c

➞

Show inline comments

@@ @@ -549,7 +549,7 @@ static void DrawTile_Clear(TileInfo *ti) @@
 	DrawClearLandFence(ti);
+}
-static uint GetSlopeZ_Clear(TileInfo *ti)
+static uint GetSlopeZ_Clear(const TileInfo* ti)
+{
 	return GetPartialZ(ti->x & 0xF, ti->y & 0xF, ti->tileh) + ti->z;
+}

dummy_land.c

➞

Show inline comments

@@ @@ -14,8 +14,9 @@ static void DrawTile_Dummy(TileInfo *ti) @@
+}
 static uint GetSlopeZ_Dummy(TileInfo *ti) {
 	return GetPartialZ(ti->x&0xF, ti->y&0xF, ti->tileh) + ti->z;
 static uint GetSlopeZ_Dummy(const TileInfo* ti)
+{
 	return GetPartialZ(ti->x & 0xF, ti->y & 0xF, ti->tileh) + ti->z;
+}
 static uint GetSlopeTileh_Dummy(const TileInfo *ti) {

industry_cmd.c

➞

Show inline comments

@@ @@ -398,8 +398,9 @@ static void DrawTile_Industry(TileInfo * @@
+}
 static uint GetSlopeZ_Industry(TileInfo *ti) {
 	return GetPartialZ(ti->x&0xF, ti->y&0xF, ti->tileh) + ti->z;
 static uint GetSlopeZ_Industry(const TileInfo* ti)
+{
 	return GetPartialZ(ti->x & 0xF, ti->y & 0xF, ti->tileh) + ti->z;
+}
 static uint GetSlopeTileh_Industry(const TileInfo *ti) {

openttd.h

➞

Show inline comments

@@ @@ -292,7 +292,7 @@ typedef struct { @@
 typedef int32 CommandProc(int x, int y, uint32 flags, uint32 p1, uint32 p2);
 typedef void DrawTileProc(TileInfo *ti);
-typedef uint GetSlopeZProc(TileInfo *ti);
+typedef uint GetSlopeZProc(const TileInfo* ti);
 typedef int32 ClearTileProc(TileIndex tile, byte flags);
 typedef void GetAcceptedCargoProc(TileIndex tile, AcceptedCargo res);
 typedef void GetTileDescProc(TileIndex tile, TileDesc *td);

rail_cmd.c

➞

Show inline comments

@@ @@ -1934,7 +1934,7 @@ void SetSignalsOnBothDir(TileIndex tile, @@
 	UpdateSignalsOnSegment(tile, _search_dir_2[track]);
+}
-static uint GetSlopeZ_Track(TileInfo *ti)
+static uint GetSlopeZ_Track(const TileInfo* ti)
+{
 	uint z = ti->z;
 	int th = ti->tileh;

road_cmd.c

➞

Show inline comments

@@ @@ -932,7 +932,7 @@ void DrawRoadDepotSprite(int x, int y, i @@
+	}
+}
-static uint GetSlopeZ_Road(TileInfo *ti)
+static uint GetSlopeZ_Road(const TileInfo* ti)
+{
 	uint z = ti->z;
 	int th = ti->tileh;

station_cmd.c

➞

Show inline comments

@@ @@ -2225,7 +2225,7 @@ void StationPickerDrawSprite(int x, int @@
+	}
+}
-static uint GetSlopeZ_Station(TileInfo *ti)
+static uint GetSlopeZ_Station(const TileInfo* ti)
+{
 	uint z = ti->z;
 	if (ti->tileh != 0)

town_cmd.c

➞

Show inline comments

@@ @@ -143,9 +143,9 @@ static void DrawTile_Town(TileInfo *ti) @@
+	}
+}
-static uint GetSlopeZ_Town(TileInfo *ti)
+static uint GetSlopeZ_Town(const TileInfo* ti)
+{
 	uint z = GetPartialZ(ti->x&0xF, ti->y&0xF, ti->tileh) + ti->z;
+	uint z = GetPartialZ(ti->x & 0xF, ti->y & 0xF, ti->tileh) + ti->z;
 	if (ti->tileh != 0) z = (z & ~7) + 4;
 	return (uint16) z;
+}

tree_cmd.c

➞

Show inline comments

@@ @@ -339,7 +339,8 @@ static void DrawTile_Trees(TileInfo *ti) @@
+}
 static uint GetSlopeZ_Trees(TileInfo *ti) {
 static uint GetSlopeZ_Trees(const TileInfo* ti)
+{
 	return GetPartialZ(ti->x & 0xF, ti->y & 0xF, ti->tileh) + ti->z;
+}

tunnelbridge_cmd.c

➞

Show inline comments

@@ @@ -1215,10 +1215,12 @@ static void DrawTile_TunnelBridge(TileIn @@
+	}
+}
 static uint GetSlopeZ_TunnelBridge(TileInfo *ti) {
 static uint GetSlopeZ_TunnelBridge(const TileInfo* ti)
+{
 	uint z = ti->z;
 	uint x = ti->x & 0xF;
 	uint y = ti->y & 0xF;
 	uint tileh = ti->tileh;
 	// swap directions if Y tunnel/bridge to let the code handle the X case only.
 	if (ti->map5 & 1) uintswap(x,y);
@@ @@ -1233,11 +1235,11 @@ static uint GetSlopeZ_TunnelBridge(TileI @@
 		if ( ti->map5 & 0x80 ) {
 			// bridge ending?
 			if (!(ti->map5 & 0x40)) {
-				if (BRIDGE_FULL_LEVELED_FOUNDATION & (1 << ti->tileh))	// 7, 11, 13, 14
+				if (BRIDGE_FULL_LEVELED_FOUNDATION & (1 << tileh)) // 7, 11, 13, 14
 					z += 8;
 				// no ramp for bridge ending
-				if ((BRIDGE_PARTLY_LEVELED_FOUNDATION & (1 << ti->tileh) || BRIDGE_NO_FOUNDATION & (1 << ti->tileh)) && ti->tileh != 0) {
 				if ((BRIDGE_PARTLY_LEVELED_FOUNDATION & (1 << tileh) || BRIDGE_NO_FOUNDATION & (1 << tileh)) && tileh != 0) {
 					return z + 8;
 				} else if (!(ti->map5 & 0x20)) { // northern / southern ending
@@ @@ -1251,7 +1253,7 @@ static uint GetSlopeZ_TunnelBridge(TileI @@
 			// bridge middle part
 			} else {
 				// build on slopes?
-				if (ti->tileh) z+=8;
+				if (tileh != 0) z += 8;
 				// keep the same elevation because we're on the bridge?
 				if (_get_z_hint >= z + 8)
@@ @@ -1264,12 +1266,12 @@ static uint GetSlopeZ_TunnelBridge(TileI @@
 				// in the shared area, assume that we're below the bridge, cause otherwise the hint would've caught it.
 				// if rail or road below then it means it's possibly build on slope below the bridge.
 				if (ti->map5 & 0x20) {
-					uint f = _bridge_foundations[ti->map5&1][ti->tileh];
+					uint f = _bridge_foundations[ti->map5 & 1][tileh];
 					// make sure that the slope is not inclined foundation
 					if (IS_BYTE_INSIDE(f, 1, 15)) return z;
 					// change foundation type? XXX - should be const; accessor function!
-					if (f) ti->tileh = _inclined_tileh[f - 15];
+					if (f != 0) tileh = _inclined_tileh[f - 15];
+				}
 				// no transport route, fallback to default
@@ @@ -1279,16 +1281,16 @@ static uint GetSlopeZ_TunnelBridge(TileI @@
 		// if it's a bridge middle with transport route below, then we need to compensate for build on slopes
 		if ( (ti->map5 & (0x80 + 0x40 + 0x20)) == (0x80 + 0x40 + 0x20)) {
 			uint f;
 			if (ti->tileh) z += 8;
 			f = _bridge_foundations[ti->map5&1][ti->tileh];
 			if (tileh != 0) z += 8;
 			f = _bridge_foundations[ti->map5&1][tileh];
 			if (IS_BYTE_INSIDE(f, 1, 15)) return z;
-			if (f) ti->tileh = _inclined_tileh[f - 15];
+			if (f != 0) tileh = _inclined_tileh[f - 15];
+		}
+	}
 	// default case
 	z = ti->z;
-	return GetPartialZ(ti->x&0xF, ti->y&0xF, ti->tileh) + z;
+	return GetPartialZ(ti->x & 0xF, ti->y & 0xF, tileh) + z;
+}
 static uint GetSlopeTileh_TunnelBridge(const TileInfo *ti) {

unmovable_cmd.c

➞

Show inline comments

@@ @@ -180,9 +180,9 @@ static void DrawTile_Unmovable(TileInfo @@
+	}
+}
-static uint GetSlopeZ_Unmovable(TileInfo *ti)
+static uint GetSlopeZ_Unmovable(const TileInfo* ti)
+{
 	return GetPartialZ(ti->x&0xF, ti->y&0xF, ti->tileh) + ti->z;
+	return GetPartialZ(ti->x & 0xF, ti->y & 0xF, ti->tileh) + ti->z;
+}
 static uint GetSlopeTileh_Unmovable(const TileInfo *ti)

water_cmd.c

➞

Show inline comments

@@ @@ -460,9 +460,9 @@ void DrawShipDepotSprite(int x, int y, i @@
+}
-static uint GetSlopeZ_Water(TileInfo *ti)
+static uint GetSlopeZ_Water(const TileInfo* ti)
+{
 	return GetPartialZ(ti->x&0xF, ti->y&0xF, ti->tileh) + ti->z;
+	return GetPartialZ(ti->x & 0xF, ti->y & 0xF, ti->tileh) + ti->z;
+}
 static uint GetSlopeTileh_Water(const TileInfo *ti)

0 comments (0 inline, 0 general)