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

gfx.c

@@ -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

@@ -74,7 +74,6 @@ void DrawStringRightAlignedUnderline(int x, int y, StringID str, uint16 color);
 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

@@ -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

@@ -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

@@ -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

@@ -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] = {
 	0x325, 0x326,
 	0x390, 0x3B0,