cpp/openttd-patchpack/source Changeset - r4428:bd332de32ae3

Changeset - r4428:bd332de32ae3

Parent rev.

Child rev.

[Not reviewed]

master

0 6 0

tron - 18 years ago 2006-08-28 06:21:48
tron@openttd.org

(svn r6183) Move GetDrawStringPlayerColor() out of gfx.[ch]

6 files changed with 14 insertions and 12 deletions:

gfx.c

gfx.h

network_client.c

network_server.c

player.h

players.c

0 comments (0 inline, 0 general)

gfx.c

➞

Show inline comments

@@ @@ -3,7 +3,7 @@ @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "functions.h"
-#include "player.h"
+#include "macros.h"
 #include "spritecache.h"
 #include "strings.h"
 #include "string.h"
@@ @@ -1998,11 +1998,3 @@ void SortResolutions(int count) @@
+{
 	qsort(_resolutions, count, sizeof(_resolutions[0]), compare_res);
+}
 uint16 GetDrawStringPlayerColor(PlayerID player)
+{
 	// Get the color for DrawString-subroutines which matches the color
 	//  of the player
 	if (player == OWNER_SPECTATOR || player == OWNER_SPECTATOR - 1) return 1;
 	return (_color_list[_player_colors[player]].window_color_1b) | IS_PALETTE_COLOR;
+}

gfx.h

➞

Show inline comments

@@ @@ -74,7 +74,6 @@ void DrawStringRightAlignedUnderline(int @@
 void GfxFillRect(int left, int top, int right, int bottom, int color);
 void GfxDrawLine(int left, int top, int right, int bottom, int color);
 void DrawFrameRect(int left, int top, int right, int bottom, int color, int flags);
 uint16 GetDrawStringPlayerColor(PlayerID player);
 int GetStringWidth(const char *str);
 void LoadStringWidthTable(void);

network_client.c

➞

Show inline comments

@@ @@ -15,7 +15,6 @@ @@
 #include "network_gamelist.h"
 #include "saveload.h"
 #include "command.h"
 #include "gfx.h"
 #include "window.h"
 #include "console.h"
 #include "variables.h"

network_server.c

➞

Show inline comments

@@ @@ -16,7 +16,6 @@ @@
 #include "network_udp.h"
 #include "console.h"
 #include "command.h"
 #include "gfx.h"
 #include "saveload.h"
 #include "vehicle.h"
 #include "station.h"

player.h

➞

Show inline comments

@@ @@ -196,6 +196,8 @@ typedef struct Player { @@
 	uint32 engine_renew_money;
 } Player;
 uint16 GetDrawStringPlayerColor(PlayerID player);
 void ChangeOwnershipOfPlayerItems(PlayerID old_player, PlayerID new_player);
 void GetNameOfOwner(PlayerID owner, TileIndex tile);
 int64 CalculateCompanyValue(const Player* p);

players.c

➞

Show inline comments

@@ @@ -27,6 +27,17 @@ @@
 #include "ai/ai.h"
 #include "date.h"
 uint16 GetDrawStringPlayerColor(PlayerID player)
+{
 	/* Get the color for DrawString-subroutines which matches the color of the
 	 * player
 	 */
 	if (player == OWNER_SPECTATOR || player == OWNER_SPECTATOR - 1) return 1;
 	return (_color_list[_player_colors[player]].window_color_1b) | IS_PALETTE_COLOR;
+}
 static const SpriteID cheeks_table[4] = {
 x325, 0x326,
 x390, 0x3B0,

0 comments (0 inline, 0 general)