bug fixes from Overhaul:

- 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
+8 -8
View File
@@ -234,7 +234,7 @@ BOOLEAN CreateStringVideoOverlay( ScrollStringStPtr pStringSt, UINT16 usX, UINT1
VideoOverlayDesc.ubFontFore = (unsigned char)pStringSt->usColor;
VideoOverlayDesc.sX = VideoOverlayDesc.sLeft;
VideoOverlayDesc.sY = VideoOverlayDesc.sTop;
swprintf( (wchar_t *)VideoOverlayDesc.pzText, (wchar_t *)pStringSt->pString16 );
swprintf( VideoOverlayDesc.pzText, pStringSt->pString16 );
VideoOverlayDesc.BltCallback = BlitString;
pStringSt->iVideoOverlay = RegisterVideoOverlay( ( VOVERLAY_DIRTYBYTEXT ), &VideoOverlayDesc );
@@ -575,7 +575,7 @@ void ScreenMsg( UINT16 usColor, UINT8 ubPriority, STR16 pStringA, ...)
{
//__try
//{
wchar_t DestString[512];
CHAR16 DestString[512];
va_list argptr;
if( fDisableJustForIan == TRUE )
@@ -707,12 +707,12 @@ void TacticalScreenMsg( UINT16 usColor, UINT8 ubPriority, STR16 pStringA, ... )
UINT16 usStringLength=0;
UINT16 usCurrentSPosition=0;
UINT16 usCurrentLookup=0;
//wchar_t *pString;
//STR16pString;
BOOLEAN fLastLine=FALSE;
va_list argptr;
wchar_t DestString[512];//, DestStringA[ 512 ];
//wchar_t *pStringBuffer;
CHAR16 DestString[512];//, DestStringA[ 512 ];
//STR16pStringBuffer;
BOOLEAN fMultiLine=FALSE;
ScrollStringStPtr pTempStringSt=NULL;
WRAPPED_STRING *pStringWrapper=NULL;
@@ -860,11 +860,11 @@ void MapScreenMessage( UINT16 usColor, UINT8 ubPriority, STR16 pStringA, ... )
UINT16 usStringLength=0;
UINT16 usCurrentSPosition=0;
UINT16 usCurrentLookup=0;
//wchar_t *pString;
//STR16pString;
BOOLEAN fLastLine=FALSE;
va_list argptr;
wchar_t DestString[512], DestStringA[ 512 ];
//wchar_t *pStringBuffer;
CHAR16 DestString[512], DestStringA[ 512 ];
//STR16pStringBuffer;
BOOLEAN fMultiLine=FALSE;
WRAPPED_STRING *pStringWrapper=NULL;
WRAPPED_STRING *pStringWrapperHead=NULL;