- added VS2005 compability fix from Space Viking

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@766 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
lalien
2007-03-10 18:46:57 +00:00
parent 9971b56b0e
commit 3f37673034
110 changed files with 477 additions and 439 deletions
+3 -3
View File
@@ -746,7 +746,7 @@ BOOLEAN CopyExternBackgroundRect( INT16 sLeft, INT16 sTop, INT16 sWidth, INT16 s
// to the video buffer.
//
//*****************************************************************************
UINT16 gprintfdirty(INT16 x, INT16 y, UINT16 * pFontString, ...)
UINT16 gprintfdirty(INT16 x, INT16 y, wchar_t * pFontString, ...)
{
va_list argptr;
wchar_t string[512];
@@ -783,7 +783,7 @@ INT32 iBack;
return(uiStringLength);
}
UINT16 gprintfinvalidate(INT16 x, INT16 y, UINT16 * pFontString, ...)
UINT16 gprintfinvalidate(INT16 x, INT16 y, wchar_t * pFontString, ...)
{
va_list argptr;
wchar_t string[512];
@@ -807,7 +807,7 @@ UINT16 uiStringLength, uiStringHeight;
// explicit instantiating work around MSVC not supporting export templated functions/classes (jonathanl)
UINT16 gprintfRestore(INT16 x, INT16 y, UINT16 * pFontString, ...)
UINT16 gprintfRestore(INT16 x, INT16 y, wchar_t * pFontString, ...)
{
va_list argptr;
wchar_t string[512];
+4 -4
View File
@@ -83,7 +83,7 @@ typedef struct
INT16 sY;
UINT8 ubFontBack;
UINT8 ubFontFore;
INT16 pzText[ 200 ];
wchar_t pzText[ 200 ];
OVERLAY_CALLBACK BltCallback;
} VIDEO_OVERLAY_DESC;
@@ -124,9 +124,9 @@ BOOLEAN EmptyBackgroundRects( void );
// GPRINTF DIRTY STUFF
UINT16 gprintfdirty(INT16 x, INT16 y, UINT16 * pFontString, ...);
UINT16 gprintfinvalidate(INT16 x, INT16 y, UINT16 * pFontString, ...);
UINT16 gprintfRestore(INT16 x, INT16 y, UINT16 * pFontString, ...);
UINT16 gprintfdirty(INT16 x, INT16 y, wchar_t * pFontString, ...);
UINT16 gprintfinvalidate(INT16 x, INT16 y, wchar_t * pFontString, ...);
UINT16 gprintfRestore(INT16 x, INT16 y, wchar_t * pFontString, ...);
// VIDEO OVERLAY STUFF
+1 -1
View File
@@ -440,7 +440,7 @@ void RenderTacticalPlacementGUI()
SOLDIERTYPE *pSoldier;
UINT32 uiDestPitchBYTES;
UINT16 usHatchColor;
UINT16 str[ 128 ];
wchar_t str[ 128 ];
UINT8 *pDestBuf;
UINT8 ubColor;
+1 -1
View File
@@ -2229,7 +2229,7 @@ BOOLEAN EvaluateWorld( UINT8 * pSector, UINT8 ubLevel )
INT32 cnt;
INT32 i;
INT32 iTilesetID;
UINT16 str[40];
wchar_t str[40];
UINT8 bCounts[ WORLD_MAX ][8];
UINT8 ubCombine;
UINT8 szDirFilename[ 50 ];