1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-29 13:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixes to reduce the number of compile warnings. Still many more to fix

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1535 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Overhaul
2007-10-20 08:32:53 +00:00
parent 4bb41616eb
commit b170dbb1e5
9 changed files with 79 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Utils/message.cpp
+18 -18
View File
@@ -352,7 +352,7 @@ void ClearDisplayedListOfTacticalStrings( void )
void ScrollString( )
{
ScrollStringStPtr pStringSt = pStringS;
//ScrollStringStPtr pStringSt = pStringS;
UINT32 suiTimer=0;
UINT32 cnt;
INT32 iNumberOfNewStrings = 0; // the count of new strings, so we can update position by WIDTH_BETWEEN_NEW_STRINGS pixels in the y
@@ -360,7 +360,7 @@ void ScrollString( )
INT32 iMaxAge = 0;
BOOLEAN fDitchLastMessage = FALSE;
INT32 iMsgYStart = SCREEN_HEIGHT - 150;
INT16 iMsgYStart = SCREEN_HEIGHT - 150;
// UPDATE TIMER
suiTimer=GetJA2Clock();
@@ -704,18 +704,18 @@ void TacticalScreenMsg( UINT16 usColor, UINT8 ubPriority, STR16 pStringA, ... )
ScrollStringStPtr pStringSt;
UINT32 uiFont = TINYFONT1;
UINT16 usPosition=0;
UINT16 usCount=0;
UINT16 usStringLength=0;
UINT16 usCurrentSPosition=0;
UINT16 usCurrentLookup=0;
//UINT16 usPosition=0;
//UINT16 usCount=0;
//UINT16 usStringLength=0;
//UINT16 usCurrentSPosition=0;
//UINT16 usCurrentLookup=0;
//STR16pString;
BOOLEAN fLastLine=FALSE;
//BOOLEAN fLastLine=FALSE;
va_list argptr;
CHAR16 DestString[512];//, DestStringA[ 512 ];
//STR16pStringBuffer;
BOOLEAN fMultiLine=FALSE;
//BOOLEAN fMultiLine=FALSE;
ScrollStringStPtr pTempStringSt=NULL;
WRAPPED_STRING *pStringWrapper=NULL;
WRAPPED_STRING *pStringWrapperHead=NULL;
@@ -857,17 +857,17 @@ void MapScreenMessage( UINT16 usColor, UINT8 ubPriority, STR16 pStringA, ... )
ScrollStringStPtr pStringSt;
UINT32 uiFont = MAP_SCREEN_MESSAGE_FONT;
UINT16 usPosition=0;
UINT16 usCount=0;
UINT16 usStringLength=0;
UINT16 usCurrentSPosition=0;
UINT16 usCurrentLookup=0;
//UINT16 usPosition=0;
//UINT16 usCount=0;
//UINT16 usStringLength=0;
//UINT16 usCurrentSPosition=0;
//UINT16 usCurrentLookup=0;
//STR16pString;
BOOLEAN fLastLine=FALSE;
//BOOLEAN fLastLine=FALSE;
va_list argptr;
CHAR16 DestString[512], DestStringA[ 512 ];
//STR16pStringBuffer;
BOOLEAN fMultiLine=FALSE;
//BOOLEAN fMultiLine=FALSE;
WRAPPED_STRING *pStringWrapper=NULL;
WRAPPED_STRING *pStringWrapperHead=NULL;
BOOLEAN fNewString = FALSE;
@@ -1033,7 +1033,7 @@ void MapScreenMessage( UINT16 usColor, UINT8 ubPriority, STR16 pStringA, ... )
// add string to the map screen message list
void AddStringToMapScreenMessageList( STR16 pString, UINT16 usColor, UINT32 uiFont, BOOLEAN fStartOfNewString, UINT8 ubPriority )
{
UINT8 ubSlotIndex = 0;
//UINT8 ubSlotIndex = 0;
ScrollStringStPtr pStringSt = NULL;
@@ -1122,7 +1122,7 @@ void DisplayStringsInMapScreenMessageList( void )
// print this line
mprintf_coded( 20, sY, gMapScreenMessageList[ ubCurrentStringIndex ]->pString16 );
sY += usSpacing;
sY = sY + usSpacing;
// next message index to print (may wrap around)
ubCurrentStringIndex = ( ubCurrentStringIndex + 1 ) % 256;