(svn r942) -Merged branch/network back into the trunk

1 files changed, 6 insertions, 5 deletions

diff --git a/gfx.h b/gfx.h
index bab426944..b5bfd7966 100644
--- a/gfx.h
+++ b/gfx.h
@@ -42,14 +42,15 @@ typedef struct CursorVars {
 
 void RedrawScreenRect(int left, int top, int right, int bottom);
 void GfxScroll(int left, int top, int width, int height, int xo, int yo);
-int DrawStringCentered(int x, int y, uint16 str, byte color);
-int DrawString(int x, int y, uint16 str, byte color);
-void DrawStringCenterUnderline(int x, int y, uint16 str, byte color);
-int DoDrawString(const byte *string, int x, int y, byte color);
-void DrawStringRightAligned(int x, int y, uint16 str, byte color);
+int DrawStringCentered(int x, int y, uint16 str, uint16 color);
+int DrawString(int x, int y, uint16 str, uint16 color);
+void DrawStringCenterUnderline(int x, int y, uint16 str, uint16 color);
+int DoDrawString(const byte *string, int x, int y, uint16 color);
+void DrawStringRightAligned(int x, int y, uint16 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(byte player);
 
 int GetStringWidth(const byte *str);
 void LoadStringWidthTable();