mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

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

release/0.5
tron 2006-08-28 06:21:48 +00:00
parent 3c844b6391
commit 523519c8ec
6 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gfx.c
View File

@ -3,7 +3,7 @@
#include "stdafx.h" #include "stdafx.h"
#include "openttd.h" #include "openttd.h"
#include "functions.h" #include "functions.h"
#include "player.h" #include "macros.h"
#include "spritecache.h" #include "spritecache.h"
#include "strings.h" #include "strings.h"
#include "string.h" #include "string.h"
@ -1998,11 +1998,3 @@ void SortResolutions(int count)
{ {
qsort(_resolutions, count, sizeof(_resolutions[0]), compare_res); 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;
}

1
gfx.h
View File

@ -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 GfxFillRect(int left, int top, int right, int bottom, int color);
void GfxDrawLine(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); void DrawFrameRect(int left, int top, int right, int bottom, int color, int flags);
uint16 GetDrawStringPlayerColor(PlayerID player);
int GetStringWidth(const char *str); int GetStringWidth(const char *str);
void LoadStringWidthTable(void); void LoadStringWidthTable(void);

1
network_client.c
View File

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

1
network_server.c
View File

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

2
player.h
View File

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

11
players.c
View File

@ -27,6 +27,17 @@
#include "ai/ai.h" #include "ai/ai.h"
#include "date.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] = { static const SpriteID cheeks_table[4] = {
0x325, 0x326, 0x325, 0x326,
0x390, 0x3B0, 0x390, 0x3B0,