1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-12 14:10:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

bug fixes from Overhaul:

Browse Source 
- Data type changes 
- Templates removed

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@871 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
lalien
2007-05-09 13:16:37 +00:00
parent 61d6152ce5
commit 0530b53b9c
256 changed files with 2000 additions and 2228 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TileEngine/Render Dirty.cpp
+9 -11
View File
@@ -746,17 +746,17 @@ BOOLEAN CopyExternBackgroundRect( INT16 sLeft, INT16 sTop, INT16 sWidth, INT16 s
// to the video buffer.
//
//*****************************************************************************
UINT16 gprintfdirty(INT16 x, INT16 y, wchar_t * pFontString, ...)
UINT16 gprintfdirty(INT16 x, INT16 y, STR16 pFontString, ...)
{
va_list argptr;
wchar_t string[512];
CHAR16 string[512];
UINT16 uiStringLength, uiStringHeight;
INT32 iBack;
Assert(pFontString!=NULL);
va_start(argptr, pFontString); // Set up variable argument pointer
vswprintf(string, (wchar_t *)pFontString, argptr); // process gprintf string (get output str)
vswprintf(string, pFontString, argptr); // process gprintf string (get output str)
va_end(argptr);
if ( USE_WINFONTS( ) )
@@ -783,16 +783,16 @@ INT32 iBack;
return(uiStringLength);
}
UINT16 gprintfinvalidate(INT16 x, INT16 y, wchar_t * pFontString, ...)
UINT16 gprintfinvalidate(INT16 x, INT16 y, STR16 pFontString, ...)
{
va_list argptr;
wchar_t string[512];
CHAR16 string[512];
UINT16 uiStringLength, uiStringHeight;
Assert(pFontString!=NULL);
va_start(argptr, pFontString); // Set up variable argument pointer
vswprintf(string, (wchar_t *)pFontString, argptr); // process gprintf string (get output str)
vswprintf(string, pFontString, argptr); // process gprintf string (get output str)
va_end(argptr);
uiStringLength=StringPixLength(string, FontDefault);
@@ -805,18 +805,16 @@ UINT16 uiStringLength, uiStringHeight;
return(uiStringLength);
}
// explicit instantiating work around MSVC not supporting export templated functions/classes (jonathanl)
UINT16 gprintfRestore(INT16 x, INT16 y, wchar_t * pFontString, ...)
UINT16 gprintfRestore(INT16 x, INT16 y, STR16 pFontString, ...)
{
va_list argptr;
wchar_t string[512];
CHAR16 string[512];
UINT16 uiStringLength, uiStringHeight;
Assert(pFontString!=NULL);
va_start(argptr, pFontString); // Set up variable argument pointer
vswprintf(string, (wchar_t *)pFontString, argptr); // process gprintf string (get output str)
vswprintf(string, pFontString, argptr); // process gprintf string (get output str)
va_end(argptr);
uiStringLength=StringPixLength(string, FontDefault);