cpp/openttd-patchpack/source Changeset - r3506:54ea6bf46228

Changeset - r3506:54ea6bf46228

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

celestar - 18 years ago 2006-04-11 13:10:16
celestar@openttd.org

(svn r4357) -Codechange: Moved global _signal_base_sprites into the only function where it is used and use a better array arrangement for it

1 file changed with 13 insertions and 29 deletions:

rail_cmd.c

0 comments (0 inline, 0 general)

rail_cmd.c

➞

Show inline comments

@@ @@ -1050,36 +1050,8 @@ static int32 ClearTile_Track(TileIndex t @@
+	}
+}
 #include "table/track_land.h"
 // used for presignals
 static const SpriteID _signal_base_sprites[16] = {
 x4FB,
 x1323,
 x1333,
 x1343,
 	// semaphores
 x1353,
 x1363,
 x1373,
 x1383,
 	// mirrored versions
 x4FB,
 x1323,
 x1333,
 x1343,
 	// semaphores
 x1446,
 x1456,
 x1466,
 x1476,
 };
 static void DrawSignalHelper(const TileInfo *ti, byte condition, uint32 image_and_pos)
+{
 	bool otherside = _opt.road_side & _patches.signal_side;
@@ @@ -1097,9 +1069,21 @@ static void DrawSignalHelper(const TileI @@
+		}
 	};
 	static const SpriteID SignalBase[2][2][4] = {
 		{    /* Signals on left side */
 			{  0x4FB, 0x1323, 0x1333, 0x1343}, /* light signals */
 			{ 0x1353, 0x1363, 0x1373, 0x1383}  /* semaphores    */
 		}, { /* Signals on right side */
 			{  0x4FB, 0x1323, 0x1333, 0x1343}, /* light signals */
 			{ 0x1446, 0x1456, 0x1466, 0x1476}  /* semaphores    */
 		/*         |       |       |       |     */
 		/*    normal,  entry,   exit,  combo     */
+		}
 	};
 	uint x = ti->x  + SignalPositions[otherside][image_and_pos & 0xF].x;
 	uint y = ti->y  + SignalPositions[otherside][image_and_pos & 0xF].y;
-	uint sprite = _signal_base_sprites[(_m[ti->tile].m4 & 0x7) + (otherside ? 8 : 0)] + (image_and_pos>>4) + ((condition != 0) ? 1 : 0);
+	SpriteID sprite = SignalBase[otherside][GetSignalVariant(ti->tile)][GetSignalType(ti->tile)] + (image_and_pos>>4) + ((condition != 0) ? 1 : 0);
 	AddSortableSpriteToDraw(sprite, x, y, 1, 1, 10, GetSlopeZ(x,y));
+}

0 comments (0 inline, 0 general)