cpp/openttd-patchpack/source Changeset - r1092:38075f981441

Changeset - r1092:38075f981441

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

tron - 19 years ago 2005-01-22 19:41:30
tron@openttd.org

(svn r1593) Remove yet another alloca()

1 file changed with 8 insertions and 12 deletions:

smallmap_gui.c

0 comments (0 inline, 0 general)

smallmap_gui.c

➞

Show inline comments

@@ @@ -508,7 +508,7 @@ static void DrawSmallMapVegetation(byte @@
+}
-static uint32 *_owner_colors;
+static uint32 _owner_colors[256];
 static inline uint32 GetSmallMapOwnerPixels(uint tile)
+{
@@ @@ -603,24 +603,20 @@ static void DrawSmallMap(DrawPixelInfo * @@
 	/* setup owner table */
 	if (type == 5) {
 		Player *p;
 		uint32 *tbl;
 		/* setup owners ptr */
 		_owner_colors = tbl = alloca(256 * sizeof(*_owner_colors));
 		/* clear the town colors */
-		memset(tbl + 128, 0xB4, 128 * sizeof(*_owner_colors));
+		memset(&_owner_colors[128], 0xB4, 128 * sizeof(*_owner_colors));
 		/* fill with some special colors */
 		tbl[0x10] = MKCOLOR(0x54545454);
 		tbl[0x11] = MKCOLOR(0xCACACACA);
 		tbl[0xff] = MKCOLOR(0x20202020); /* industry */
 		_owner_colors[0x10] = MKCOLOR(0x54545454);
 		_owner_colors[0x11] = MKCOLOR(0xCACACACA);
 		_owner_colors[0xff] = MKCOLOR(0x20202020); /* industry */
 		/* now fill with the player colors */
 		FOR_ALL_PLAYERS(p) {
 			if (p->is_active) {
 				tbl[p->index] = dup_byte32(GetSpritePtr(0x307 + p->player_color)[0xCB]);
+			}
 			if (p->is_active)
 				_owner_colors[p->index] =
 					dup_byte32(GetSpritePtr(0x307 + p->player_color)[0xCB]);
+		}
+	}

0 comments (0 inline, 0 general)