1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-19 14:20:30 +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
Tactical/Animation Control.h
+1 -1
View File
@@ -116,7 +116,7 @@ typedef struct
UINT8 ubEndRoll;
UINT8 ubFlags;
UINT8 ubAnimHeight;
INT8 zSoundFile[ 30 ];
CHAR8 zSoundFile[ 30 ];
} RANDOM_ANI_DEF;
Tactical/Animation Data.cpp
+1 -1
View File
@@ -843,7 +843,7 @@ BOOLEAN LoadAnimationSurface( UINT16 usSoldierID, UINT16 usSurfaceIndex, UINT16
AnimDebugMsg( String( "Surface Database: Loading %d", usSurfaceIndex ) );
sprintf( (char *)gSystemDebugStr, "Cache Load" );
sprintf( gSystemDebugStr, "Cache Load" );
// Create video object
FilenameForBPP(gAnimSurfaceDatabase[ usSurfaceIndex ].Filename, sFilename);
Tactical/Civ Quotes.cpp
+13 -13
View File
@@ -96,7 +96,7 @@ typedef struct
QUOTE_SYSTEM_STRUCT gCivQuoteData;
INT16 gzCivQuote[ 320 ];
CHAR16 gzCivQuote[ 320 ];
UINT16 gusCivQuoteBoxWidth;
UINT16 gusCivQuoteBoxHeight;
@@ -113,9 +113,9 @@ void CopyNumEntriesIntoQuoteStruct( )
}
BOOLEAN GetCivQuoteText( UINT8 ubCivQuoteID, UINT8 ubEntryID, INT16 *zQuote )
BOOLEAN GetCivQuoteText( UINT8 ubCivQuoteID, UINT8 ubEntryID, STR16 zQuote )
{
UINT8 zFileName[164];
CHAR8 zFileName[164];
// Build filename....
if ( ubCivQuoteID == CIV_QUOTE_HINT )
@@ -123,22 +123,22 @@ BOOLEAN GetCivQuoteText( UINT8 ubCivQuoteID, UINT8 ubEntryID, INT16 *zQuote )
if ( gbWorldSectorZ > 0 )
{
//sprintf( zFileName, "NPCData\\miners.edt" );
sprintf( (char *)zFileName,"NPCDATA\\CIV%02d.edt", CIV_QUOTE_MINERS_NOT_FOR_PLAYER );
sprintf( zFileName,"NPCDATA\\CIV%02d.edt", CIV_QUOTE_MINERS_NOT_FOR_PLAYER );
}
else
{
sprintf( (char *)zFileName, "NPCData\\%c%d.edt", 'A' + (gWorldSectorY - 1) , gWorldSectorX );
sprintf( zFileName, "NPCData\\%c%d.edt", 'A' + (gWorldSectorY - 1) , gWorldSectorX );
}
}
else
{
sprintf( (char *)zFileName,"NPCDATA\\CIV%02d.edt",ubCivQuoteID );
sprintf( zFileName,"NPCDATA\\CIV%02d.edt",ubCivQuoteID );
}
CHECKF( FileExists( (STR)zFileName ) );
CHECKF( FileExists( zFileName ) );
// Get data...
LoadEncryptedDataFromFile( (STR)zFileName, (STR16)zQuote, ubEntryID * 320, 320 );
LoadEncryptedDataFromFile( zFileName, zQuote, ubEntryID * 320, 320 );
if( zQuote[0] == 0 )
{
@@ -333,7 +333,7 @@ void QuoteOverlayClickCallback( MOUSE_REGION * pRegion, INT32 iReason )
void BeginCivQuote( SOLDIERTYPE *pCiv, UINT8 ubCivQuoteID, UINT8 ubEntryID, INT16 sX, INT16 sY )
{
VIDEO_OVERLAY_DESC VideoOverlayDesc;
INT16 zQuote[ 320 ];
CHAR16 zQuote[ 320 ];
// OK, do we have another on?
if ( gCivQuoteData.bActive )
@@ -349,9 +349,9 @@ void BeginCivQuote( SOLDIERTYPE *pCiv, UINT8 ubCivQuoteID, UINT8 ubEntryID, INT1
}
#ifdef TAIWANESE
swprintf( (wchar_t *)gzCivQuote, (wchar_t *)L"%s", zQuote );
swprintf( gzCivQuote, L"%s", zQuote );
#else
swprintf( (wchar_t *)gzCivQuote, (wchar_t *)L"\"%s\"", zQuote );
swprintf( gzCivQuote, L"\"%s\"", zQuote );
#endif
@@ -366,7 +366,7 @@ void BeginCivQuote( SOLDIERTYPE *pCiv, UINT8 ubCivQuoteID, UINT8 ubEntryID, INT1
// Prepare text box
SET_USE_WINFONTS( TRUE );
SET_WINFONT( giSubTitleWinFont );
gCivQuoteData.iDialogueBox = PrepareMercPopupBox( gCivQuoteData.iDialogueBox , BASIC_MERC_POPUP_BACKGROUND, BASIC_MERC_POPUP_BORDER, (STR16)gzCivQuote, DIALOGUE_DEFAULT_WIDTH, 0, 0, 0, &gusCivQuoteBoxWidth, &gusCivQuoteBoxHeight );
gCivQuoteData.iDialogueBox = PrepareMercPopupBox( gCivQuoteData.iDialogueBox , BASIC_MERC_POPUP_BACKGROUND, BASIC_MERC_POPUP_BORDER, gzCivQuote, DIALOGUE_DEFAULT_WIDTH, 0, 0, 0, &gusCivQuoteBoxWidth, &gusCivQuoteBoxHeight );
SET_USE_WINFONTS( FALSE );
// OK, find center for box......
@@ -421,7 +421,7 @@ void BeginCivQuote( SOLDIERTYPE *pCiv, UINT8 ubCivQuoteID, UINT8 ubEntryID, INT1
gCivQuoteData.uiTimeOfCreation = GetJA2Clock( );
gCivQuoteData.uiDelayTime = FindDelayForString( (STR16)gzCivQuote ) + 500;
gCivQuoteData.uiDelayTime = FindDelayForString( gzCivQuote ) + 500;
gCivQuoteData.pCiv = pCiv;
Tactical/Dialogue Control.cpp
+62 -62
View File
@@ -142,7 +142,7 @@ UINT16 gusSubtitleBoxHeight;
INT32 giTextBoxOverlay = -1;
BOOLEAN gfFacePanelActive = FALSE;
UINT32 guiScreenIDUsedWhenUICreated;
wchar_t gzQuoteStr[ QUOTE_MESSAGE_SIZE ];
CHAR16 gzQuoteStr[ QUOTE_MESSAGE_SIZE ];
MOUSE_REGION gTextBoxMouseRegion;
MOUSE_REGION gFacePopupMouseRegion;
BOOLEAN gfUseAlternateDialogueFile = FALSE;
@@ -187,12 +187,12 @@ void FaceOverlayClickCallback( MOUSE_REGION * pRegion, INT32 iReason );
// Handler functions for tactical ui diaplay
void HandleTacticalTextUI( INT32 iFaceIndex, SOLDIERTYPE *pSoldier, wchar_t *zQuoteStr );
void HandleTacticalNPCTextUI( UINT8 ubCharacterNum, wchar_t *zQuoteStr );
void HandleTacticalTextUI( INT32 iFaceIndex, SOLDIERTYPE *pSoldier, STR16 zQuoteStr );
void HandleTacticalNPCTextUI( UINT8 ubCharacterNum, STR16 zQuoteStr );
void HandleTacticalSpeechUI( UINT8 ubCharacterNum, INT32 iFaceIndex );
void DisplayTextForExternalNPC( UINT8 ubCharacterNum, STR16 zQuoteStr );
void CreateTalkingUI( INT8 bUIHandlerID, INT32 iFaceIndex, UINT8 ubCharacterNum, SOLDIERTYPE *pSoldier, wchar_t *zQuoteStr );
void CreateTalkingUI( INT8 bUIHandlerID, INT32 iFaceIndex, UINT8 ubCharacterNum, SOLDIERTYPE *pSoldier, STR16 zQuoteStr );
void HandleExternNPCSpeechFace( INT32 iIndex );
@@ -953,21 +953,21 @@ void HandleDialogue( )
swprintf( zText, SkiMessageBoxText[ SKI_SHORT_FUNDS_TEXT ], zMoney );
//popup a message stating the player doesnt have enough money
DoSkiMessageBox( MSG_BOX_BASIC_STYLE, (STR16)zText, SHOPKEEPER_SCREEN, MSG_BOX_FLAG_OK, ConfirmDontHaveEnoughForTheDealerMessageBoxCallBack );
DoSkiMessageBox( MSG_BOX_BASIC_STYLE, zText, SHOPKEEPER_SCREEN, MSG_BOX_FLAG_OK, ConfirmDontHaveEnoughForTheDealerMessageBoxCallBack );
break;
case( 1 ):
//if the player is trading items
swprintf( zText, SkiMessageBoxText[ SKI_QUESTION_TO_DEDUCT_MONEY_FROM_PLAYERS_ACCOUNT_TO_COVER_DIFFERENCE ], zMoney );
//ask them if we should deduct money out the players account to cover the difference
DoSkiMessageBox( MSG_BOX_BASIC_STYLE, (STR16)zText, SHOPKEEPER_SCREEN, MSG_BOX_FLAG_YESNO, ConfirmToDeductMoneyFromPlayersAccountMessageBoxCallBack );
DoSkiMessageBox( MSG_BOX_BASIC_STYLE, zText, SHOPKEEPER_SCREEN, MSG_BOX_FLAG_YESNO, ConfirmToDeductMoneyFromPlayersAccountMessageBoxCallBack );
break;
case( 2 ):
swprintf( zText, SkiMessageBoxText[ SKI_QUESTION_TO_DEDUCT_MONEY_FROM_PLAYERS_ACCOUNT_TO_COVER_COST ], zMoney );
//ask them if we should deduct money out the players account to cover the difference
DoSkiMessageBox( MSG_BOX_BASIC_STYLE, (STR16)zText, SHOPKEEPER_SCREEN, MSG_BOX_FLAG_YESNO, ConfirmToDeductMoneyFromPlayersAccountMessageBoxCallBack );
DoSkiMessageBox( MSG_BOX_BASIC_STYLE, zText, SHOPKEEPER_SCREEN, MSG_BOX_FLAG_YESNO, ConfirmToDeductMoneyFromPlayersAccountMessageBoxCallBack );
break;
case( 3 ):
// this means a dialogue event is in progress
@@ -1184,7 +1184,7 @@ void HandleDialogue( )
MemFree( QItem );
}
BOOLEAN GetDialogue( UINT8 ubCharacterNum, UINT16 usQuoteNum, UINT32 iDataSize, wchar_t * zDialogueText, UINT32 *puiSoundID, CHAR8 *zSoundString );
BOOLEAN GetDialogue( UINT8 ubCharacterNum, UINT16 usQuoteNum, UINT32 iDataSize, STR16 zDialogueText, UINT32 *puiSoundID, CHAR8 *zSoundString );
BOOLEAN DelayedTacticalCharacterDialogue( SOLDIERTYPE *pSoldier, UINT16 usQuoteNum )
@@ -1629,12 +1629,12 @@ BOOLEAN ExecuteCharacterDialogue( UINT8 ubCharacterNum, UINT16 usQuoteNum, INT32
if( bUIHandlerID == DIALOGUE_EXTERNAL_NPC_UI )
{
// external NPC
SetFaceTalking( iFaceIndex , zSoundString, (STR16)gzQuoteStr, RATE_11025, 30, 1, MIDDLEPAN );
SetFaceTalking( iFaceIndex , zSoundString, gzQuoteStr, RATE_11025, 30, 1, MIDDLEPAN );
}
else
{
// start "talking" system (portrait animation and start wav sample)
SetFaceTalking( iFaceIndex, zSoundString, (STR16)gzQuoteStr, RATE_11025, 30, 1, MIDDLEPAN );
SetFaceTalking( iFaceIndex, zSoundString, gzQuoteStr, RATE_11025, 30, 1, MIDDLEPAN );
}
// pSoldier can be null here... ( if NOT from an alive soldier )
CreateTalkingUI( bUIHandlerID, iFaceIndex, ubCharacterNum, pSoldier, gzQuoteStr );
@@ -1648,7 +1648,7 @@ BOOLEAN ExecuteCharacterDialogue( UINT8 ubCharacterNum, UINT16 usQuoteNum, INT32
}
void CreateTalkingUI( INT8 bUIHandlerID, INT32 iFaceIndex, UINT8 ubCharacterNum, SOLDIERTYPE *pSoldier, wchar_t *zQuoteStr )
void CreateTalkingUI( INT8 bUIHandlerID, INT32 iFaceIndex, UINT8 ubCharacterNum, SOLDIERTYPE *pSoldier, STR16 zQuoteStr )
{
// Show text, if on
@@ -1675,11 +1675,11 @@ void CreateTalkingUI( INT8 bUIHandlerID, INT32 iFaceIndex, UINT8 ubCharacterNum,
break;
case DIALOGUE_EXTERNAL_NPC_UI:
DisplayTextForExternalNPC( ubCharacterNum, (STR16)zQuoteStr );
DisplayTextForExternalNPC( ubCharacterNum, zQuoteStr );
break;
case DIALOGUE_SHOPKEEPER_UI:
InitShopKeeperSubTitledText( (STR16)zQuoteStr );
InitShopKeeperSubTitledText( zQuoteStr );
break;
}
}
@@ -1706,9 +1706,9 @@ void CreateTalkingUI( INT8 bUIHandlerID, INT32 iFaceIndex, UINT8 ubCharacterNum,
}
INT8 *GetDialogueDataFilename( UINT8 ubCharacterNum, UINT16 usQuoteNum, BOOLEAN fWavFile )
CHAR8 *GetDialogueDataFilename( UINT8 ubCharacterNum, UINT16 usQuoteNum, BOOLEAN fWavFile )
{
static UINT8 zFileName[164];
static CHAR8 zFileName[164];
UINT8 ubFileNumID;
// Are we an NPC OR an RPC that has not been recruited?
@@ -1720,23 +1720,23 @@ INT8 *GetDialogueDataFilename( UINT8 ubCharacterNum, UINT16 usQuoteNum, BOOLEAN
// Lesh: patch to allow playback ogg speech files
// build name of wav file (characternum + quotenum)
#ifdef RUSSIAN
sprintf( (char *)zFileName,"NPC_SPEECH\\g_%03d_%03d.ogg",ubCharacterNum,usQuoteNum );
if ( !FileExists( (STR)zFileName ) )
sprintf( zFileName,"NPC_SPEECH\\g_%03d_%03d.ogg",ubCharacterNum,usQuoteNum );
if ( !FileExists( zFileName ) )
{
sprintf( (char *)zFileName,"NPC_SPEECH\\g_%03d_%03d.wav",ubCharacterNum,usQuoteNum );
sprintf( zFileName,"NPC_SPEECH\\g_%03d_%03d.wav",ubCharacterNum,usQuoteNum );
}
#else
sprintf( (char *)zFileName,"NPC_SPEECH\\d_%03d_%03d.ogg",ubCharacterNum,usQuoteNum );
if ( !FileExists( (STR)zFileName ) )
sprintf( zFileName,"NPC_SPEECH\\d_%03d_%03d.ogg",ubCharacterNum,usQuoteNum );
if ( !FileExists( zFileName ) )
{
sprintf( (char *)zFileName,"NPC_SPEECH\\d_%03d_%03d.wav",ubCharacterNum,usQuoteNum );
sprintf( zFileName,"NPC_SPEECH\\d_%03d_%03d.wav",ubCharacterNum,usQuoteNum );
}
#endif
}
else
{
// assume EDT files are in EDT directory on HARD DRIVE
sprintf( (char *)zFileName,"NPCDATA\\d_%03d.EDT", ubCharacterNum );
sprintf( zFileName,"NPCDATA\\d_%03d.EDT", ubCharacterNum );
}
}
else if ( ubCharacterNum >= FIRST_RPC && ubCharacterNum < GASTON &&
@@ -1763,16 +1763,16 @@ INT8 *GetDialogueDataFilename( UINT8 ubCharacterNum, UINT16 usQuoteNum, BOOLEAN
if ( fWavFile )
{
// Lesh: patch to allow playback ogg speech files
sprintf( (char *)zFileName,"NPC_SPEECH\\%03d_%03d.ogg",ubFileNumID,usQuoteNum );
if ( !FileExists( (STR)zFileName ) )
sprintf( zFileName,"NPC_SPEECH\\%03d_%03d.ogg",ubFileNumID,usQuoteNum );
if ( !FileExists( zFileName ) )
{
sprintf( (char *)zFileName,"NPC_SPEECH\\%03d_%03d.wav",ubFileNumID,usQuoteNum );
sprintf( zFileName,"NPC_SPEECH\\%03d_%03d.wav",ubFileNumID,usQuoteNum );
}
}
else
{
// assume EDT files are in EDT directory on HARD DRIVE
sprintf( (char *)zFileName,"NPCDATA\\%03d.EDT", ubFileNumID );
sprintf( zFileName,"NPCDATA\\%03d.EDT", ubFileNumID );
}
}
else
@@ -1782,60 +1782,60 @@ INT8 *GetDialogueDataFilename( UINT8 ubCharacterNum, UINT16 usQuoteNum, BOOLEAN
#ifdef RUSSIAN
if( ubCharacterNum >= FIRST_RPC && ubCharacterNum < GASTON && gMercProfiles[ ubCharacterNum ].ubMiscFlags & PROFILE_MISC_FLAG_RECRUITED )
{
sprintf( (char *) zFileName,"SPEECH\\r_%03d_%03d.ogg",ubCharacterNum,usQuoteNum );
if ( !FileExists( (STR)zFileName ) )
sprintf( zFileName,"SPEECH\\r_%03d_%03d.ogg",ubCharacterNum,usQuoteNum );
if ( !FileExists( zFileName ) )
{
sprintf( (char *) zFileName,"SPEECH\\r_%03d_%03d.wav",ubCharacterNum,usQuoteNum );
sprintf( zFileName,"SPEECH\\r_%03d_%03d.wav",ubCharacterNum,usQuoteNum );
}
}
else
#endif
{ // build name of wav file (characternum + quotenum)
sprintf( (char *)zFileName,"SPEECH\\%03d_%03d.ogg",ubCharacterNum,usQuoteNum );
if ( !FileExists( (STR)zFileName ) )
sprintf( zFileName,"SPEECH\\%03d_%03d.ogg",ubCharacterNum,usQuoteNum );
if ( !FileExists( zFileName ) )
{
sprintf( (char *)zFileName,"SPEECH\\%03d_%03d.wav",ubCharacterNum,usQuoteNum );
sprintf( zFileName,"SPEECH\\%03d_%03d.wav",ubCharacterNum,usQuoteNum );
}
}
}
else
{
// assume EDT files are in EDT directory on HARD DRIVE
sprintf( (char *)zFileName,"MERCEDT\\%03d.EDT", ubCharacterNum );
sprintf( zFileName,"MERCEDT\\%03d.EDT", ubCharacterNum );
}
}
return( (INT8 *) zFileName );
return( zFileName );
}
// Used to see if the dialog text file exists
BOOLEAN DialogueDataFileExistsForProfile( UINT8 ubCharacterNum, UINT16 usQuoteNum, BOOLEAN fWavFile, UINT8 **ppStr )
BOOLEAN DialogueDataFileExistsForProfile( UINT8 ubCharacterNum, UINT16 usQuoteNum, BOOLEAN fWavFile, STR8 *ppStr )
{
INT8 *pFilename;
STR8 pFilename;
pFilename = GetDialogueDataFilename( ubCharacterNum, usQuoteNum, fWavFile );
if ( ppStr )
{
(*ppStr ) = (UINT8 *) pFilename;
(*ppStr ) = pFilename;
}
return( FileExists( (STR)pFilename ) );
return( FileExists( pFilename ) );
}
BOOLEAN GetDialogue( UINT8 ubCharacterNum, UINT16 usQuoteNum, UINT32 iDataSize, wchar_t * zDialogueText, UINT32 *puiSoundID, CHAR8 *zSoundString )
BOOLEAN GetDialogue( UINT8 ubCharacterNum, UINT16 usQuoteNum, UINT32 iDataSize, STR16 zDialogueText, UINT32 *puiSoundID, CHAR8 *zSoundString )
{
UINT8 *pFilename;
STR8 pFilename;
// first things first - grab the text (if player has SUBTITLE PREFERENCE ON)
//if ( gGameSettings.fOptions[ TOPTION_SUBTITLES ] )
{
if ( DialogueDataFileExistsForProfile( ubCharacterNum, 0, FALSE, &pFilename ) )
{
LoadEncryptedDataFromFile( (STR)pFilename, zDialogueText, usQuoteNum * iDataSize, iDataSize );
LoadEncryptedDataFromFile( pFilename, zDialogueText, usQuoteNum * iDataSize, iDataSize );
if(zDialogueText[0] == 0)
{
swprintf( (wchar_t *)zDialogueText, (wchar_t *)L"I have no text in the EDT file ( %d ) %S", usQuoteNum, pFilename );
swprintf( zDialogueText, L"I have no text in the EDT file ( %d ) %S", usQuoteNum, pFilename );
#ifndef JA2BETAVERSION
return( FALSE );
@@ -1844,7 +1844,7 @@ BOOLEAN GetDialogue( UINT8 ubCharacterNum, UINT16 usQuoteNum, UINT32 iDataSize,
}
else
{
swprintf( (wchar_t *)zDialogueText, (wchar_t *)L"I have no text in the file ( %d ) %S", usQuoteNum , pFilename );
swprintf( zDialogueText, L"I have no text in the file ( %d ) %S", usQuoteNum , pFilename );
#ifndef JA2BETAVERSION
return( FALSE );
@@ -1854,7 +1854,7 @@ BOOLEAN GetDialogue( UINT8 ubCharacterNum, UINT16 usQuoteNum, UINT32 iDataSize,
// CHECK IF THE FILE EXISTS, IF NOT, USE DEFAULT!
pFilename = (UINT8 *) GetDialogueDataFilename( ubCharacterNum, usQuoteNum, TRUE );
pFilename = GetDialogueDataFilename( ubCharacterNum, usQuoteNum, TRUE );
// Copy
strcpy( zSoundString, pFilename );
@@ -1881,7 +1881,7 @@ BOOLEAN GetDialogue( UINT8 ubCharacterNum, UINT16 usQuoteNum, UINT32 iDataSize,
if ( gGameSettings.fOptions[ TOPTION_SPEECH ] )
{
// Load it into memory!
*puiSoundID = SoundLoadSample( (STR) pFilename );
*puiSoundID = SoundLoadSample( pFilename );
}
@@ -1890,9 +1890,9 @@ BOOLEAN GetDialogue( UINT8 ubCharacterNum, UINT16 usQuoteNum, UINT32 iDataSize,
// Handlers for tactical UI stuff
void HandleTacticalNPCTextUI( UINT8 ubCharacterNum, wchar_t *zQuoteStr )
void HandleTacticalNPCTextUI( UINT8 ubCharacterNum, STR16 zQuoteStr )
{
wchar_t zText[ QUOTE_MESSAGE_SIZE ];
CHAR16 zText[ QUOTE_MESSAGE_SIZE ];
// Setup dialogue text box
if ( guiCurrentScreen != MAP_SCREEN )
@@ -1905,8 +1905,8 @@ void HandleTacticalNPCTextUI( UINT8 ubCharacterNum, wchar_t *zQuoteStr )
#ifdef TAIWANESE
swprintf( gTalkPanel.zQuoteStr, L"%s", zQuoteStr );
#else
swprintf( (wchar_t *)gTalkPanel.zQuoteStr, L"\"%s\"", zQuoteStr );
swprintf( (wchar_t *)zText, L"%s: \"%s\"", gMercProfiles[ ubCharacterNum ].zNickname, zQuoteStr );
swprintf( gTalkPanel.zQuoteStr, L"\"%s\"", zQuoteStr );
swprintf( zText, L"%s: \"%s\"", gMercProfiles[ ubCharacterNum ].zNickname, zQuoteStr );
MapScreenMessage( FONT_MCOLOR_WHITE, MSG_DIALOG, L"%s", zText );
#endif
}
@@ -1915,7 +1915,7 @@ void HandleTacticalNPCTextUI( UINT8 ubCharacterNum, wchar_t *zQuoteStr )
// Handlers for tactical UI stuff
void DisplayTextForExternalNPC( UINT8 ubCharacterNum, STR16 zQuoteStr )
{
INT16 zText[ QUOTE_MESSAGE_SIZE ];
CHAR16 zText[ QUOTE_MESSAGE_SIZE ];
INT16 sLeft;
@@ -1930,8 +1930,8 @@ void DisplayTextForExternalNPC( UINT8 ubCharacterNum, STR16 zQuoteStr )
#ifdef TAIWANESE
swprintf( gTalkPanel.zQuoteStr, L"%s", zQuoteStr );
#else
swprintf( (wchar_t *)gTalkPanel.zQuoteStr, L"\"%s\"", zQuoteStr );
swprintf( (wchar_t *)zText, L"%s: \"%s\"", gMercProfiles[ ubCharacterNum ].zNickname, zQuoteStr );
swprintf( gTalkPanel.zQuoteStr, L"\"%s\"", zQuoteStr );
swprintf( zText, L"%s: \"%s\"", gMercProfiles[ ubCharacterNum ].zNickname, zQuoteStr );
MapScreenMessage( FONT_MCOLOR_WHITE, MSG_DIALOG, L"%s", zText );
#endif
@@ -1945,25 +1945,25 @@ void DisplayTextForExternalNPC( UINT8 ubCharacterNum, STR16 zQuoteStr )
sLeft = ( 110 );
}
ExecuteTacticalTextBox( sLeft, (STR16)gTalkPanel.zQuoteStr );
ExecuteTacticalTextBox( sLeft, gTalkPanel.zQuoteStr );
return;
}
void HandleTacticalTextUI( INT32 iFaceIndex, SOLDIERTYPE *pSoldier, wchar_t *zQuoteStr )
void HandleTacticalTextUI( INT32 iFaceIndex, SOLDIERTYPE *pSoldier, STR16 zQuoteStr )
{
wchar_t zText[ QUOTE_MESSAGE_SIZE ];
CHAR16 zText[ QUOTE_MESSAGE_SIZE ];
INT16 sLeft = 0;
//BUild text
// How do we do this with defines?
//swprintf( zText, L"\xb4\xa2 %s: \xb5 \"%s\"", gMercProfiles[ ubCharacterNum ].zNickname, zQuoteStr );
#ifdef TAIWANESE
swprintf( (wchar_t *)zText, (wchar_t *)L"%s", zQuoteStr );
swprintf( zText, L"%s", zQuoteStr );
#else
swprintf( (wchar_t *)zText, (wchar_t *)L"\"%s\"", zQuoteStr );
swprintf( zText, L"\"%s\"", zQuoteStr );
#endif
sLeft = 110;
@@ -1971,10 +1971,10 @@ void HandleTacticalTextUI( INT32 iFaceIndex, SOLDIERTYPE *pSoldier, wchar_t *zQu
//previous version
//sLeft = 110;
ExecuteTacticalTextBox( sLeft, (STR16)zText );
ExecuteTacticalTextBox( sLeft, zText );
#ifndef TAIWANESE
swprintf( (wchar_t *)zText, L"%s: \"%s\"", gMercProfiles[ pSoldier->ubProfile ].zNickname, zQuoteStr );
swprintf( zText, L"%s: \"%s\"", gMercProfiles[ pSoldier->ubProfile ].zNickname, zQuoteStr );
MapScreenMessage( FONT_MCOLOR_WHITE, MSG_DIALOG, L"%s", zText );
#endif
@@ -2320,7 +2320,7 @@ void RenderFaceOverlay( VIDEO_OVERLAY *pBlitter )
UINT8 *pDestBuf, *pSrcBuf;
INT16 sFontX, sFontY;
SOLDIERTYPE *pSoldier;
INT16 zTownIDString[50];
CHAR16 zTownIDString[50];
if ( gpCurrentTalkingFace == NULL )
@@ -2359,9 +2359,9 @@ void RenderFaceOverlay( VIDEO_OVERLAY *pBlitter )
// What sector are we in, ( and is it the same as ours? )
if ( pSoldier->sSectorX != gWorldSectorX || pSoldier->sSectorY != gWorldSectorY || pSoldier->bSectorZ != gbWorldSectorZ || pSoldier->fBetweenSectors )
{
GetSectorIDString( pSoldier->sSectorX, pSoldier->sSectorY, pSoldier->bSectorZ, (CHAR16 *)zTownIDString, FALSE );
GetSectorIDString( pSoldier->sSectorX, pSoldier->sSectorY, pSoldier->bSectorZ, zTownIDString, FALSE );
ReduceStringLength( (STR16)zTownIDString, 64 , BLOCKFONT2 );
ReduceStringLength( zTownIDString, 64 , BLOCKFONT2 );
VarFindFontCenterCoordinates( (INT16)( pBlitter->sX + 12 ), (INT16)( pBlitter->sY + 68 ), 73, 9, BLOCKFONT2, &sFontX, &sFontY, L"%s", zTownIDString );
mprintf( sFontX, sFontY, L"%s", zTownIDString );
Tactical/Dialogue Control.h
+1 -1
View File
@@ -238,7 +238,7 @@ void HandleImportantMercQuote( SOLDIERTYPE * pSoldier, UINT16 usQuoteNumber );
// Send in a profile number to see if text dialog exists for this guy....
BOOLEAN DialogueDataFileExistsForProfile( UINT8 ubCharacterNum, UINT16 usQuoteNum, BOOLEAN fWavFile, UINT8 **ppStr );
BOOLEAN DialogueDataFileExistsForProfile( UINT8 ubCharacterNum, UINT16 usQuoteNum, BOOLEAN fWavFile, STR8 *ppStr );
// Do special event as well as dialogue!
BOOLEAN CharacterDialogueWithSpecialEvent( UINT8 ubCharacterNum, UINT16 usQuoteNum, INT32 iFaceIndex, UINT8 bUIHandlerID, BOOLEAN fFromSoldier, BOOLEAN fDelayed, UINT32 uiFlag, UINT32 uiData1, UINT32 uiData2 );
Tactical/End Game.cpp
+1 -1
View File
@@ -415,7 +415,7 @@ void BeginHandleQueenBitchDeath( SOLDIERTYPE *pKillerSoldier, INT16 sGridNo, INT
// HELLO! THESE ARE CREATURES! THEY CAN'T BE NEUTRAL!
//if ( !pTeamSoldier->bNeutral && (pTeamSoldier->bSide != gbPlayerNum ) )
{
gTacticalStatus.ubAttackBusyCount++;
gTacticalStatus.ubAttackBusyCount++;
EVENT_SoldierGotHit( pTeamSoldier, 0, 10000, 0, pTeamSoldier->bDirection, 320, NOBODY , FIRE_WEAPON_NO_SPECIAL, pTeamSoldier->bAimShotLocation, 0, NOWHERE );
}
}
Tactical/Handle Items.cpp
+9 -9
View File
@@ -187,8 +187,8 @@ INT32 HandleItem( SOLDIERTYPE *pSoldier, UINT16 usGridNo, INT8 bLevel, UINT16 us
UINT8 ubDirection;
INT16 sAdjustedGridNo;
BOOLEAN fDropBomb = FALSE;
BOOLEAN fAddingTurningCost = FALSE;
BOOLEAN fAddingRaiseGunCost = FALSE;
BOOLEAN fAddingTurningCost = FALSE;
BOOLEAN fAddingRaiseGunCost = FALSE;
LEVELNODE *pIntNode;
STRUCTURE *pStructure;
INT16 sGridNo;
@@ -3209,7 +3209,7 @@ BOOLEAN DrawItemPoolList( ITEM_POOL *pItemPool, INT16 sGridNo, UINT8 bCommand, I
INT16 sY;
INVTYPE *pItem;
ITEM_POOL *pTempItemPool;
wchar_t pStr[ 100 ];
CHAR16 pStr[ 100 ];
INT16 cnt = 0, sHeight = 0;
INT16 sLargeLineWidth = 0, sLineWidth;
BOOLEAN fRecalcNumListed = FALSE;
@@ -3302,11 +3302,11 @@ BOOLEAN DrawItemPoolList( ITEM_POOL *pItemPool, INT16 sGridNo, UINT8 bCommand, I
// Set string
if ( gWorldItems[ pTempItemPool->iItemIndex ].o.ubNumberOfObjects > 1 )
{
swprintf( (wchar_t *)pStr, (wchar_t *)L"%s (%d)", ShortItemNames[ gWorldItems[ pTempItemPool->iItemIndex ].o.usItem ], gWorldItems[ pTempItemPool->iItemIndex ].o.ubNumberOfObjects );
swprintf( pStr, L"%s (%d)", ShortItemNames[ gWorldItems[ pTempItemPool->iItemIndex ].o.usItem ], gWorldItems[ pTempItemPool->iItemIndex ].o.ubNumberOfObjects );
}
else
{
swprintf( (wchar_t *)pStr, (wchar_t *)L"%s", ShortItemNames[ gWorldItems[ pTempItemPool->iItemIndex ].o.usItem ] );
swprintf( pStr, L"%s", ShortItemNames[ gWorldItems[ pTempItemPool->iItemIndex ].o.usItem ] );
}
// Get Width
@@ -3379,7 +3379,7 @@ BOOLEAN DrawItemPoolList( ITEM_POOL *pItemPool, INT16 sGridNo, UINT8 bCommand, I
{
SetFontForeground( FONT_MCOLOR_DKGRAY );
}
swprintf( (wchar_t *)pStr, (wchar_t *)TacticalStr[ ITEMPOOL_POPUP_PREV_STR ] );
swprintf( pStr, TacticalStr[ ITEMPOOL_POPUP_PREV_STR ] );
gprintfdirty( sFontX, sY, pStr );
mprintf( sFontX, sY, pStr );
sY += GetFontHeight( SMALLFONT1 ) - 2;
@@ -3409,11 +3409,11 @@ BOOLEAN DrawItemPoolList( ITEM_POOL *pItemPool, INT16 sGridNo, UINT8 bCommand, I
if ( gWorldItems[ pItemPool->iItemIndex ].o.ubNumberOfObjects > 1 )
{
swprintf( (wchar_t *)pStr, (wchar_t *)L"%s (%d)", ShortItemNames[ gWorldItems[ pItemPool->iItemIndex ].o.usItem ], gWorldItems[ pItemPool->iItemIndex ].o.ubNumberOfObjects );
swprintf( pStr, L"%s (%d)", ShortItemNames[ gWorldItems[ pItemPool->iItemIndex ].o.usItem ], gWorldItems[ pItemPool->iItemIndex ].o.ubNumberOfObjects );
}
else
{
swprintf( (wchar_t *)pStr, (wchar_t *)L"%s", ShortItemNames[ gWorldItems[ pItemPool->iItemIndex ].o.usItem ] );
swprintf( pStr, L"%s", ShortItemNames[ gWorldItems[ pItemPool->iItemIndex ].o.usItem ] );
}
gprintfdirty( sFontX, sY, pStr );
@@ -3447,7 +3447,7 @@ BOOLEAN DrawItemPoolList( ITEM_POOL *pItemPool, INT16 sGridNo, UINT8 bCommand, I
{
SetFontForeground( FONT_MCOLOR_DKGRAY );
}
swprintf( (wchar_t *)pStr, (wchar_t *)TacticalStr[ ITEMPOOL_POPUP_MORE_STR ] );
swprintf( pStr, TacticalStr[ ITEMPOOL_POPUP_MORE_STR ] );
gprintfdirty( sFontX, sY, pStr );
mprintf( sFontX, sY, pStr );
}
Tactical/Handle UI.cpp
+5 -5
View File
@@ -357,13 +357,13 @@ UINT32 guiTimerLastUpdate = 0;
UINT32 guiTimerCursorDelay = 0;
INT16 gzLocation[ 20 ];
CHAR16 gzLocation[ 20 ];
BOOLEAN gfLocation = FALSE;
INT16 gzIntTileLocation[ 20 ];
CHAR16 gzIntTileLocation[ 20 ];
BOOLEAN gfUIIntTileLocation;
INT16 gzIntTileLocation2[ 20 ];
CHAR16 gzIntTileLocation2[ 20 ];
BOOLEAN gfUIIntTileLocation2;
MOUSE_REGION gDisableRegion;
@@ -2554,7 +2554,7 @@ UINT32 UIHandleCAMercShoot( UI_EVENT *pUIEvent )
// If this is one of our own guys.....pop up requiester...
if ( ( pTSoldier->bTeam == gbPlayerNum || pTSoldier->bTeam == MILITIA_TEAM ) && Item[ pSoldier->inv[ HANDPOS ].usItem ].usItemClass != IC_MEDKIT && !Item[pSoldier->inv[ HANDPOS ].usItem].gascan && gTacticalStatus.ubLastRequesterTargetID != pTSoldier->ubProfile && ( pTSoldier->ubID != pSoldier->ubID ) )
{
wchar_t zStr[200];
CHAR16 zStr[200];
gpRequesterMerc = pSoldier;
gpRequesterTargetMerc = pTSoldier;
@@ -2562,7 +2562,7 @@ UINT32 UIHandleCAMercShoot( UI_EVENT *pUIEvent )
fDidRequester = TRUE;
swprintf( (wchar_t *)zStr, (wchar_t *)TacticalStr[ ATTACK_OWN_GUY_PROMPT ], pTSoldier->name );
swprintf( zStr, TacticalStr[ ATTACK_OWN_GUY_PROMPT ], pTSoldier->name );
DoMessageBox( MSG_BOX_BASIC_STYLE, zStr, GAME_SCREEN, ( UINT8 )MSG_BOX_FLAG_YESNO, AttackRequesterCallback, NULL );
Tactical/Handle UI.h
+3 -3
View File
@@ -211,7 +211,7 @@ extern BOOLEAN gUITargetReady;
extern BOOLEAN gUITargetShotWaiting;
extern UINT16 gsUITargetShotGridNo;
extern INT16 gzLocation[ 20 ];
extern CHAR16 gzLocation[ 20 ];
extern BOOLEAN gfUIBodyHitLocation;
extern UINT8 gsBulletCount;
@@ -222,10 +222,10 @@ extern BOOLEAN gfUIAutofireBulletCount;
extern BOOLEAN gfUICtHBar;
extern UINT8 gbCtH;
extern INT16 gzIntTileLocation[ 20 ];
extern CHAR16 gzIntTileLocation[ 20 ];
extern BOOLEAN gfUIIntTileLocation;
extern INT16 gzIntTileLocation2[ 20 ];
extern CHAR16 gzIntTileLocation2[ 20 ];
extern BOOLEAN gfUIIntTileLocation2;
extern BOOLEAN gfUIWaitingForUserSpeechAdvance;
Tactical/Interface Dialogue.cpp
+4 -4
View File
@@ -359,7 +359,7 @@ BOOLEAN InternalInitTalkingMenu( UINT8 ubCharacterNum, INT16 sX, INT16 sY )
UINT16 usHeight;
VOBJECT_DESC VObjectDesc;
INT16 sCenterYVal, sCenterXVal;
UINT8 ubString[48];
CHAR8 ubString[48];
// disable scroll messages
@@ -500,7 +500,7 @@ BOOLEAN InternalInitTalkingMenu( UINT8 ubCharacterNum, INT16 sX, INT16 sY )
gFacesData[ iFaceIndex ].uiFlags |= FACE_INACTIVE_HANDLED_ELSEWHERE;
// Load buttons, create button
sprintf( (char *)ubString, "INTERFACE\\talkbox2.sti" );
sprintf( ubString, "INTERFACE\\talkbox2.sti" );
gTalkPanel.iButtonImages = LoadButtonImage( ubString, -1,3,-1,4,-1 );
@@ -766,7 +766,7 @@ void RenderTalkingMenu( )
SET_USE_WINFONTS( TRUE );
SET_WINFONT( giSubTitleWinFont );
iInterfaceDialogueBox = PrepareMercPopupBox( iInterfaceDialogueBox,BASIC_MERC_POPUP_BACKGROUND, BASIC_MERC_POPUP_BORDER, (STR16) gTalkPanel.zQuoteStr, TALK_PANEL_DEFAULT_SUBTITLE_WIDTH, 0, 0, 0, &usTextBoxWidth, &usTextBoxHeight );
iInterfaceDialogueBox = PrepareMercPopupBox( iInterfaceDialogueBox,BASIC_MERC_POPUP_BACKGROUND, BASIC_MERC_POPUP_BORDER, gTalkPanel.zQuoteStr, TALK_PANEL_DEFAULT_SUBTITLE_WIDTH, 0, 0, 0, &usTextBoxWidth, &usTextBoxHeight );
SET_USE_WINFONTS( FALSE );
gTalkPanel.fSetupSubTitles = FALSE;
@@ -4378,7 +4378,7 @@ BOOLEAN PlayerTeamHasTwoSpotsLeft( )
void StartDialogueMessageBox( UINT8 ubProfileID, UINT16 usMessageBoxType )
{
INT32 iTemp;
wchar_t zTemp[256], zTemp2[256];
CHAR16 zTemp[256], zTemp2[256];
gusDialogueMessageBoxType = usMessageBoxType;
switch( gusDialogueMessageBoxType )
Tactical/Interface Items.cpp
+125 -125
View File
@@ -257,13 +257,13 @@ BOOLEAN gfInItemDescBox = FALSE;
UINT32 guiCurrentItemDescriptionScreen=0;
OBJECTTYPE *gpItemDescObject = NULL;
BOOLEAN gfItemDescObjectIsAttachment = FALSE;
wchar_t gzItemName[ SIZE_ITEM_NAME ];
wchar_t gzItemDesc[ SIZE_ITEM_INFO ];
wchar_t gzItemPros[ SIZE_ITEM_PROS ];
wchar_t gzItemCons[ SIZE_ITEM_CONS ];
wchar_t gzFullItemPros[ SIZE_ITEM_PROS ];
wchar_t gzFullItemCons[ SIZE_ITEM_PROS ];
wchar_t gzFullItemTemp[ SIZE_ITEM_PROS ]; // necessary, unfortunately
CHAR16 gzItemName[ SIZE_ITEM_NAME ];
CHAR16 gzItemDesc[ SIZE_ITEM_INFO ];
CHAR16 gzItemPros[ SIZE_ITEM_PROS ];
CHAR16 gzItemCons[ SIZE_ITEM_CONS ];
CHAR16 gzFullItemPros[ SIZE_ITEM_PROS ];
CHAR16 gzFullItemCons[ SIZE_ITEM_PROS ];
CHAR16 gzFullItemTemp[ SIZE_ITEM_PROS ]; // necessary, unfortunately
void ItemDescCallback( MOUSE_REGION * pRegion, INT32 iReason );
INT16 gsInvDescX;
INT16 gsInvDescY;
@@ -590,10 +590,10 @@ BOOLEAN AttemptToAddSubstring( STR16 zDest, STR16 zTemp, UINT32 * puiStringLengt
}
}
void GenerateProsString( wchar_t * zItemPros, OBJECTTYPE * pObject, UINT32 uiPixLimit )
void GenerateProsString( STR16 zItemPros, OBJECTTYPE * pObject, UINT32 uiPixLimit )
{
UINT32 uiStringLength = 0;
wchar_t * zTemp;
STR16 zTemp;
UINT16 usItem = pObject->usItem;
UINT8 ubWeight;
@@ -714,10 +714,10 @@ void GenerateProsString( wchar_t * zItemPros, OBJECTTYPE * pObject, UINT32 uiPix
}
}
void GenerateConsString( wchar_t * zItemCons, OBJECTTYPE * pObject, UINT32 uiPixLimit )
void GenerateConsString( STR16 zItemCons, OBJECTTYPE * pObject, UINT32 uiPixLimit )
{
UINT32 uiStringLength = 0;
wchar_t * zTemp;
STR16 zTemp;
UINT8 ubWeight;
UINT16 usItem = pObject->usItem;
@@ -1058,7 +1058,7 @@ void RenderInvBodyPanel( SOLDIERTYPE *pSoldier, INT16 sX, INT16 sY )
void HandleRenderInvSlots( SOLDIERTYPE *pSoldier, UINT8 fDirtyLevel )
{
INT32 cnt;
static wchar_t pStr[ 150 ];
static CHAR16 pStr[ 150 ];
if ( InItemDescriptionBox( ) || InItemStackPopup( ) || InKeyRingPopup( ) )
{
@@ -1999,7 +1999,7 @@ void INVRenderItem( UINT32 uiBuffer, SOLDIERTYPE * pSoldier, OBJECTTYPE *pObjec
INT16 sFontX2, sFontY2;
INT16 sFontX, sFontY;
static wchar_t pStr[ 100 ], pStr2[ 100 ];
static CHAR16 pStr[ 100 ], pStr2[ 100 ];
if ( pObject->usItem == NOTHING )
{
@@ -2107,11 +2107,11 @@ void INVRenderItem( UINT32 uiBuffer, SOLDIERTYPE * pSoldier, OBJECTTYPE *pObjec
if ( sWidth >= ( BIG_INV_SLOT_WIDTH - 10 ) )
{
swprintf( (wchar_t *)pStr, TacticalStr[ JAMMED_ITEM_STR ] );
swprintf( pStr, TacticalStr[ JAMMED_ITEM_STR ] );
}
else
{
swprintf( (wchar_t *)pStr, TacticalStr[ SHORT_JAMMED_GUN ] );
swprintf( pStr, TacticalStr[ SHORT_JAMMED_GUN ] );
}
VarFindFontCenterCoordinates( sX, sY, sWidth, sHeight , ITEM_FONT, &sNewX, &sNewY, pStr );
@@ -2130,7 +2130,7 @@ void INVRenderItem( UINT32 uiBuffer, SOLDIERTYPE * pSoldier, OBJECTTYPE *pObjec
SetFontForeground( FONT_GRAY4 );
sNewY = sY + sHeight - 10;
swprintf( (wchar_t *)pStr, L"%d", pObject->ubNumberOfObjects );
swprintf( pStr, L"%d", pObject->ubNumberOfObjects );
// Get length of string
uiStringLength=StringPixLength(pStr, ITEM_FONT );
@@ -2160,7 +2160,7 @@ void INVRenderItem( UINT32 uiBuffer, SOLDIERTYPE * pSoldier, OBJECTTYPE *pObjec
}
sNewY = sY;
swprintf( (wchar_t *)pStr, L"*" );
swprintf( pStr, L"*" );
// Get length of string
uiStringLength=StringPixLength(pStr, ITEM_FONT );
@@ -2181,27 +2181,27 @@ void INVRenderItem( UINT32 uiBuffer, SOLDIERTYPE * pSoldier, OBJECTTYPE *pObjec
sNewY = sY + 13; // rather arbitrary
if ( pSoldier->bWeaponMode == WM_BURST )
{
swprintf( (wchar_t *)pStr, L"BRST" );
swprintf( pStr, L"BRST" );
SetFontForeground( FONT_RED );
}
else if(pSoldier->bWeaponMode == WM_AUTOFIRE)
{
swprintf( (wchar_t *)pStr, L"AUTO" );
swprintf( pStr, L"AUTO" );
SetFontForeground( FONT_RED );
}
else if(pSoldier->bWeaponMode == WM_ATTACHED_GL)
{
swprintf( (wchar_t *)pStr, L"GL" );
swprintf( pStr, L"GL" );
SetFontForeground( FONT_YELLOW );
}
else if(pSoldier->bWeaponMode == WM_ATTACHED_GL_BURST)
{
swprintf( (wchar_t *)pStr, L"GL BRST" );
swprintf( pStr, L"GL BRST" );
SetFontForeground( FONT_YELLOW );
}
else if(pSoldier->bWeaponMode == WM_ATTACHED_GL_AUTO)
{
swprintf( (wchar_t *)pStr, L"GL AUTO" );
swprintf( pStr, L"GL AUTO" );
SetFontForeground( FONT_YELLOW );
}
@@ -2235,11 +2235,11 @@ void INVRenderItem( UINT32 uiBuffer, SOLDIERTYPE * pSoldier, OBJECTTYPE *pObjec
// Set string
if ( ubStatusIndex < RENDER_ITEM_ATTACHMENT1 )
{
swprintf( (wchar_t *)pStr, L"%s", ShortItemNames[ pObject->usItem ] );
swprintf( pStr, L"%s", ShortItemNames[ pObject->usItem ] );
}
else
{
swprintf( (wchar_t *)pStr, L"%s", ShortItemNames[ pObject->usAttachItem[ ubStatusIndex - RENDER_ITEM_ATTACHMENT1 ] ] );
swprintf( pStr, L"%s", ShortItemNames[ pObject->usAttachItem[ ubStatusIndex - RENDER_ITEM_ATTACHMENT1 ] ] );
}
fLineSplit = WrapString( pStr, pStr2, WORD_WRAP_INV_WIDTH, ITEM_FONT );
@@ -2362,10 +2362,10 @@ BOOLEAN InitKeyItemDescriptionBox( SOLDIERTYPE *pSoldier, UINT8 ubPosition, INT1
BOOLEAN InternalInitItemDescriptionBox( OBJECTTYPE *pObject, INT16 sX, INT16 sY, UINT8 ubStatusIndex, SOLDIERTYPE *pSoldier )
{
VOBJECT_DESC VObjectDesc;
UINT8 ubString[48];
CHAR8 ubString[48];
INT32 cnt;
INT16 pStr[10];
UINT16 usX, usY;
CHAR16 pStr[10];
INT16 usX, usY;
INT16 sForeColour;
INT16 sProsConsIndent;
@@ -2415,11 +2415,11 @@ BOOLEAN InternalInitItemDescriptionBox( OBJECTTYPE *pObject, INT16 sX, INT16 sY,
// if( guiCurrentScreen != MAP_SCREEN )
//if( guiCurrentItemDescriptionScreen != MAP_SCREEN )
if ( GetMagSize(gpItemDescObject) <= 99 )
swprintf( (wchar_t *)pStr, L"%d/%d", gpItemDescObject->ubGunShotsLeft, GetMagSize(gpItemDescObject));
swprintf( pStr, L"%d/%d", gpItemDescObject->ubGunShotsLeft, GetMagSize(gpItemDescObject));
else
swprintf( (wchar_t *)pStr, L"%d", gpItemDescObject->ubGunShotsLeft );
swprintf( pStr, L"%d", gpItemDescObject->ubGunShotsLeft );
FilenameForBPP("INTERFACE\\infobox.sti", (STR)ubString);
FilenameForBPP("INTERFACE\\infobox.sti", ubString);
sForeColour = ITEMDESC_AMMO_FORE;
// TODO: WANNE: Make own sti for the ammo types and an own for the interface
@@ -2799,7 +2799,7 @@ BOOLEAN ReloadItemDesc( )
void ItemDescAmmoCallback(GUI_BUTTON *btn,INT32 reason)
{
static BOOLEAN fRightDown = FALSE;
wchar_t pStr[10];
CHAR16 pStr[10];
/* region gets disabled in SKI for shopkeeper boxes. It now works normally for merc's inventory boxes!
//if we are currently in the shopkeeper interface, return;
@@ -2831,7 +2831,7 @@ void ItemDescAmmoCallback(GUI_BUTTON *btn,INT32 reason)
gpItemPointer = &gItemPointer;
gpItemPointerSoldier = gpItemDescSoldier;
swprintf( (wchar_t *)pStr, L"0" );
swprintf( pStr, L"0" );
SpecifyButtonText( giItemDescAmmoButton, pStr );
// Set mouse
@@ -2863,7 +2863,7 @@ void ItemDescAmmoCallback(GUI_BUTTON *btn,INT32 reason)
//fItemDescDelete = TRUE;
fInterfacePanelDirty = DIRTYLEVEL2;
swprintf( (wchar_t *)pStr, L"0" );
swprintf( pStr, L"0" );
SpecifyButtonText( giItemDescAmmoButton, pStr );
fItemDescDelete = TRUE;
@@ -3061,10 +3061,10 @@ void RenderItemDescriptionBox( )
CHAR16 sTempString[ 128 ];
UINT16 uiStringLength, uiRightLength;
static INT16 pStr[ 100 ];
static CHAR16 pStr[ 100 ];
INT32 cnt;
FLOAT fWeight;
UINT16 usX, usY;
INT16 usX, usY;
UINT8 ubAttackAPs;
BOOLEAN fHatchOutAttachments = gfItemDescObjectIsAttachment; // if examining attachment, always hatch out attachment slots
INT16 sProsConsIndent;
@@ -3203,11 +3203,11 @@ void RenderItemDescriptionBox( )
if ( (Item[gpItemDescObject->usItem].fingerprintid ) && gpItemDescObject->ubImprintID < NO_PROFILE )
{
// add name noting imprint
swprintf( (wchar_t *)pStr, L"%s %s (%s)", AmmoCaliber[ Weapon[ gpItemDescObject->usItem ].ubCalibre ], WeaponType[ Weapon[ gpItemDescObject->usItem ].ubWeaponType ], gMercProfiles[ gpItemDescObject->ubImprintID ].zNickname );
swprintf( pStr, L"%s %s (%s)", AmmoCaliber[ Weapon[ gpItemDescObject->usItem ].ubCalibre ], WeaponType[ Weapon[ gpItemDescObject->usItem ].ubWeaponType ], gMercProfiles[ gpItemDescObject->ubImprintID ].zNickname );
}
else
{
swprintf( (wchar_t *)pStr, L"%s %s", AmmoCaliber[ Weapon[ gpItemDescObject->usItem ].ubCalibre ], WeaponType[ Weapon[ gpItemDescObject->usItem ].ubWeaponType ] );
swprintf( pStr, L"%s %s", AmmoCaliber[ Weapon[ gpItemDescObject->usItem ].ubCalibre ], WeaponType[ Weapon[ gpItemDescObject->usItem ].ubWeaponType ] );
}
FindFontRightCoordinates( (INT16) MAP_ITEMDESC_CALIBER_X, (INT16) MAP_ITEMDESC_CALIBER_Y, MAP_ITEMDESC_CALIBER_WIDTH, ITEM_STATS_HEIGHT, pStr, ITEMDESC_FONT, &usX, &usY);
@@ -3301,7 +3301,7 @@ void RenderItemDescriptionBox( )
SetFontShadow( DEFAULT_SHADOW );
//LABELS
swprintf( sTempString, (wchar_t *)gWeaponStatsDesc[ 0 ], GetWeightUnitString() );
swprintf( sTempString, gWeaponStatsDesc[ 0 ], GetWeightUnitString() );
mprintf( gMapWeaponStats[ 0 ].sX + gsInvDescX, gMapWeaponStats[ 0 ].sY + gsInvDescY, L"%s", sTempString );
//mprintf( gMapWeaponStats[ 2 ].sX + gsInvDescX, gMapWeaponStats[ 2 ].sY + gsInvDescY, L"%s", gMapWeaponStats[ 2 ].zDesc );
if ( Item[ gpItemDescObject->usItem ].usItemClass & (IC_GUN | IC_LAUNCHER ) )
@@ -3330,7 +3330,7 @@ void RenderItemDescriptionBox( )
SetFontForeground( 5 );
//Status
// This is gross, but to get the % to work out right...
swprintf( (wchar_t *)pStr, L"%2d%%", gpItemDescObject->bStatus[ gubItemDescStatusIndex ] );
swprintf( pStr, L"%2d%%", gpItemDescObject->bStatus[ gubItemDescStatusIndex ] );
FindFontRightCoordinates( (INT16)(gMapWeaponStats[ 1 ].sX + gsInvDescX + gMapWeaponStats[ 1 ].sValDx + 6), (INT16)(gMapWeaponStats[ 1 ].sY + gsInvDescY ), ITEM_STATS_WIDTH ,ITEM_STATS_HEIGHT ,pStr, BLOCKFONT2, &usX, &usY);
wcscat( pStr, L"%%" );
mprintf( usX, usY, pStr );
@@ -3345,7 +3345,7 @@ void RenderItemDescriptionBox( )
SetFontForeground( 5 );
}
//Weight
swprintf( (wchar_t *)pStr, L"%1.1f", fWeight );
swprintf( pStr, L"%1.1f", fWeight );
FindFontRightCoordinates( (INT16)(gMapWeaponStats[ 0 ].sX + gsInvDescX + gMapWeaponStats[ 0 ].sValDx+6), (INT16)(gMapWeaponStats[ 0 ].sY + gsInvDescY ), ITEM_STATS_WIDTH ,ITEM_STATS_HEIGHT ,pStr, BLOCKFONT2, &usX, &usY);
mprintf( usX, usY, pStr );
@@ -3362,7 +3362,7 @@ void RenderItemDescriptionBox( )
}
//Range
swprintf( (wchar_t *)pStr, L"%2d", ( GunRange( gpItemDescObject ) ) / 10 );
swprintf( pStr, L"%2d", ( GunRange( gpItemDescObject ) ) / 10 );
FindFontRightCoordinates( (INT16)(gMapWeaponStats[ 3 ].sX + gsInvDescX + gMapWeaponStats[ 3 ].sValDx), (INT16)(gMapWeaponStats[ 3 ].sY + gsInvDescY ), ITEM_STATS_WIDTH ,ITEM_STATS_HEIGHT ,pStr, BLOCKFONT2, &usX, &usY);
mprintf( usX, usY, pStr );
}
@@ -3381,7 +3381,7 @@ void RenderItemDescriptionBox( )
}
//Damage
swprintf( (wchar_t *)pStr, L"%2d", ubImpact );
swprintf( pStr, L"%2d", ubImpact );
FindFontRightCoordinates( (INT16)(gMapWeaponStats[ 4 ].sX + gsInvDescX + gMapWeaponStats[ 4 ].sValDx), (INT16)(gMapWeaponStats[ 4 ].sY + gsInvDescY ), ITEM_STATS_WIDTH ,ITEM_STATS_HEIGHT ,pStr, BLOCKFONT2, &usX, &usY);
mprintf( usX, usY, pStr );
}
@@ -3400,7 +3400,7 @@ void RenderItemDescriptionBox( )
//Ap's
if ( !Weapon[gpItemDescObject->usItem].NoSemiAuto )
{
swprintf( (wchar_t *)pStr, L"%2d", ubAttackAPs );
swprintf( pStr, L"%2d", ubAttackAPs );
FindFontRightCoordinates( (INT16)(gMapWeaponStats[ 5 ].sX + gsInvDescX + gMapWeaponStats[ 5 ].sValDx), (INT16)(gMapWeaponStats[ 5 ].sY + gsInvDescY ), ITEM_STATS_WIDTH ,ITEM_STATS_HEIGHT ,pStr, BLOCKFONT2, &usX, &usY);
mprintf( usX, usY, pStr );
}
@@ -3417,7 +3417,7 @@ void RenderItemDescriptionBox( )
SetFontForeground( 5 );
}
swprintf( (wchar_t *)pStr, L"%2d", ubAttackAPs + CalcAPsToBurst( DEFAULT_APS, gpItemDescObject ) );
swprintf( pStr, L"%2d", ubAttackAPs + CalcAPsToBurst( DEFAULT_APS, gpItemDescObject ) );
FindFontRightCoordinates( (INT16)(gMapWeaponStats[ 6 ].sX + gsInvDescX + gMapWeaponStats[ 6 ].sValDx), (INT16)(gMapWeaponStats[ 6 ].sY + gsInvDescY ), ITEM_STATS_WIDTH ,ITEM_STATS_HEIGHT ,pStr, BLOCKFONT2, &usX, &usY);
mprintf( usX, usY, pStr );
}
@@ -3426,7 +3426,7 @@ void RenderItemDescriptionBox( )
SetFontForeground( 5 );
swprintf( (wchar_t *)pStr, L"%2d", ubAttackAPs + CalcAPsToAutofire( DEFAULT_APS, gpItemDescObject, 3 ) );
swprintf( pStr, L"%2d", ubAttackAPs + CalcAPsToAutofire( DEFAULT_APS, gpItemDescObject, 3 ) );
FindFontRightCoordinates( (INT16)(gMapWeaponStats[ 6 ].sX + gsInvDescX + gMapWeaponStats[ 6 ].sValDx), (INT16)(gMapWeaponStats[ 6 ].sY + gsInvDescY ), ITEM_STATS_WIDTH ,ITEM_STATS_HEIGHT ,pStr, BLOCKFONT2, &usX, &usY);
mprintf( usX, usY, pStr );
}
@@ -3443,9 +3443,9 @@ void RenderItemDescriptionBox( )
// if the player is taking money from their account
if( gfAddingMoneyToMercFromPlayersAccount )
swprintf( (wchar_t *)pStr, L"%ld", LaptopSaveInfo.iCurrentBalance );
swprintf( pStr, L"%ld", LaptopSaveInfo.iCurrentBalance );
else
swprintf( (wchar_t *)pStr, L"%ld", gRemoveMoney.uiTotalAmount );
swprintf( pStr, L"%ld", gRemoveMoney.uiTotalAmount );
InsertCommasForDollarFigure( pStr );
InsertDollarSignInToString( pStr );
@@ -3474,7 +3474,7 @@ void RenderItemDescriptionBox( )
mprintf( (UINT16)(gMapMoneyButtonLoc.x + gMoneyButtonOffsets[cnt].x), (UINT16)(gMapMoneyButtonLoc.y + gMoneyButtonOffsets[cnt].y ), gzMoneyAmounts[4] );
// The Money Remaining
swprintf( (wchar_t *)pStr, L"%ld", gRemoveMoney.uiMoneyRemaining );
swprintf( pStr, L"%ld", gRemoveMoney.uiMoneyRemaining );
InsertCommasForDollarFigure( pStr );
InsertDollarSignInToString( pStr );
uiStringLength=StringPixLength(pStr, ITEMDESC_FONT );
@@ -3484,7 +3484,7 @@ void RenderItemDescriptionBox( )
// The money removing
SetFontForeground( 5 );
swprintf( (wchar_t *)pStr, L"%ld", gRemoveMoney.uiMoneyRemoving );
swprintf( pStr, L"%ld", gRemoveMoney.uiMoneyRemoving );
InsertCommasForDollarFigure( pStr );
InsertDollarSignInToString( pStr );
uiStringLength=StringPixLength(pStr, ITEMDESC_FONT );
@@ -3502,7 +3502,7 @@ void RenderItemDescriptionBox( )
{
SetFontForeground( FONT_FCOLOR_WHITE );
SetFontShadow( DEFAULT_SHADOW );
swprintf( (wchar_t *)pStr, L"%ld", gpItemDescObject->uiMoneyAmount );
swprintf( pStr, L"%ld", gpItemDescObject->uiMoneyAmount );
InsertCommasForDollarFigure( pStr );
InsertDollarSignInToString( pStr );
uiStringLength=StringPixLength(pStr, ITEMDESC_FONT );
@@ -3525,7 +3525,7 @@ void RenderItemDescriptionBox( )
{
mprintf( gMapWeaponStats[ 1 ].sX + gsInvDescX, gMapWeaponStats[ 1 ].sY + gsInvDescY, L"%s", gWeaponStatsDesc[ 1 ] );
}
swprintf( sTempString, (wchar_t *)gWeaponStatsDesc[ 0 ], GetWeightUnitString() );
swprintf( sTempString, gWeaponStatsDesc[ 0 ], GetWeightUnitString() );
mprintf( gMapWeaponStats[ 0 ].sX + gsInvDescX, gMapWeaponStats[ 0 ].sY + gsInvDescY, sTempString );
// Values
@@ -3535,7 +3535,7 @@ void RenderItemDescriptionBox( )
if ( Item[ gpItemDescObject->usItem ].usItemClass & IC_AMMO )
{
// Ammo
swprintf( (wchar_t *)pStr, L"%d/%d", gpItemDescObject->ubShotsLeft[gubItemDescStatusIndex], Magazine[ Item[ gpItemDescObject->usItem ].ubClassIndex ].ubMagSize ); //Pulmu: Correct # of rounds for stacked ammo.
swprintf( pStr, L"%d/%d", gpItemDescObject->ubShotsLeft[gubItemDescStatusIndex], Magazine[ Item[ gpItemDescObject->usItem ].ubClassIndex ].ubMagSize ); //Pulmu: Correct # of rounds for stacked ammo.
uiStringLength=StringPixLength(pStr, ITEMDESC_FONT );
// sStrX = gMapWeaponStats[ 0 ].sX + gsInvDescX + gMapWeaponStats[ 0 ].sValDx + ( uiRightLength - uiStringLength );
FindFontRightCoordinates( (INT16)(gMapWeaponStats[ 2 ].sX + gsInvDescX + gMapWeaponStats[ 2 ].sValDx+6), (INT16)(gMapWeaponStats[ 2 ].sY + gsInvDescY ), ITEM_STATS_WIDTH ,ITEM_STATS_HEIGHT ,pStr, BLOCKFONT2, &sStrX, &usY);
@@ -3544,7 +3544,7 @@ void RenderItemDescriptionBox( )
else
{
//Status
swprintf( (wchar_t *)pStr, L"%2d%%", gpItemDescObject->bStatus[ gubItemDescStatusIndex ] );
swprintf( pStr, L"%2d%%", gpItemDescObject->bStatus[ gubItemDescStatusIndex ] );
uiStringLength=StringPixLength(pStr, ITEMDESC_FONT );
// sStrX = gMapWeaponStats[ 1 ].sX + gsInvDescX + gMapWeaponStats[ 1 ].sValDx + ( uiRightLength - uiStringLength );
FindFontRightCoordinates( (INT16)(gMapWeaponStats[ 1 ].sX + gsInvDescX + gMapWeaponStats[ 1 ].sValDx + 6), (INT16)(gMapWeaponStats[ 1 ].sY + gsInvDescY ), ITEM_STATS_WIDTH ,ITEM_STATS_HEIGHT ,pStr, BLOCKFONT2, &sStrX, &usY);
@@ -3553,7 +3553,7 @@ void RenderItemDescriptionBox( )
}
//Weight
swprintf( (wchar_t *)pStr, L"%1.1f", fWeight );
swprintf( pStr, L"%1.1f", fWeight );
uiStringLength=StringPixLength(pStr, ITEMDESC_FONT );
// sStrX = gMapWeaponStats[ 0 ].sX + gsInvDescX + gMapWeaponStats[ 0 ].sValDx + ( uiRightLength - uiStringLength );
FindFontRightCoordinates( (INT16)(gMapWeaponStats[ 0 ].sX + gsInvDescX + gMapWeaponStats[ 0 ].sValDx+6), (INT16)(gMapWeaponStats[ 0 ].sY + gsInvDescY ), ITEM_STATS_WIDTH ,ITEM_STATS_HEIGHT ,pStr, BLOCKFONT2, &sStrX, &usY);
@@ -3564,19 +3564,19 @@ void RenderItemDescriptionBox( )
SetFontForeground( 6 );
// build description for keys .. the sector found
swprintf( (wchar_t *)pStr, L"%s", sKeyDescriptionStrings[ 0 ] );
swprintf( pStr, L"%s", sKeyDescriptionStrings[ 0 ] );
mprintf( gMapWeaponStats[ 4 ].sX + gsInvDescX, gMapWeaponStats[ 4 ].sY + gsInvDescY, pStr );
swprintf( (wchar_t *)pStr, L"%s", sKeyDescriptionStrings[ 1 ] );
swprintf( pStr, L"%s", sKeyDescriptionStrings[ 1 ] );
mprintf( gMapWeaponStats[ 4 ].sX + gsInvDescX, gMapWeaponStats[ 4 ].sY + gsInvDescY + GetFontHeight( BLOCKFONT ) + 2 , pStr );
SetFontForeground( 5 );
GetShortSectorString( ( INT16 ) SECTORX( KeyTable[ gpItemDescObject->ubKeyID ].usSectorFound ), ( INT16 ) SECTORY( KeyTable[ gpItemDescObject->ubKeyID ].usSectorFound ), sTempString );
swprintf( (wchar_t *)pStr, L"%s", sTempString );
swprintf( pStr, L"%s", sTempString );
FindFontRightCoordinates( (INT16)(gMapWeaponStats[ 4 ].sX + gsInvDescX ), (INT16)(gMapWeaponStats[ 4 ].sY + gsInvDescY ), 110 ,ITEM_STATS_HEIGHT ,pStr, BLOCKFONT2, &usX, &usY);
mprintf( usX, usY, pStr );
swprintf( (wchar_t *)pStr, L"%d", KeyTable[ gpItemDescObject->ubKeyID ].usDateFound );
swprintf( pStr, L"%d", KeyTable[ gpItemDescObject->ubKeyID ].usDateFound );
FindFontRightCoordinates( (INT16)(gMapWeaponStats[ 4 ].sX + gsInvDescX ), (INT16)(gMapWeaponStats[ 4 ].sY + gsInvDescY + GetFontHeight( BLOCKFONT ) + 2 ), 110 ,ITEM_STATS_HEIGHT ,pStr, BLOCKFONT2, &usX, &usY);
mprintf( usX, usY, pStr );
}
@@ -3707,11 +3707,11 @@ void RenderItemDescriptionBox( )
if ( ( Item[gpItemDescObject->usItem].fingerprintid ) && gpItemDescObject->ubImprintID < NO_PROFILE )
{
// add name noting imprint
swprintf( (wchar_t *)pStr, L"%s %s (%s)", AmmoCaliber[ Weapon[ gpItemDescObject->usItem ].ubCalibre ], WeaponType[ Weapon[ gpItemDescObject->usItem ].ubWeaponType ], gMercProfiles[ gpItemDescObject->ubImprintID ].zNickname );
swprintf( pStr, L"%s %s (%s)", AmmoCaliber[ Weapon[ gpItemDescObject->usItem ].ubCalibre ], WeaponType[ Weapon[ gpItemDescObject->usItem ].ubWeaponType ], gMercProfiles[ gpItemDescObject->ubImprintID ].zNickname );
}
else
{
swprintf( (wchar_t *)pStr, L"%s %s", AmmoCaliber[ Weapon[ gpItemDescObject->usItem ].ubCalibre ], WeaponType[ Weapon[ gpItemDescObject->usItem ].ubWeaponType ] );
swprintf( pStr, L"%s %s", AmmoCaliber[ Weapon[ gpItemDescObject->usItem ].ubCalibre ], WeaponType[ Weapon[ gpItemDescObject->usItem ].ubWeaponType ] );
}
FindFontRightCoordinates( (INT16) ITEMDESC_CALIBER_X, (INT16) ITEMDESC_CALIBER_Y, ITEMDESC_CALIBER_WIDTH, ITEM_STATS_HEIGHT, pStr, ITEMDESC_FONT, &usX, &usY);
@@ -3795,7 +3795,7 @@ void RenderItemDescriptionBox( )
SetFontShadow( DEFAULT_SHADOW );
//LABELS
swprintf( sTempString, (wchar_t *)gWeaponStatsDesc[ 0 ], GetWeightUnitString() );
swprintf( sTempString, gWeaponStatsDesc[ 0 ], GetWeightUnitString() );
mprintf( gWeaponStats[ 0 ].sX + gsInvDescX, gWeaponStats[ 0 ].sY + gsInvDescY, sTempString );
// mprintf( gWeaponStats[ 1 ].sX + gsInvDescX, gWeaponStats[ 1 ].sY + gsInvDescY, L"%s", gWeaponStatsDesc[ 1 ].zDesc );
// mprintf( gWeaponStats[ 2 ].sX + gsInvDescX, gWeaponStats[ 2 ].sY + gsInvDescY, L"%s", gWeaponStats[ 2 ].zDesc );
@@ -3831,13 +3831,13 @@ void RenderItemDescriptionBox( )
}
//Status
swprintf( (wchar_t *)pStr, L"%2d%%", gpItemDescObject->bGunStatus );
swprintf( pStr, L"%2d%%", gpItemDescObject->bGunStatus );
FindFontRightCoordinates( (INT16)(gWeaponStats[ 1 ].sX + gsInvDescX + gWeaponStats[ 1 ].sValDx), (INT16)(gWeaponStats[ 1 ].sY + gsInvDescY ), ITEM_STATS_WIDTH ,ITEM_STATS_HEIGHT ,pStr, BLOCKFONT2, &usX, &usY);
wcscat( pStr, L"%%" );
mprintf( usX, usY, pStr );
//Wieght
swprintf( (wchar_t *)pStr, L"%1.1f", fWeight );
swprintf( pStr, L"%1.1f", fWeight );
FindFontRightCoordinates( (INT16)(gWeaponStats[ 0 ].sX + gsInvDescX + gWeaponStats[ 0 ].sValDx), (INT16)(gWeaponStats[ 0 ].sY + gsInvDescY ), ITEM_STATS_WIDTH ,ITEM_STATS_HEIGHT ,pStr, BLOCKFONT2, &usX, &usY);
mprintf( usX, usY, pStr );
@@ -3852,7 +3852,7 @@ void RenderItemDescriptionBox( )
SetFontForeground( 5 );
}
swprintf( (wchar_t *)pStr, L"%2d", ( GunRange( gpItemDescObject ) ) / 10 );
swprintf( pStr, L"%2d", ( GunRange( gpItemDescObject ) ) / 10 );
FindFontRightCoordinates( (INT16)(gWeaponStats[ 3 ].sX + gsInvDescX + gWeaponStats[ 3 ].sValDx), (INT16)(gWeaponStats[ 3 ].sY + gsInvDescY ), ITEM_STATS_WIDTH ,ITEM_STATS_HEIGHT ,pStr, BLOCKFONT2, &usX, &usY);
mprintf( usX, usY, pStr );
}
@@ -3869,7 +3869,7 @@ void RenderItemDescriptionBox( )
SetFontForeground( 5 );
}
swprintf( (wchar_t *)pStr, L"%2d", ubImpact );
swprintf( pStr, L"%2d", ubImpact );
FindFontRightCoordinates( (INT16)(gWeaponStats[ 4 ].sX + gsInvDescX + gWeaponStats[ 4 ].sValDx), (INT16)(gWeaponStats[ 4 ].sY + gsInvDescY ), ITEM_STATS_WIDTH ,ITEM_STATS_HEIGHT ,pStr, BLOCKFONT2, &usX, &usY);
mprintf( usX, usY, pStr );
}
@@ -3887,7 +3887,7 @@ void RenderItemDescriptionBox( )
if ( !Weapon[gpItemDescObject->usItem].NoSemiAuto )
{
swprintf( (wchar_t *)pStr, L"%2d", ubAttackAPs );
swprintf( pStr, L"%2d", ubAttackAPs );
FindFontRightCoordinates( (INT16)(gWeaponStats[ 5 ].sX + gsInvDescX + gWeaponStats[ 5 ].sValDx), (INT16)(gWeaponStats[ 5 ].sY + gsInvDescY ), ITEM_STATS_WIDTH, ITEM_STATS_HEIGHT ,pStr, BLOCKFONT2, &usX, &usY);
mprintf( usX, usY, pStr );
}
@@ -3903,14 +3903,14 @@ void RenderItemDescriptionBox( )
SetFontForeground( 5 );
}
swprintf( (wchar_t *)pStr, L"%2d", ubAttackAPs + CalcAPsToBurst( DEFAULT_APS, gpItemDescObject ) );
swprintf( pStr, L"%2d", ubAttackAPs + CalcAPsToBurst( DEFAULT_APS, gpItemDescObject ) );
FindFontRightCoordinates( (INT16)(gWeaponStats[ 6 ].sX + gsInvDescX + gWeaponStats[ 6 ].sValDx), (INT16)(gWeaponStats[ 6 ].sY + gsInvDescY ), ITEM_STATS_WIDTH, ITEM_STATS_HEIGHT, pStr, BLOCKFONT2, &usX, &usY );
mprintf( usX, usY, pStr );
}
else if (GetAutofireShotsPerFiveAPs(gpItemDescObject)> 0)
{
SetFontForeground( 5 );
swprintf( (wchar_t *)pStr, L"%2d", ubAttackAPs + CalcAPsToBurst( DEFAULT_APS, gpItemDescObject ) );
swprintf( pStr, L"%2d", ubAttackAPs + CalcAPsToBurst( DEFAULT_APS, gpItemDescObject ) );
FindFontRightCoordinates( (INT16)(gWeaponStats[ 6 ].sX + gsInvDescX + gWeaponStats[ 6 ].sValDx), (INT16)(gWeaponStats[ 6 ].sY + gsInvDescY ), ITEM_STATS_WIDTH, ITEM_STATS_HEIGHT, pStr, BLOCKFONT2, &usX, &usY );
mprintf( usX, usY, pStr );
}
@@ -3951,7 +3951,7 @@ void RenderItemDescriptionBox( )
// Total Amount
SetFontForeground( FONT_WHITE );
swprintf( (wchar_t *)pStr, L"%d", gRemoveMoney.uiTotalAmount );
swprintf( pStr, L"%d", gRemoveMoney.uiTotalAmount );
InsertCommasForDollarFigure( pStr );
InsertDollarSignInToString( pStr );
FindFontRightCoordinates( (INT16)(ITEMDESC_NAME_X), (INT16)(ITEMDESC_NAME_Y ), 295,ITEM_STATS_HEIGHT ,pStr, BLOCKFONT2, &usX, &usY);
@@ -3981,14 +3981,14 @@ void RenderItemDescriptionBox( )
SetFontForeground( 5 );
//Display the total amount of money remaining
swprintf( (wchar_t *)pStr, L"%ld", gRemoveMoney.uiMoneyRemaining );
swprintf( pStr, L"%ld", gRemoveMoney.uiMoneyRemaining );
InsertCommasForDollarFigure( pStr );
InsertDollarSignInToString( pStr );
FindFontRightCoordinates( (INT16)(gMoneyStats[ 1 ].sX + gsInvDescX + gMoneyStats[ 1 ].sValDx), (INT16)(gMoneyStats[ 1 ].sY + gsInvDescY ), (UINT16)(ITEM_STATS_WIDTH-3),ITEM_STATS_HEIGHT ,pStr, BLOCKFONT2, &usX, &usY);
mprintf( usX, usY, pStr );
//Display the total amount of money removing
swprintf( (wchar_t *)pStr, L"%ld", gRemoveMoney.uiMoneyRemoving );
swprintf( pStr, L"%ld", gRemoveMoney.uiMoneyRemoving );
InsertCommasForDollarFigure( pStr );
InsertDollarSignInToString( pStr );
FindFontRightCoordinates( (INT16)(gMoneyStats[ 3 ].sX + gsInvDescX + gMoneyStats[ 3 ].sValDx), (INT16)(gMoneyStats[ 3 ].sY + gsInvDescY), (UINT16)(ITEM_STATS_WIDTH-3) ,ITEM_STATS_HEIGHT ,pStr, BLOCKFONT2, &usX, &usY);
@@ -3999,7 +3999,7 @@ void RenderItemDescriptionBox( )
{
SetFontForeground( FONT_FCOLOR_WHITE );
SetFontShadow( DEFAULT_SHADOW );
swprintf( (wchar_t *)pStr, (wchar_t *)L"%ld", gpItemDescObject->uiMoneyAmount );
swprintf( pStr, L"%ld", gpItemDescObject->uiMoneyAmount );
InsertCommasForDollarFigure( pStr );
InsertDollarSignInToString( pStr );
@@ -4025,7 +4025,7 @@ void RenderItemDescriptionBox( )
}
//Weight
swprintf( sTempString, (wchar_t *)gWeaponStatsDesc[ 0 ], GetWeightUnitString() );
swprintf( sTempString, gWeaponStatsDesc[ 0 ], GetWeightUnitString() );
mprintf( gWeaponStats[ 0 ].sX + gsInvDescX, gWeaponStats[ 0 ].sY + gsInvDescY, sTempString );
// Values
@@ -4035,14 +4035,14 @@ void RenderItemDescriptionBox( )
{
// Ammo - print amount
//Status
swprintf( (wchar_t *)pStr, L"%d/%d", gpItemDescObject->ubShotsLeft[gubItemDescStatusIndex], Magazine[ Item[ gpItemDescObject->usItem ].ubClassIndex ].ubMagSize ); //Pulmu: Correct # of rounds for stacked ammo
swprintf( pStr, L"%d/%d", gpItemDescObject->ubShotsLeft[gubItemDescStatusIndex], Magazine[ Item[ gpItemDescObject->usItem ].ubClassIndex ].ubMagSize ); //Pulmu: Correct # of rounds for stacked ammo
FindFontRightCoordinates( (INT16)(gWeaponStats[ 2 ].sX + gsInvDescX + gWeaponStats[ 2 ].sValDx), (INT16)(gWeaponStats[ 2 ].sY + gsInvDescY ), ITEM_STATS_WIDTH ,ITEM_STATS_HEIGHT ,pStr, BLOCKFONT2, &usX, &usY);
mprintf( usX, usY, pStr );
}
else
{
//Status
swprintf( (wchar_t *)pStr, L"%2d%%", gpItemDescObject->bStatus[ gubItemDescStatusIndex ] );
swprintf( pStr, L"%2d%%", gpItemDescObject->bStatus[ gubItemDescStatusIndex ] );
FindFontRightCoordinates( (INT16)(gWeaponStats[ 1 ].sX + gsInvDescX + gWeaponStats[ 1 ].sValDx), (INT16)(gWeaponStats[ 1 ].sY + gsInvDescY ), ITEM_STATS_WIDTH ,ITEM_STATS_HEIGHT ,pStr, BLOCKFONT2, &usX, &usY);
wcscat( pStr, L"%%" );
mprintf( usX, usY, pStr );
@@ -4053,19 +4053,19 @@ void RenderItemDescriptionBox( )
SetFontForeground( 6 );
// build description for keys .. the sector found
swprintf( (wchar_t *)pStr, L"%s", sKeyDescriptionStrings[ 0 ] );
swprintf( pStr, L"%s", sKeyDescriptionStrings[ 0 ] );
mprintf( gWeaponStats[ 4 ].sX + gsInvDescX, gWeaponStats[ 4 ].sY + gsInvDescY, pStr );
swprintf( (wchar_t *)pStr, L"%s", sKeyDescriptionStrings[ 1 ] );
swprintf( pStr, L"%s", sKeyDescriptionStrings[ 1 ] );
mprintf( gWeaponStats[ 4 ].sX + gsInvDescX, gWeaponStats[ 4 ].sY + gsInvDescY + GetFontHeight( BLOCKFONT ) + 2 , pStr );
SetFontForeground( 5 );
GetShortSectorString( ( INT16 ) SECTORX( KeyTable[ gpItemDescObject->ubKeyID ].usSectorFound ), ( INT16 ) SECTORY( KeyTable[ gpItemDescObject->ubKeyID ].usSectorFound ), sTempString );
swprintf( (wchar_t *)pStr, L"%s", sTempString );
swprintf( pStr, L"%s", sTempString );
FindFontRightCoordinates( (INT16)(gWeaponStats[ 4 ].sX + gsInvDescX ), (INT16)(gWeaponStats[ 4 ].sY + gsInvDescY ), 110 ,ITEM_STATS_HEIGHT ,pStr, BLOCKFONT2, &usX, &usY);
mprintf( usX, usY, pStr );
swprintf( (wchar_t *)pStr, L"%d", KeyTable[ gpItemDescObject->ubKeyID ].usDateFound );
swprintf( pStr, L"%d", KeyTable[ gpItemDescObject->ubKeyID ].usDateFound );
FindFontRightCoordinates( (INT16)(gWeaponStats[ 4 ].sX + gsInvDescX ), (INT16)(gWeaponStats[ 4 ].sY + gsInvDescY + GetFontHeight( BLOCKFONT ) + 2 ), 110 ,ITEM_STATS_HEIGHT ,pStr, BLOCKFONT2, &usX, &usY);
mprintf( usX, usY, pStr );
}
@@ -4074,7 +4074,7 @@ void RenderItemDescriptionBox( )
//Weight
swprintf( (wchar_t *)pStr, L"%1.1f", fWeight );
swprintf( pStr, L"%1.1f", fWeight );
FindFontRightCoordinates( (INT16)(gWeaponStats[ 0 ].sX + gsInvDescX + gWeaponStats[ 0 ].sValDx), (INT16)(gWeaponStats[ 0 ].sY + gsInvDescY ), ITEM_STATS_WIDTH ,ITEM_STATS_HEIGHT ,pStr, BLOCKFONT2, &usX, &usY);
mprintf( usX, usY, pStr );
}
@@ -6188,7 +6188,7 @@ void SetItemPickupMenuDirty( BOOLEAN fDirtyLevel )
BOOLEAN InitializeItemPickupMenu( SOLDIERTYPE *pSoldier, INT16 sGridNo, ITEM_POOL *pItemPool, INT16 sScreenX, INT16 sScreenY, INT8 bZLevel )
{
VOBJECT_DESC VObjectDesc;
UINT8 ubString[48];
CHAR8 ubString[48];
ITEM_POOL *pTempItemPool;
INT32 cnt;
INT16 sCenX, sCenY, sX, sY, sCenterYVal;
@@ -6314,7 +6314,7 @@ BOOLEAN InitializeItemPickupMenu( SOLDIERTYPE *pSoldier, INT16 sGridNo, ITEM_POO
gItemPickupMenu.fAllSelected = FALSE;
//Load images for buttons
FilenameForBPP("INTERFACE\\itembox.sti", (STR)ubString );
FilenameForBPP("INTERFACE\\itembox.sti", ubString );
gItemPickupMenu.iUpButtonImages = LoadButtonImage( ubString, -1,5,-1,10,-1 );
gItemPickupMenu.iDownButtonImages = UseLoadedButtonImage( gItemPickupMenu.iUpButtonImages, -1, 7, -1, 12, -1 );
gItemPickupMenu.iAllButtonImages = UseLoadedButtonImage( gItemPickupMenu.iUpButtonImages, -1, 6, -1,11, -1 );
@@ -6424,7 +6424,7 @@ void SetupPickupPage( INT8 bPage )
ITEM_POOL *pTempItemPool;
INT16 sValue;
OBJECTTYPE *pObject;
static INT16 pStr[ 200 ];
static CHAR16 pStr[ 200 ];
// Zero out page slots
@@ -6492,11 +6492,11 @@ void SetupPickupPage( INT8 bPage )
// Adjust for ammo, other thingys..
if( Item[ pObject->usItem ].usItemClass & IC_AMMO || Item[ pObject->usItem ].usItemClass & IC_KEY )
{
swprintf( (wchar_t *)pStr, L"" );
swprintf( pStr, L"" );
}
else
{
swprintf( (wchar_t *)pStr, L"%d%%", sValue );
swprintf( pStr, L"%d%%", sValue );
}
SetRegionFastHelpText( &(gItemPickupMenu.Regions[ cnt - iStart ]), pStr );
@@ -6594,7 +6594,7 @@ void RenderItemPickupMenu( )
INT16 sX, sY, sCenX, sCenY, sFontX, sFontY, sNewX, sNewY;
UINT32 uiDestPitchBYTES;
UINT8 *pDestBuf;
INT16 pStr[ 100 ];
CHAR16 pStr[ 100 ];
UINT16 usSubRegion, usHeight, usWidth;
INVTYPE *pItem;
OBJECTTYPE *pObject;
@@ -6702,7 +6702,7 @@ void RenderItemPickupMenu( )
sCenX = sX - 4;
sCenY = sY + 14;
swprintf( (wchar_t *)pStr, L"%d", pObject->ubNumberOfObjects );
swprintf( pStr, L"%d", pObject->ubNumberOfObjects );
VarFindFontRightCoordinates( sCenX, sCenY, 42, 1 , ITEM_FONT, &sFontX, &sFontY, pStr );
mprintf_buffer( pDestBuf, uiDestPitchBYTES, ITEM_FONT, sFontX, sFontY, pStr );
@@ -6717,7 +6717,7 @@ void RenderItemPickupMenu( )
SetFontShadow( DEFAULT_SHADOW );
sNewY = sCenY + 2;
swprintf( (wchar_t *)pStr, L"*" );
swprintf( pStr, L"*" );
// Get length of string
uiStringLength=StringPixLength( pStr, ITEM_FONT );
@@ -6757,16 +6757,16 @@ void RenderItemPickupMenu( )
// If we are money...
if ( Item[ pObject->usItem ].usItemClass == IC_MONEY )
{
INT16 pStr2[20];
swprintf( (wchar_t *)pStr2, L"%ld", pObject->uiMoneyAmount );
CHAR16 pStr2[20];
swprintf( pStr2, L"%ld", pObject->uiMoneyAmount );
InsertCommasForDollarFigure( pStr2 );
InsertDollarSignInToString( pStr2 );
swprintf( (wchar_t *)pStr, L"%s (%ls)", ItemNames[ pObject->usItem ], pStr2 );
swprintf( pStr, L"%s (%ls)", ItemNames[ pObject->usItem ], pStr2 );
}
else
{
swprintf( (wchar_t *)pStr, L"%s", ShortItemNames[ pObject->usItem ] );
swprintf( pStr, L"%s", ShortItemNames[ pObject->usItem ] );
}
VarFindFontCenterCoordinates( sCenX, sCenY, ITEMPICK_TEXT_WIDTH, 1 , ITEMDESC_FONT, &sFontX, &sFontY, pStr );
mprintf_buffer( pDestBuf, uiDestPitchBYTES, ITEMDESC_FONT, sFontX, sFontY, pStr );
@@ -7385,9 +7385,9 @@ BOOLEAN AttemptToApplyCamo( SOLDIERTYPE *pSoldier, UINT16 usItemIndex )
void GetHelpTextForItem( wchar_t * pzStr, OBJECTTYPE *pObject, SOLDIERTYPE *pSoldier )
void GetHelpTextForItem( STR16 pzStr, OBJECTTYPE *pObject, SOLDIERTYPE *pSoldier )
{
INT16 pStr[ 250 ];
CHAR16 pStr[ 250 ];
UINT16 usItem = pObject->usItem;
INT32 cnt = 0;
INT32 iNumAttachments = 0;
@@ -7396,8 +7396,8 @@ void GetHelpTextForItem( wchar_t * pzStr, OBJECTTYPE *pObject, SOLDIERTYPE *pSol
{
if ( pSoldier->uiStatusFlags & SOLDIER_DEAD )
{
swprintf((wchar_t *) pStr, L"" );
swprintf( (wchar_t *)pzStr, L"%s", pStr );
swprintf( pStr, L"" );
swprintf( pzStr, L"%s", pStr );
return;
}
}
@@ -7438,7 +7438,7 @@ void GetHelpTextForItem( wchar_t * pzStr, OBJECTTYPE *pObject, SOLDIERTYPE *pSol
case MONEY:
//Money
{
swprintf( (wchar_t *)pStr, L"%ld", pObject->uiMoneyAmount );
swprintf( pStr, L"%ld", pObject->uiMoneyAmount );
InsertCommasForDollarFigure( pStr );
InsertDollarSignInToString( pStr );
}
@@ -7448,34 +7448,34 @@ void GetHelpTextForItem( wchar_t * pzStr, OBJECTTYPE *pObject, SOLDIERTYPE *pSol
// alternate money like silver or gold
//if ( Item[ usItem ].usItemClass == IC_MONEY )
{
INT16 pStr2[20];
swprintf( (wchar_t *)pStr2, L"%ld", pObject->uiMoneyAmount );
CHAR16 pStr2[20];
swprintf( pStr2, L"%ld", pObject->uiMoneyAmount );
InsertCommasForDollarFigure( pStr2 );
InsertDollarSignInToString( pStr2 );
swprintf( (wchar_t *)pStr, L"%s (%ls)", ItemNames[ usItem ], pStr2 );
swprintf( pStr, L"%s (%ls)", ItemNames[ usItem ], pStr2 );
}
break;
case IC_GUN:
{
//Calculate AP's
INT16 apStr[20];
INT16 apStr2[20];
CHAR16 apStr[20];
CHAR16 apStr2[20];
UINT8 ubAttackAPs = BaseAPsToShootOrStab( DEFAULT_APS, DEFAULT_AIMSKILL, pObject );
if ( Weapon[ usItem ].NoSemiAuto )
{
swprintf( (wchar_t *)apStr, L"-" );
swprintf( apStr, L"-" );
}
else
{
swprintf( (wchar_t *)apStr, L"%d", ubAttackAPs );
swprintf( apStr, L"%d", ubAttackAPs );
}
if (GetShotsPerBurst(pObject) > 0)
{
swprintf( (wchar_t *)apStr2, L" / %d", ubAttackAPs + CalcAPsToBurst( DEFAULT_APS, pObject ) );
swprintf( apStr2, L" / %d", ubAttackAPs + CalcAPsToBurst( DEFAULT_APS, pObject ) );
wcscat( apStr, apStr2 );
}
else
@@ -7485,7 +7485,7 @@ void GetHelpTextForItem( wchar_t * pzStr, OBJECTTYPE *pObject, SOLDIERTYPE *pSol
if (GetAutofireShotsPerFiveAPs(pObject) > 0)
{
swprintf( (wchar_t *)apStr2, L" / %d", ubAttackAPs + CalcAPsToAutofire( DEFAULT_APS, pObject, 3 ) );
swprintf( apStr2, L" / %d", ubAttackAPs + CalcAPsToAutofire( DEFAULT_APS, pObject, 3 ) );
wcscat( apStr, apStr2 );
}
else
@@ -7494,7 +7494,7 @@ void GetHelpTextForItem( wchar_t * pzStr, OBJECTTYPE *pObject, SOLDIERTYPE *pSol
}
//Info for weapons
swprintf( (wchar_t *)pStr, L"%s (%s) [%d%%]\n%s %d\n%s %d\n%s %d (%d)\n%s %s\n%s %1.1f %s",
swprintf( pStr, L"%s (%s) [%d%%]\n%s %d\n%s %d\n%s %d (%d)\n%s %s\n%s %1.1f %s",
ItemNames[ usItem ],
AmmoCaliber[ Weapon[ usItem ].ubCalibre ],
sValue,
@@ -7517,15 +7517,15 @@ void GetHelpTextForItem( wchar_t * pzStr, OBJECTTYPE *pObject, SOLDIERTYPE *pSol
case IC_LAUNCHER:
{
//Calculate AP's
INT16 apStr[20];
INT16 apStr2[20];
CHAR16 apStr[20];
CHAR16 apStr2[20];
UINT8 ubAttackAPs = BaseAPsToShootOrStab( DEFAULT_APS, DEFAULT_AIMSKILL, pObject );
swprintf( (wchar_t *)apStr, L"%d", ubAttackAPs );
swprintf( apStr, L"%d", ubAttackAPs );
if (GetShotsPerBurst(pObject) > 0)
{
swprintf( (wchar_t *)apStr2, L" / %d", ubAttackAPs + CalcAPsToBurst( DEFAULT_APS, pObject ) );
swprintf( apStr2, L" / %d", ubAttackAPs + CalcAPsToBurst( DEFAULT_APS, pObject ) );
wcscat( apStr, apStr2 );
}
else
@@ -7535,7 +7535,7 @@ void GetHelpTextForItem( wchar_t * pzStr, OBJECTTYPE *pObject, SOLDIERTYPE *pSol
if (GetAutofireShotsPerFiveAPs(pObject) > 0)
{
swprintf( (wchar_t *)apStr2, L" / %d", ubAttackAPs + CalcAPsToAutofire( DEFAULT_APS, pObject, 3 ) );
swprintf( apStr2, L" / %d", ubAttackAPs + CalcAPsToAutofire( DEFAULT_APS, pObject, 3 ) );
wcscat( apStr, apStr2 );
}
else
@@ -7544,7 +7544,7 @@ void GetHelpTextForItem( wchar_t * pzStr, OBJECTTYPE *pObject, SOLDIERTYPE *pSol
}
//Info for weapons
swprintf( (wchar_t *)pStr, L"%s [%d%%]\n%s %d\n%s %d\n%s %d (%d)\n%s %s\n%s %1.1f %s",
swprintf( pStr, L"%s [%d%%]\n%s %d\n%s %d\n%s %d (%d)\n%s %s\n%s %1.1f %s",
ItemNames[ usItem ],
sValue,
gWeaponStatsDesc[ 9 ], //Accuracy String
@@ -7567,7 +7567,7 @@ void GetHelpTextForItem( wchar_t * pzStr, OBJECTTYPE *pObject, SOLDIERTYPE *pSol
case IC_THROWING_KNIFE:
case IC_PUNCH:
{
swprintf( (wchar_t *)pStr, L"%s [%d%%]\n%s %d\n%s %d\n%s %1.1f %s",
swprintf( pStr, L"%s [%d%%]\n%s %d\n%s %d\n%s %1.1f %s",
ItemNames[ usItem ],
sValue,
gWeaponStatsDesc[ 11 ], //Damage String
@@ -7584,7 +7584,7 @@ void GetHelpTextForItem( wchar_t * pzStr, OBJECTTYPE *pObject, SOLDIERTYPE *pSol
case IC_AMMO:
{
// The next is for ammunition which gets the measurement 'rnds'
swprintf( (wchar_t *)pStr, L"%s [%d rnds]\n%s %1.1f %s",
swprintf( pStr, L"%s [%d rnds]\n%s %1.1f %s",
ItemNames[ usItem ], //Item long name
pObject->ubShotsLeft[0], //Shots left
gWeaponStatsDesc[ 12 ], //Weight String
@@ -7593,7 +7593,7 @@ void GetHelpTextForItem( wchar_t * pzStr, OBJECTTYPE *pObject, SOLDIERTYPE *pSol
);
//Lal: do not delete, commented out for next version
//swprintf( (wchar_t *)pStr, L"%s %s %s %d [%d rnds]\n%s %1.1f %s",
//swprintf( pStr, L"%s %s %s %d [%d rnds]\n%s %1.1f %s",
// AmmoCaliber[ Magazine[ Item[usItem].ubClassIndex ].ubCalibre ], //Ammo calibre
// AmmoTypes[Magazine[ Item[usItem].ubClassIndex ].ubAmmoType].ammoName, //Ammo type
// MagNames[Magazine[ Item[usItem].ubClassIndex ].ubMagType], //Magazine type
@@ -7613,7 +7613,7 @@ void GetHelpTextForItem( wchar_t * pzStr, OBJECTTYPE *pObject, SOLDIERTYPE *pSol
UINT16 explDamage = (UINT16)( Explosive[Item[ usItem ].ubClassIndex].ubDamage + ( (double) Explosive[Item[ usItem ].ubClassIndex].ubDamage / 100) * gGameExternalOptions.ubExplosivesDamageMultiplier );
UINT16 explStunDamage = (UINT16)( Explosive[Item[ usItem ].ubClassIndex].ubStunDamage + ( (double) Explosive[Item[ usItem ].ubClassIndex].ubStunDamage / 100) * gGameExternalOptions.ubExplosivesDamageMultiplier );
swprintf( (wchar_t *)pStr, L"%s [%d%%]\n%s %d\n%s %d\n%s %1.1f %s",
swprintf( pStr, L"%s [%d%%]\n%s %d\n%s %d\n%s %1.1f %s",
ItemNames[ usItem ],
sValue,
gWeaponStatsDesc[ 11 ], //Damage String
@@ -7651,7 +7651,7 @@ void GetHelpTextForItem( wchar_t * pzStr, OBJECTTYPE *pObject, SOLDIERTYPE *pSol
break;
}
swprintf( (wchar_t *)pStr, L"%s [%d%%]\n%s %d%% (%d/%d)\n%s %d%%\n%s %1.1f %s",
swprintf( pStr, L"%s [%d%%]\n%s %d%% (%d/%d)\n%s %d%%\n%s %1.1f %s",
ItemNames[ usItem ], //Item long name
sValue, //Item condition
pInvPanelTitleStrings[ 4 ], //Protection string
@@ -7675,7 +7675,7 @@ void GetHelpTextForItem( wchar_t * pzStr, OBJECTTYPE *pObject, SOLDIERTYPE *pSol
default:
{
// The final, and typical case, is that of an item with a percent status
swprintf( (wchar_t *)pStr, L"%s [%d%%]\n%s %1.1f %s",
swprintf( pStr, L"%s [%d%%]\n%s %1.1f %s",
ItemNames[ usItem ], //Item long name
sValue, //Item condition
gWeaponStatsDesc[ 12 ], //Weight String
@@ -7690,8 +7690,8 @@ void GetHelpTextForItem( wchar_t * pzStr, OBJECTTYPE *pObject, SOLDIERTYPE *pSol
// Fingerprint ID (Soldier Name)
if ( ( Item[pObject->usItem].fingerprintid ) && pObject->ubImprintID < NO_PROFILE )
{
INT16 pStr2[20];
swprintf( (wchar_t *)pStr2, L" [%s]", gMercProfiles[ pObject->ubImprintID ].zNickname );
CHAR16 pStr2[20];
swprintf( pStr2, L" [%s]", gMercProfiles[ pObject->ubImprintID ].zNickname );
wcscat( pStr, pStr2 );
}
@@ -7724,11 +7724,11 @@ void GetHelpTextForItem( wchar_t * pzStr, OBJECTTYPE *pObject, SOLDIERTYPE *pSol
}
else
{
swprintf( (wchar_t *)pStr, L"" );
swprintf( pStr, L"" );
}
// Copy over...
swprintf( (wchar_t *)pzStr, L"%s", pStr );
swprintf( pzStr, L"%s", pStr );
}
@@ -7922,7 +7922,7 @@ void UpdateItemHatches()
BOOLEAN InitializeStealItemPickupMenu( SOLDIERTYPE *pSoldier, SOLDIERTYPE *pOpponent, ITEM_POOL *pItemPool, UINT8 ubCount)
{
VOBJECT_DESC VObjectDesc;
UINT8 ubString[48];
CHAR8 ubString[48];
INT16 sCenX, sCenY, sX, sY, sCenterYVal;
INT8 bZLevel =pOpponent->bLevel;
INT16 sGridNo =pOpponent->sGridNo;
@@ -8037,7 +8037,7 @@ BOOLEAN InitializeStealItemPickupMenu( SOLDIERTYPE *pSoldier, SOLDIERTYPE *pOppo
gItemPickupMenu.fAllSelected = FALSE;
//Load images for buttons
FilenameForBPP("INTERFACE\\itembox.sti", (STR)ubString );
FilenameForBPP("INTERFACE\\itembox.sti", ubString );
gItemPickupMenu.iUpButtonImages = LoadButtonImage( ubString, -1,5,-1,10,-1 );
gItemPickupMenu.iDownButtonImages = UseLoadedButtonImage( gItemPickupMenu.iUpButtonImages, -1, 7, -1, 12, -1 );
gItemPickupMenu.iAllButtonImages = UseLoadedButtonImage( gItemPickupMenu.iUpButtonImages, -1, 6, -1,11, -1 );
Tactical/Interface Items.h
+1 -1
View File
@@ -134,7 +134,7 @@ UINT32 GetInterfaceGraphicForItem( INVTYPE *pItem );
UINT16 GetTileGraphicForItem( INVTYPE *pItem );
BOOLEAN LoadTileGraphicForItem( INVTYPE *pItem, UINT32 *puiVo );
void GetHelpTextForItem( wchar_t * pzStr, OBJECTTYPE *pObject, SOLDIERTYPE *pSoldier );
void GetHelpTextForItem( STR16 pzStr, OBJECTTYPE *pObject, SOLDIERTYPE *pSoldier );
BOOLEAN AttemptToApplyCamo( SOLDIERTYPE *pSoldier, UINT16 usItemIndex );
Tactical/Interface Panels.cpp
+19 -19
View File
@@ -1524,14 +1524,14 @@ BOOLEAN InitializeSMPanel( )
BOOLEAN CreateSMPanelButtons( )
{
UINT8 ubString[48];
CHAR8 ubString[48];
giSMStealthImages = -1;
giSMStealthButton = -1;
gfUIStanceDifferent = TRUE;
gfAllDisabled = FALSE;
FilenameForBPP("INTERFACE\\inventory_buttons.sti", (STR)ubString);
FilenameForBPP("INTERFACE\\inventory_buttons.sti", ubString);
// Load button Graphics
iSMPanelImages[ STANCEUP_IMAGES ] = LoadButtonImage(ubString,-1,0,-1,10,-1 );
@@ -1555,11 +1555,11 @@ UINT8 ubString[48];
iBurstButtonImages[ WM_ATTACHED_GL_AUTO ] = UseLoadedButtonImage( iSMPanelImages[ STANCEUP_IMAGES ], -1, 17, -1, -1, -1 );
FilenameForBPP("INTERFACE\\invadd-ons.sti", (STR)ubString);
FilenameForBPP("INTERFACE\\invadd-ons.sti", ubString);
// Load button Graphics
iSMPanelImages[ STANCE_IMAGES ] = LoadButtonImage(ubString,0,0,-1,2,-1 );
FilenameForBPP("INTERFACE\\inventory_buttons_2.sti", (STR)ubString);
FilenameForBPP("INTERFACE\\inventory_buttons_2.sti", ubString);
// Load button Graphics
iSMPanelImages[ DONE_IMAGES ] = LoadButtonImage(ubString,-1,1,-1,3,-1 );
iSMPanelImages[ MAPSCREEN_IMAGES ] = UseLoadedButtonImage( iSMPanelImages[ DONE_IMAGES ] ,-1,0,-1,2,-1 );
@@ -1822,10 +1822,10 @@ BOOLEAN ShutdownSMPanel( )
void RenderSMPanel( BOOLEAN *pfDirty )
{
INT16 sFontX, sFontY;
UINT16 usX, usY;
wchar_t sString[9];
INT16 usX, usY;
CHAR16 sString[9];
UINT32 cnt;
static INT16 pStr[ 200 ], pMoraleStr[ 20 ];
static CHAR16 pStr[ 200 ], pMoraleStr[ 20 ];
if ( gubSelectSMPanelToMerc != NOBODY )
{
@@ -2078,18 +2078,18 @@ void RenderSMPanel( BOOLEAN *pfDirty )
{
if ( gpSMCurrentMerc->uiStatusFlags & SOLDIER_VEHICLE )
{
swprintf( (wchar_t *)pStr, TacticalStr[ VEHICLE_VITAL_STATS_POPUPTEXT ], gpSMCurrentMerc->bLife, gpSMCurrentMerc->bLifeMax, gpSMCurrentMerc->bBreath, gpSMCurrentMerc->bBreathMax );
swprintf( pStr, TacticalStr[ VEHICLE_VITAL_STATS_POPUPTEXT ], gpSMCurrentMerc->bLife, gpSMCurrentMerc->bLifeMax, gpSMCurrentMerc->bBreath, gpSMCurrentMerc->bBreathMax );
SetRegionFastHelpText( &(gSM_SELMERCBarsRegion), pStr );
}
else if ( gpSMCurrentMerc->uiStatusFlags & SOLDIER_ROBOT )
{
swprintf( (wchar_t *)pStr, gzLateLocalizedString[ 16 ], gpSMCurrentMerc->bLife, gpSMCurrentMerc->bLifeMax );
swprintf( pStr, gzLateLocalizedString[ 16 ], gpSMCurrentMerc->bLife, gpSMCurrentMerc->bLifeMax );
SetRegionFastHelpText( &(gTEAM_BarsRegions[ cnt ]), pStr );
}
else
{
GetMoraleString( gpSMCurrentMerc, (STR16)pMoraleStr );
swprintf( (wchar_t *)pStr, TacticalStr[ MERC_VITAL_STATS_POPUPTEXT ], gpSMCurrentMerc->bLife, gpSMCurrentMerc->bLifeMax, gpSMCurrentMerc->bBreath, gpSMCurrentMerc->bBreathMax, pMoraleStr );
GetMoraleString( gpSMCurrentMerc, pMoraleStr );
swprintf( pStr, TacticalStr[ MERC_VITAL_STATS_POPUPTEXT ], gpSMCurrentMerc->bLife, gpSMCurrentMerc->bLifeMax, gpSMCurrentMerc->bBreath, gpSMCurrentMerc->bBreathMax, pMoraleStr );
SetRegionFastHelpText( &(gSM_SELMERCBarsRegion), pStr );
}
}
@@ -3795,7 +3795,7 @@ void RenderTEAMPanel( BOOLEAN fDirty )
INT16 sFontX, sFontY;
UINT32 cnt, posIndex;
SOLDIERTYPE *pSoldier;
static wchar_t pStr[ 200 ], pMoraleStr[ 20 ];
static CHAR16 pStr[ 200 ], pMoraleStr[ 20 ];
// WANNE 2 <new>
if ( fDirty == DIRTYLEVEL2 )
@@ -3845,7 +3845,7 @@ void RenderTEAMPanel( BOOLEAN fDirty )
pVehicle = GetSoldierStructureForVehicle( pSoldier->iVehicleId );
//OK, for each item, set dirty text if applicable!
swprintf( (wchar_t *)pStr, TacticalStr[ DRIVER_POPUPTEXT ], pVehicle->bLife, pVehicle->bLifeMax, pVehicle->bBreath, pVehicle->bBreathMax );
swprintf( pStr, TacticalStr[ DRIVER_POPUPTEXT ], pVehicle->bLife, pVehicle->bLifeMax, pVehicle->bBreath, pVehicle->bBreathMax );
SetRegionFastHelpText( &(gTEAM_FirstHandInv[ cnt ]), pStr );
}
// Add text for first hand popup
@@ -3958,18 +3958,18 @@ void RenderTEAMPanel( BOOLEAN fDirty )
{
if ( pSoldier->uiStatusFlags & SOLDIER_VEHICLE )
{
swprintf( (wchar_t *)pStr, TacticalStr[ VEHICLE_VITAL_STATS_POPUPTEXT ], pSoldier->bLife, pSoldier->bLifeMax, pSoldier->bBreath, pSoldier->bBreathMax );
swprintf( pStr, TacticalStr[ VEHICLE_VITAL_STATS_POPUPTEXT ], pSoldier->bLife, pSoldier->bLifeMax, pSoldier->bBreath, pSoldier->bBreathMax );
SetRegionFastHelpText( &(gTEAM_BarsRegions[ cnt ]), pStr );
}
else if ( pSoldier->uiStatusFlags & SOLDIER_ROBOT )
{
swprintf( (wchar_t *)pStr, gzLateLocalizedString[ 16 ], pSoldier->bLife, pSoldier->bLifeMax );
swprintf( pStr, gzLateLocalizedString[ 16 ], pSoldier->bLife, pSoldier->bLifeMax );
SetRegionFastHelpText( &(gTEAM_BarsRegions[ cnt ]), pStr );
}
else
{
GetMoraleString( pSoldier, (STR16)pMoraleStr );
swprintf( (wchar_t *)pStr, TacticalStr[ MERC_VITAL_STATS_POPUPTEXT ], pSoldier->bLife, pSoldier->bLifeMax, pSoldier->bBreath, pSoldier->bBreathMax, pMoraleStr );
GetMoraleString( pSoldier, pMoraleStr );
swprintf( pStr, TacticalStr[ MERC_VITAL_STATS_POPUPTEXT ], pSoldier->bLife, pSoldier->bLifeMax, pSoldier->bBreath, pSoldier->bBreathMax, pMoraleStr );
SetRegionFastHelpText( &(gTEAM_BarsRegions[ cnt ]), pStr );
}
}
@@ -4070,9 +4070,9 @@ void RenderTEAMPanel( BOOLEAN fDirty )
BOOLEAN CreateTEAMPanelButtons( )
{
UINT8 ubString[48];
CHAR8 ubString[48];
FilenameForBPP("INTERFACE\\bottom_bar_buttons.sti", (STR)ubString);
FilenameForBPP("INTERFACE\\bottom_bar_buttons.sti", ubString);
// Load button Graphics
iTEAMPanelImages[ ENDTURN_IMAGES ] = LoadButtonImage(ubString,-1,0,-1, 3,-1 );
Tactical/Interface.cpp
+43 -43
View File
@@ -111,7 +111,7 @@ typedef struct
TOP_MESSAGE gTopMessage;
BOOLEAN gfTopMessageDirty = FALSE;
void CreateTopMessage( UINT32 uiSurface, UINT8 ubType, wchar_t * psString );
void CreateTopMessage( UINT32 uiSurface, UINT8 ubType, STR16 psString );
extern UINT16 GetAnimStateForInteraction( SOLDIERTYPE *pSoldier, BOOLEAN fDoor, UINT16 usAnimState );
@@ -681,7 +681,7 @@ void PopupMovementMenu( UI_EVENT *pUIEvent )
SOLDIERTYPE *pSoldier = NULL;
INT32 iMenuAnchorX, iMenuAnchorY;
UINT32 uiActionImages;
wchar_t zActionString[ 50 ];
CHAR16 zActionString[ 50 ];
BOOLEAN fDisableAction = FALSE;
// Erase other menus....
@@ -845,7 +845,7 @@ void PopupMovementMenu( UI_EVENT *pUIEvent )
{
// Until we get mounted weapons...
uiActionImages = CANCEL_IMAGES;
swprintf( (wchar_t *)zActionString, TacticalStr[ NOT_APPLICABLE_POPUPTEXT ] );
swprintf( zActionString, TacticalStr[ NOT_APPLICABLE_POPUPTEXT ] );
fDisableAction = TRUE;
}
else
@@ -853,12 +853,12 @@ void PopupMovementMenu( UI_EVENT *pUIEvent )
if ( Item[pSoldier->inv[ HANDPOS ].usItem].toolkit )
{
uiActionImages = TOOLKITACTIONC_IMAGES;
swprintf( (wchar_t *)zActionString, TacticalStr[ NOT_APPLICABLE_POPUPTEXT ] );
swprintf( zActionString, TacticalStr[ NOT_APPLICABLE_POPUPTEXT ] );
}
else if ( Item[pSoldier->inv[ HANDPOS ].usItem].wirecutters )
{
uiActionImages = WIRECUTACTIONC_IMAGES;
swprintf( (wchar_t *)zActionString, TacticalStr[ NOT_APPLICABLE_POPUPTEXT ] );
swprintf( zActionString, TacticalStr[ NOT_APPLICABLE_POPUPTEXT ] );
}
else
{
@@ -868,38 +868,38 @@ void PopupMovementMenu( UI_EVENT *pUIEvent )
case IC_PUNCH:
uiActionImages = PUNCHACTIONC_IMAGES;
swprintf( (wchar_t *)zActionString, TacticalStr[ USE_HANDTOHAND_POPUPTEXT ] );
swprintf( zActionString, TacticalStr[ USE_HANDTOHAND_POPUPTEXT ] );
break;
case IC_GUN:
uiActionImages = TARGETACTIONC_IMAGES;
swprintf( (wchar_t *)zActionString, TacticalStr[ USE_FIREARM_POPUPTEXT ] );
swprintf( zActionString, TacticalStr[ USE_FIREARM_POPUPTEXT ] );
break;
case IC_BLADE:
uiActionImages = KNIFEACTIONC_IMAGES;
swprintf( (wchar_t *)zActionString, TacticalStr[ USE_BLADE_POPUPTEXT ] );
swprintf( zActionString, TacticalStr[ USE_BLADE_POPUPTEXT ] );
break;
case IC_GRENADE:
case IC_BOMB:
uiActionImages = BOMBACTIONC_IMAGES;
swprintf( (wchar_t *)zActionString, TacticalStr[ USE_EXPLOSIVE_POPUPTEXT ] );
swprintf( zActionString, TacticalStr[ USE_EXPLOSIVE_POPUPTEXT ] );
break;
case IC_MEDKIT:
uiActionImages = AIDACTIONC_IMAGES;
swprintf( (wchar_t *)zActionString, TacticalStr[ USE_MEDKIT_POPUPTEXT ] );
swprintf( zActionString, TacticalStr[ USE_MEDKIT_POPUPTEXT ] );
break;
default:
uiActionImages = CANCEL_IMAGES;
swprintf( (wchar_t *)zActionString, TacticalStr[ NOT_APPLICABLE_POPUPTEXT ] );
swprintf( zActionString, TacticalStr[ NOT_APPLICABLE_POPUPTEXT ] );
fDisableAction = TRUE;
break;
}
@@ -1489,8 +1489,8 @@ void DrawSelectedUIAboveGuy( UINT16 usSoldierID )
INT16 sX, sY;
INT32 iBack;
TILE_ELEMENT TileElem;
wchar_t *pStr;
wchar_t NameStr[ 50 ];
CHAR16 *pStr;
CHAR16 NameStr[ 50 ];
UINT16 usGraphicToUse = THIRDPOINTERS1;
BOOLEAN fRaiseName = FALSE;
BOOLEAN fDoName = TRUE;
@@ -1836,11 +1836,11 @@ void RenderOverlayMessage( VIDEO_OVERLAY *pBlitter )
}
void BeginOverlayMessage( UINT32 uiFont, wchar_t *pFontString, ... )
void BeginOverlayMessage( UINT32 uiFont, STR16 pFontString, ... )
{
va_list argptr;
VIDEO_OVERLAY_DESC VideoOverlayDesc;
wchar_t SlideString[512];
CHAR16 SlideString[512];
va_start(argptr, pFontString); // Set up variable argument pointer
@@ -2215,7 +2215,7 @@ BOOLEAN InitDoorOpenMenu( SOLDIERTYPE *pSoldier, STRUCTURE *pStructure, UINT8 ub
void PopupDoorOpenMenu( BOOLEAN fClosingDoor )
{
INT32 iMenuAnchorX, iMenuAnchorY;
wchar_t zDisp[ 100 ];
CHAR16 zDisp[ 100 ];
iMenuAnchorX = gOpenDoorMenu.sX;
iMenuAnchorY = gOpenDoorMenu.sY;
@@ -2244,11 +2244,11 @@ void PopupDoorOpenMenu( BOOLEAN fClosingDoor )
if (!(gTacticalStatus.uiFlags & TURNBASED) || !(gTacticalStatus.uiFlags & INCOMBAT ) )
{
swprintf( (wchar_t *)zDisp, pTacticalPopupButtonStrings[ USE_KEYRING_ICON ] );
swprintf( zDisp, pTacticalPopupButtonStrings[ USE_KEYRING_ICON ] );
}
else
{
swprintf( (wchar_t *)zDisp, L"%s ( %d )", pTacticalPopupButtonStrings[ USE_KEYRING_ICON ], AP_UNLOCK_DOOR );
swprintf( zDisp, L"%s ( %d )", pTacticalPopupButtonStrings[ USE_KEYRING_ICON ], AP_UNLOCK_DOOR );
}
SetButtonFastHelpText( iActionIcons[ USE_KEYRING_ICON ], zDisp );
@@ -2275,11 +2275,11 @@ void PopupDoorOpenMenu( BOOLEAN fClosingDoor )
if (!(gTacticalStatus.uiFlags & TURNBASED) || !(gTacticalStatus.uiFlags & INCOMBAT ) )
{
swprintf( (wchar_t *)zDisp, pTacticalPopupButtonStrings[ USE_CROWBAR_ICON ] );
swprintf( zDisp, pTacticalPopupButtonStrings[ USE_CROWBAR_ICON ] );
}
else
{
swprintf( (wchar_t *)zDisp, L"%s ( %d )", pTacticalPopupButtonStrings[ USE_CROWBAR_ICON ], AP_USE_CROWBAR );
swprintf( zDisp, L"%s ( %d )", pTacticalPopupButtonStrings[ USE_CROWBAR_ICON ], AP_USE_CROWBAR );
}
SetButtonFastHelpText( iActionIcons[ USE_CROWBAR_ICON ], zDisp );
@@ -2305,11 +2305,11 @@ void PopupDoorOpenMenu( BOOLEAN fClosingDoor )
if (!(gTacticalStatus.uiFlags & TURNBASED) || !(gTacticalStatus.uiFlags & INCOMBAT ) )
{
swprintf( (wchar_t *)zDisp, pTacticalPopupButtonStrings[ LOCKPICK_DOOR_ICON ] );
swprintf( zDisp, pTacticalPopupButtonStrings[ LOCKPICK_DOOR_ICON ] );
}
else
{
swprintf( (wchar_t *)zDisp, L"%s ( %d )", pTacticalPopupButtonStrings[ LOCKPICK_DOOR_ICON ], AP_PICKLOCK );
swprintf( zDisp, L"%s ( %d )", pTacticalPopupButtonStrings[ LOCKPICK_DOOR_ICON ], AP_PICKLOCK );
}
SetButtonFastHelpText( iActionIcons[ LOCKPICK_DOOR_ICON ], zDisp );
@@ -2337,11 +2337,11 @@ void PopupDoorOpenMenu( BOOLEAN fClosingDoor )
if (!(gTacticalStatus.uiFlags & TURNBASED) || !(gTacticalStatus.uiFlags & INCOMBAT ) )
{
swprintf( (wchar_t *)zDisp, pTacticalPopupButtonStrings[ EXPLOSIVE_DOOR_ICON ] );
swprintf( zDisp, pTacticalPopupButtonStrings[ EXPLOSIVE_DOOR_ICON ] );
}
else
{
swprintf( (wchar_t *)zDisp, L"%s ( %d )", pTacticalPopupButtonStrings[ EXPLOSIVE_DOOR_ICON ], AP_EXPLODE_DOOR );
swprintf( zDisp, L"%s ( %d )", pTacticalPopupButtonStrings[ EXPLOSIVE_DOOR_ICON ], AP_EXPLODE_DOOR );
}
SetButtonFastHelpText( iActionIcons[ EXPLOSIVE_DOOR_ICON ], zDisp );
@@ -2371,22 +2371,22 @@ void PopupDoorOpenMenu( BOOLEAN fClosingDoor )
{
if (!(gTacticalStatus.uiFlags & TURNBASED) || !(gTacticalStatus.uiFlags & INCOMBAT ) )
{
swprintf( (wchar_t *)zDisp, pTacticalPopupButtonStrings[ CANCEL_ICON + 1 ] );
swprintf( zDisp, pTacticalPopupButtonStrings[ CANCEL_ICON + 1 ] );
}
else
{
swprintf( (wchar_t *)zDisp, L"%s ( %d )", pTacticalPopupButtonStrings[ CANCEL_ICON + 1 ], AP_OPEN_DOOR );
swprintf( zDisp, L"%s ( %d )", pTacticalPopupButtonStrings[ CANCEL_ICON + 1 ], AP_OPEN_DOOR );
}
}
else
{
if (!(gTacticalStatus.uiFlags & TURNBASED) || !(gTacticalStatus.uiFlags & INCOMBAT ) )
{
swprintf( (wchar_t *)zDisp, pTacticalPopupButtonStrings[ OPEN_DOOR_ICON ] );
swprintf( zDisp, pTacticalPopupButtonStrings[ OPEN_DOOR_ICON ] );
}
else
{
swprintf( (wchar_t *)zDisp, L"%s ( %d )", pTacticalPopupButtonStrings[ OPEN_DOOR_ICON ], AP_OPEN_DOOR );
swprintf( zDisp, L"%s ( %d )", pTacticalPopupButtonStrings[ OPEN_DOOR_ICON ], AP_OPEN_DOOR );
}
}
SetButtonFastHelpText( iActionIcons[ OPEN_DOOR_ICON ], zDisp );
@@ -2409,11 +2409,11 @@ void PopupDoorOpenMenu( BOOLEAN fClosingDoor )
if (!(gTacticalStatus.uiFlags & TURNBASED) || !(gTacticalStatus.uiFlags & INCOMBAT ) )
{
swprintf( (wchar_t *)zDisp, pTacticalPopupButtonStrings[ EXAMINE_DOOR_ICON ] );
swprintf( zDisp, pTacticalPopupButtonStrings[ EXAMINE_DOOR_ICON ] );
}
else
{
swprintf( (wchar_t *)zDisp, L"%s ( %d )", pTacticalPopupButtonStrings[ EXAMINE_DOOR_ICON ], AP_EXAMINE_DOOR );
swprintf( zDisp, L"%s ( %d )", pTacticalPopupButtonStrings[ EXAMINE_DOOR_ICON ], AP_EXAMINE_DOOR );
}
SetButtonFastHelpText( iActionIcons[ EXAMINE_DOOR_ICON ], zDisp );
@@ -2433,11 +2433,11 @@ void PopupDoorOpenMenu( BOOLEAN fClosingDoor )
if (!(gTacticalStatus.uiFlags & TURNBASED) || !(gTacticalStatus.uiFlags & INCOMBAT ) )
{
swprintf( (wchar_t *)zDisp, pTacticalPopupButtonStrings[ BOOT_DOOR_ICON ] );
swprintf( zDisp, pTacticalPopupButtonStrings[ BOOT_DOOR_ICON ] );
}
else
{
swprintf( (wchar_t *)zDisp, L"%s ( %d )", pTacticalPopupButtonStrings[ BOOT_DOOR_ICON ], AP_BOOT_DOOR );
swprintf( zDisp, L"%s ( %d )", pTacticalPopupButtonStrings[ BOOT_DOOR_ICON ], AP_BOOT_DOOR );
}
SetButtonFastHelpText( iActionIcons[ BOOT_DOOR_ICON ], zDisp );
@@ -2458,11 +2458,11 @@ void PopupDoorOpenMenu( BOOLEAN fClosingDoor )
if (!(gTacticalStatus.uiFlags & TURNBASED) || !(gTacticalStatus.uiFlags & INCOMBAT ) )
{
swprintf( (wchar_t *)zDisp, pTacticalPopupButtonStrings[ UNTRAP_DOOR_ICON ] );
swprintf( zDisp, pTacticalPopupButtonStrings[ UNTRAP_DOOR_ICON ] );
}
else
{
swprintf( (wchar_t *)zDisp, L"%s ( %d )", pTacticalPopupButtonStrings[ UNTRAP_DOOR_ICON ], AP_UNTRAP_DOOR );
swprintf( zDisp, L"%s ( %d )", pTacticalPopupButtonStrings[ UNTRAP_DOOR_ICON ], AP_UNTRAP_DOOR );
}
SetButtonFastHelpText( iActionIcons[ UNTRAP_DOOR_ICON ], zDisp );
@@ -2752,11 +2752,11 @@ void RenderUIMessage( VIDEO_OVERLAY *pBlitter )
}
void InternalBeginUIMessage( BOOLEAN fUseSkullIcon, wchar_t *pFontString, ... )
void InternalBeginUIMessage( BOOLEAN fUseSkullIcon, STR16 pFontString, ... )
{
va_list argptr;
VIDEO_OVERLAY_DESC VideoOverlayDesc;
wchar_t MsgString[512];
CHAR16 MsgString[512];
va_start(argptr, pFontString); // Set up variable argument pointer
@@ -2812,10 +2812,10 @@ void InternalBeginUIMessage( BOOLEAN fUseSkullIcon, wchar_t *pFontString, ... )
gfUseSkullIconMessage = fUseSkullIcon;
}
void BeginUIMessage( wchar_t *pFontString, ... )
void BeginUIMessage( STR16 pFontString, ... )
{
va_list argptr;
wchar_t MsgString[512];
CHAR16 MsgString[512];
va_start(argptr, pFontString); // Set up variable argument pointer
vswprintf(MsgString, pFontString, argptr); // process gprintf string (get output str)
@@ -2825,11 +2825,11 @@ void BeginUIMessage( wchar_t *pFontString, ... )
}
void BeginMapUIMessage( UINT8 ubPosition, wchar_t *pFontString, ... )
void BeginMapUIMessage( UINT8 ubPosition, STR16 pFontString, ... )
{
va_list argptr;
VIDEO_OVERLAY_DESC VideoOverlayDesc;
wchar_t MsgString[512];
CHAR16 MsgString[512];
memset( &VideoOverlayDesc, 0, sizeof( VideoOverlayDesc ) );
@@ -2919,7 +2919,7 @@ void EndUIMessage( )
#define PLAYER_TEAM_TIMER_TICKS_PER_ENEMY ( 2000 / PLAYER_TEAM_TIMER_SEC_PER_TICKS )
BOOLEAN AddTopMessage( UINT8 ubType, wchar_t * pzString )
BOOLEAN AddTopMessage( UINT8 ubType, STR16 pzString )
{
UINT32 cnt;
BOOLEAN fFound = FALSE;
@@ -2956,7 +2956,7 @@ BOOLEAN AddTopMessage( UINT8 ubType, wchar_t * pzString )
return( FALSE );
}
void CreateTopMessage( UINT32 uiSurface, UINT8 ubType, wchar_t * psString )
void CreateTopMessage( UINT32 uiSurface, UINT8 ubType, STR16 psString )
{
UINT32 uiBAR, uiPLAYERBAR, uiINTBAR;
VOBJECT_DESC VObjectDesc;
@@ -3598,7 +3598,7 @@ void DoorMenuBackregionCallback( MOUSE_REGION * pRegion, INT32 iReason )
}
}
wchar_t *GetSoldierHealthString( SOLDIERTYPE *pSoldier )
STR16 GetSoldierHealthString( SOLDIERTYPE *pSoldier )
{
INT32 cnt, cntStart;
if( pSoldier->bLife == pSoldier->bLifeMax )
Tactical/Interface.h
+6 -6
View File
@@ -146,7 +146,7 @@ void CancelOpenDoorMenu( );
void HandleInterfaceBackgrounds( );
void BeginOverlayMessage( UINT32 uiFont, wchar_t *pFontString, ... );
void BeginOverlayMessage( UINT32 uiFont, STR16 pFontString, ... );
void EndOverlayMessage( );
@@ -177,12 +177,12 @@ void DirtyMercPanelInterface( SOLDIERTYPE *pSoldier, UINT8 ubDirtyLevel );
void EndUIMessage( );
void BeginUIMessage( wchar_t *pFontString, ... );
void InternalBeginUIMessage( BOOLEAN fUseSkullIcon, wchar_t *pFontString, ... );
void BeginUIMessage( STR16 pFontString, ... );
void InternalBeginUIMessage( BOOLEAN fUseSkullIcon, STR16 pFontString, ... );
// map screen version, for centering over the map area
void BeginMapUIMessage( UINT8 fPosition, wchar_t *pFontString, ... );
void BeginMapUIMessage( UINT8 fPosition, STR16 pFontString, ... );
extern UINT16 gusUIOldSelectedSoldier;
@@ -204,7 +204,7 @@ enum MESSAGE_TYPES
void HandleTopMessages( );
BOOLEAN AddTopMessage( UINT8 ubType, wchar_t * pzString );
BOOLEAN AddTopMessage( UINT8 ubType, STR16 pzString );
BOOLEAN InTopMessageBarAnimation( );
void EndTopMessage( );
@@ -213,7 +213,7 @@ void PauseRT( BOOLEAN fPause );
void InitEnemyUIBar( UINT8 ubNumEnemies, UINT8 ubDoneEnemies );
wchar_t *GetSoldierHealthString( SOLDIERTYPE *pSoldier );
STR16 GetSoldierHealthString( SOLDIERTYPE *pSoldier );
void GetLaunchItemParamsFromUI( );
Tactical/Item Types.h
+5 -5
View File
@@ -277,7 +277,7 @@ typedef struct
UINT16 fFlags;
UINT32 uiIndex; // added
INT8 szItemName[80]; //+1 for the null terminator //added
CHAR8 szItemName[80]; //+1 for the null terminator //added
BOOLEAN damageable;
BOOLEAN repairable;
@@ -297,10 +297,10 @@ typedef struct
BOOLEAN electronic;
BOOLEAN inseparable;
INT8 szLongItemName[80];
INT8 szItemDesc[400];
INT8 szBRName[80];
INT8 szBRDesc[400];
CHAR8 szLongItemName[80];
CHAR8 szItemDesc[400];
CHAR8 szBRName[80];
CHAR8 szBRDesc[400];
//TODO: quest items, boosters, money
Tactical/Items.cpp
+3 -3
View File
@@ -1866,7 +1866,7 @@ BOOLEAN ValidItemAttachment( OBJECTTYPE * pObj, UINT16 usAttachment, BOOLEAN fAt
if ( fAttemptingAttachment && ValidAttachmentClass( usAttachment, pObj->usItem ) )
{
// well, maybe the player thought he could
wchar_t zTemp[ 100 ];
CHAR16 zTemp[ 100 ];
swprintf( zTemp, Message[ STR_CANT_ATTACH ], ItemNames[ usAttachment ], ItemNames[ pObj->usItem ] );
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_UI_FEEDBACK, zTemp );
@@ -3793,7 +3793,7 @@ BOOLEAN PlaceObject( SOLDIERTYPE * pSoldier, INT8 bPos, OBJECTTYPE * pObj )
{
if ( !CompatibleFaceItem( pObj->usItem, pSoldier->inv[ HEAD2POS ].usItem ) )
{
wchar_t zTemp[ 150 ];
CHAR16 zTemp[ 150 ];
swprintf( zTemp, Message[ STR_CANT_USE_TWO_ITEMS ], ItemNames[ pObj->usItem ], ItemNames[ pSoldier->inv[ HEAD2POS ].usItem ] );
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_UI_FEEDBACK, zTemp );
@@ -3804,7 +3804,7 @@ BOOLEAN PlaceObject( SOLDIERTYPE * pSoldier, INT8 bPos, OBJECTTYPE * pObj )
{
if ( !CompatibleFaceItem( pObj->usItem, pSoldier->inv[ HEAD1POS ].usItem ) )
{
wchar_t zTemp[ 150 ];
CHAR16 zTemp[ 150 ];
swprintf( zTemp, Message[ STR_CANT_USE_TWO_ITEMS ], ItemNames[ pObj->usItem ], ItemNames[ pSoldier->inv[ HEAD1POS ].usItem ] );
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_UI_FEEDBACK, zTemp );
Tactical/LOS.cpp
+1 -1
View File
@@ -1750,7 +1750,7 @@ BOOLEAN SoldierToSoldierLineOfSightTimingTest( SOLDIERTYPE * pStartSoldier, SOLD
#ifdef _DEBUG
fprintf(OutFile, "DEBUG: " );
#endif
fprintf(OutFile, (const char *)String( "Time for %d calls is %d milliseconds\n", uiLoopLimit, uiEndTime - uiStartTime));
fprintf(OutFile, String( "Time for %d calls is %d milliseconds\n", uiLoopLimit, uiEndTime - uiStartTime));
fclose(OutFile);
}
return( TRUE );
Tactical/Militia Control.cpp
+1 -1
View File
@@ -233,7 +233,7 @@ void HandleMilitiaPromotions( void )
{
// ATE: Problems here with bringing up message box...
// wchar_t str[ 512 ];
// CHAR16 str[ 512 ];
// BuildMilitiaPromotionsString( str );
// DoScreenIndependantMessageBox( str, MSG_BOX_FLAG_OK, NULL );
}
Tactical/Overhead Types.h
+1 -1
View File
@@ -321,7 +321,7 @@ enum BoxingStates
// add new groups. Try to abbreviate the team name as much as possible. The text is in
// EditorMercs.c
#ifdef JA2EDITOR
extern UINT16 gszCivGroupNames[ NUM_CIV_GROUPS ][ 20 ];
extern CHAR16 gszCivGroupNames[ NUM_CIV_GROUPS ][ 20 ];
#endif
//
//-----------------------------------------------
Tactical/Overhead.cpp
+1 -1
View File
@@ -161,7 +161,7 @@ extern BOOLEAN gfSurrendered;
#define START_DEMO_SCENE 3
#define NUM_RANDOM_SCENES 4
INT8 gDebugStr[128];
CHAR8 gDebugStr[128];
#ifdef NETWORKED
extern BYTE gfAmIHost;
Tactical/Overhead.h
+1 -1
View File
@@ -121,7 +121,7 @@ typedef struct
UINT16 usTactialTurnLimitCounter;
BOOLEAN fInTopMessage;
UINT8 ubTopMessageType;
wchar_t zTopMessageString[20];
CHAR16 zTopMessageString[20];
UINT16 usTactialTurnLimitMax;
UINT32 uiTactialTurnLimitClock;
BOOLEAN fTactialTurnLimitStartedBeep;
Tactical/Rotting Corpses.cpp
+4 -4
View File
@@ -449,7 +449,7 @@ INT32 AddRottingCorpse( ROTTING_CORPSE_DEFINITION *pCorpseDef )
ANITILE_PARAMS AniParams;
UINT8 ubLevelID;
STRUCTURE_FILE_REF * pStructureFileRef = NULL;
INT8 zFilename[150];
CHAR8 zFilename[150];
DB_STRUCTURE_REF *pDBStructureRef;
UINT8 ubLoop;
INT16 sTileGridNo;
@@ -607,7 +607,7 @@ INT32 AddRottingCorpse( ROTTING_CORPSE_DEFINITION *pCorpseDef )
// Get root filename... this removes path and extension
// USed to find struct data fo rthis corpse...
GetRootName( zFilename, (INT8 *) AniParams.zCachedFile );
GetRootName( zFilename, AniParams.zCachedFile );
// Add structure data.....
CheckForAndAddTileCacheStructInfo( pCorpse->pAniTile->pLevelNode, pCorpse->def.sGridNo, ( UINT16 ) ( pCorpse->iCachedTileID ), GetCorpseStructIndex( pCorpseDef, TRUE ) );
@@ -1574,7 +1574,7 @@ INT16 FindNearestAvailableGridNoForCorpse( ROTTING_CORPSE_DEFINITION *pDef, INT8
UINT8 ubSaveNPCAPBudget;
UINT8 ubSaveNPCDistLimit;
STRUCTURE_FILE_REF * pStructureFileRef = NULL;
INT8 zFilename[150];
CHAR8 zFilename[150];
UINT8 ubBestDirection=0;
BOOLEAN fSetDirection = FALSE;
@@ -1582,7 +1582,7 @@ INT16 FindNearestAvailableGridNoForCorpse( ROTTING_CORPSE_DEFINITION *pDef, INT8
// Get root filename... this removes path and extension
// USed to find struct data fo rthis corpse...
GetRootName( zFilename, (INT8 *) zCorpseFilenames[pDef->ubType ] );
GetRootName( zFilename, zCorpseFilenames[pDef->ubType ] );
pStructureFileRef = GetCachedTileStructureRefFromFilename( zFilename );
Tactical/ShopKeeper Interface.cpp
+9 -9
View File
@@ -364,7 +364,7 @@ UINT32 guiSmallSoldiersFace[ MAX_CHARACTER_COUNT ];
UINT8 gubNumberMercsInArray;
//The subutitled text for what the merc is saying
wchar_t gsShopKeeperTalkingText[ SKI_SUBTITLE_TEXT_SIZE ];
CHAR16 gsShopKeeperTalkingText[ SKI_SUBTITLE_TEXT_SIZE ];
UINT16 gusPositionOfSubTitlesX=0;
@@ -652,9 +652,9 @@ void DisplayTheSkiDropItemToGroundString();
UINT32 EvaluateInvSlot( INVENTORY_IN_SLOT *pInvSlot );
void BuildItemHelpTextString( wchar_t sString[], INVENTORY_IN_SLOT *pInv, UINT8 ubScreenArea );
void BuildRepairTimeString( wchar_t sString[], UINT32 uiTimeInMinutesToFixItem );
void BuildDoneWhenTimeString( wchar_t sString[], UINT8 ubArmsDealer, UINT16 usItemIndex, UINT8 ubElement );
void BuildItemHelpTextString( CHAR16 sString[], INVENTORY_IN_SLOT *pInv, UINT8 ubScreenArea );
void BuildRepairTimeString( CHAR16 sString[], UINT32 uiTimeInMinutesToFixItem );
void BuildDoneWhenTimeString( CHAR16 sString[], UINT8 ubArmsDealer, UINT16 usItemIndex, UINT8 ubElement );
void DisableAllDealersInventorySlots( void );
void EnableAllDealersInventorySlots( void );
@@ -776,7 +776,7 @@ UINT32 ShopKeeperScreenHandle()
{
// tell player there's not enough room in the player's offer area
// ARM: message is delayed because we need the mouse restriction to be in place BEFORE it comes up so it gets lifted/restored
DoSkiMessageBox( MSG_BOX_BASIC_STYLE, (STR16)SKI_Text[ SKI_TEXT_NO_MORE_ROOM_IN_PLAYER_OFFER_AREA ], SHOPKEEPER_SCREEN, MSG_BOX_FLAG_OK, NULL );
DoSkiMessageBox( MSG_BOX_BASIC_STYLE, SKI_Text[ SKI_TEXT_NO_MORE_ROOM_IN_PLAYER_OFFER_AREA ], SHOPKEEPER_SCREEN, MSG_BOX_FLAG_OK, NULL );
gfDisplayNoRoomMsg = FALSE;
}
@@ -3788,7 +3788,7 @@ void PerformTransaction( UINT32 uiMoneyFromPlayersAccount )
if( CountNumberOfItemsInTheArmsDealersOfferArea( ) > uiAvailablePlayerOfferSlots )
{
// tell player there's not enough room in the player's offer area
DoSkiMessageBox( MSG_BOX_BASIC_STYLE, (STR16)SKI_Text[ SKI_TEXT_NO_MORE_ROOM_IN_PLAYER_OFFER_AREA ], SHOPKEEPER_SCREEN, MSG_BOX_FLAG_OK, NULL );
DoSkiMessageBox( MSG_BOX_BASIC_STYLE, SKI_Text[ SKI_TEXT_NO_MORE_ROOM_IN_PLAYER_OFFER_AREA ], SHOPKEEPER_SCREEN, MSG_BOX_FLAG_OK, NULL );
return;
}
@@ -7659,7 +7659,7 @@ UINT32 EvaluateInvSlot( INVENTORY_IN_SLOT *pInvSlot )
#define REPAIR_MINUTES_INTERVAL 15
void BuildRepairTimeString( wchar_t sString[], UINT32 uiTimeInMinutesToFixItem )
void BuildRepairTimeString( CHAR16 sString[], UINT32 uiTimeInMinutesToFixItem )
{
UINT16 usNumberOfHoursToFixItem = 0;
@@ -7705,7 +7705,7 @@ void BuildRepairTimeString( wchar_t sString[], UINT32 uiTimeInMinutesToFixItem )
void BuildDoneWhenTimeString( wchar_t sString[], UINT8 ubArmsDealer, UINT16 usItemIndex, UINT8 ubElement )
void BuildDoneWhenTimeString( CHAR16 sString[], UINT8 ubArmsDealer, UINT16 usItemIndex, UINT8 ubElement )
{
UINT32 uiDoneTime;
UINT32 uiDay, uiHour, uiMin;
@@ -7752,7 +7752,7 @@ void BuildDoneWhenTimeString( wchar_t sString[], UINT8 ubArmsDealer, UINT16 usIt
}
void BuildItemHelpTextString( wchar_t sString[], INVENTORY_IN_SLOT *pInv, UINT8 ubScreenArea )
void BuildItemHelpTextString( CHAR16 sString[], INVENTORY_IN_SLOT *pInv, UINT8 ubScreenArea )
{
CHAR16 zHelpText[ 512 ];
CHAR16 zRepairTime[ 64 ];
Tactical/Soldier Ani.cpp
+6 -6
View File
@@ -787,7 +787,7 @@ BOOLEAN AdjustToNextAnimationFrame( SOLDIERTYPE *pSoldier )
// ATE; Reduce it due to animation being stopped...
DebugMsg( TOPIC_JA2, DBG_LEVEL_3, String("@@@@@@@ Freeing up attacker - Burst animation ended") );
ReduceAttackBusyCount( (UINT8) pSoldier->ubID, FALSE );
ReduceAttackBusyCount( pSoldier->ubID, FALSE );
if ( CheckForImproperFireGunEnd( pSoldier ) )
@@ -1630,21 +1630,21 @@ BOOLEAN AdjustToNextAnimationFrame( SOLDIERTYPE *pSoldier )
if ( Random( 100 ) < 10 )
{
// Play sound
PlayJA2SampleFromFile( (STR8) pAnimDef->zSoundFile, RATE_11025, SoundVolume( MIDVOLUME, pSoldier->sGridNo ), 1, SoundDir( pSoldier->sGridNo ) );
PlayJA2SampleFromFile( pAnimDef->zSoundFile, RATE_11025, SoundVolume( MIDVOLUME, pSoldier->sGridNo ), 1, SoundDir( pSoldier->sGridNo ) );
}
}
else
{
// Play sound
PlayJA2SampleFromFile( (STR8)pAnimDef->zSoundFile, RATE_11025, SoundVolume( MIDVOLUME, pSoldier->sGridNo ), 1, SoundDir( pSoldier->sGridNo ) );
PlayJA2SampleFromFile( pAnimDef->zSoundFile, RATE_11025, SoundVolume( MIDVOLUME, pSoldier->sGridNo ), 1, SoundDir( pSoldier->sGridNo ) );
}
}
}
else
{
// Play sound
PlayJA2SampleFromFile( (STR8)pAnimDef->zSoundFile, RATE_11025, SoundVolume( MIDVOLUME, pSoldier->sGridNo ), 1, SoundDir( pSoldier->sGridNo ) );
PlayJA2SampleFromFile( pAnimDef->zSoundFile, RATE_11025, SoundVolume( MIDVOLUME, pSoldier->sGridNo ), 1, SoundDir( pSoldier->sGridNo ) );
}
}
else
@@ -2480,13 +2480,13 @@ BOOLEAN AdjustToNextAnimationFrame( SOLDIERTYPE *pSoldier )
// code: freeup attcker
DebugMsg( TOPIC_JA2, DBG_LEVEL_3, String("@@@@@@@ Reducing attacker busy count..., CODE FROM ANIMATION %s ( %d )", gAnimControl[ pSoldier->usAnimState ].zAnimStr, pSoldier->usAnimState ) );
ReduceAttackBusyCount( (UINT8) pSoldier->ubID, FALSE );
ReduceAttackBusyCount( pSoldier->ubID, FALSE );
// ATE: Here, reduce again if creaturequeen tentical attack...
if ( pSoldier->usAnimState == QUEEN_SWIPE )
{
DebugMsg( TOPIC_JA2, DBG_LEVEL_3, String("@@@@@@@ Reducing attacker busy count for end of queen swipe\n" ) );
ReduceAttackBusyCount( (UINT8) pSoldier->ubID, FALSE );
ReduceAttackBusyCount( pSoldier->ubID, FALSE );
}
break;
Tactical/Soldier Control.cpp
+8 -8
View File
@@ -7396,7 +7396,7 @@ BOOLEAN InternalDoMercBattleSound( SOLDIERTYPE *pSoldier, UINT8 ubBattleSoundID,
{
sprintf( zFilename, "BATTLESNDS\\%03d_%s.ogg", pSoldier->ubProfile, gBattleSndsData[ ubSoundID ].zName );
if ( !FileExists( (STR)zFilename ) )
if ( !FileExists( zFilename ) )
{
sprintf( zFilename, "BATTLESNDS\\%03d_%s.wav", pSoldier->ubProfile, gBattleSndsData[ ubSoundID ].zName );
}
@@ -7407,7 +7407,7 @@ BOOLEAN InternalDoMercBattleSound( SOLDIERTYPE *pSoldier, UINT8 ubBattleSoundID,
if ( pSoldier->ubBodyType == REGFEMALE )
{
sprintf( zFilename, "BATTLESNDS\\f_%s.ogg", gBattleSndsData[ ubSoundID ].zName );
if ( !FileExists( (STR)zFilename ) )
if ( !FileExists( zFilename ) )
{
sprintf( zFilename, "BATTLESNDS\\f_%s.wav", gBattleSndsData[ ubSoundID ].zName );
}
@@ -7415,7 +7415,7 @@ BOOLEAN InternalDoMercBattleSound( SOLDIERTYPE *pSoldier, UINT8 ubBattleSoundID,
else
{
sprintf( zFilename, "BATTLESNDS\\m_%s.ogg", gBattleSndsData[ ubSoundID ].zName );
if ( !FileExists( (STR)zFilename ) )
if ( !FileExists( zFilename ) )
{
sprintf( zFilename, "BATTLESNDS\\m_%s.wav", gBattleSndsData[ ubSoundID ].zName );
}
@@ -7435,7 +7435,7 @@ BOOLEAN InternalDoMercBattleSound( SOLDIERTYPE *pSoldier, UINT8 ubBattleSoundID,
if ( ubSoundID == BATTLE_SOUND_DIE1 )
{
sprintf( zFilename, "BATTLESNDS\\kid%d_dying.ogg", pSoldier->ubBattleSoundID );
if ( !FileExists( (STR)zFilename ) )
if ( !FileExists( zFilename ) )
{
sprintf( zFilename, "BATTLESNDS\\kid%d_dying.wav", pSoldier->ubBattleSoundID );
}
@@ -7443,7 +7443,7 @@ BOOLEAN InternalDoMercBattleSound( SOLDIERTYPE *pSoldier, UINT8 ubBattleSoundID,
else
{
sprintf( zFilename, "BATTLESNDS\\kid%d_%s.ogg", pSoldier->ubBattleSoundID, gBattleSndsData[ ubSoundID ].zName );
if ( !FileExists( (STR)zFilename ) )
if ( !FileExists( zFilename ) )
{
sprintf( zFilename, "BATTLESNDS\\kid%d_%s.wav", pSoldier->ubBattleSoundID, gBattleSndsData[ ubSoundID ].zName );
}
@@ -7454,7 +7454,7 @@ BOOLEAN InternalDoMercBattleSound( SOLDIERTYPE *pSoldier, UINT8 ubBattleSoundID,
if ( ubSoundID == BATTLE_SOUND_DIE1 )
{
sprintf( zFilename, "BATTLESNDS\\bad%d_die.ogg", pSoldier->ubBattleSoundID );
if ( !FileExists( (STR)zFilename ) )
if ( !FileExists( zFilename ) )
{
sprintf( zFilename, "BATTLESNDS\\bad%d_die.wav", pSoldier->ubBattleSoundID );
}
@@ -7462,7 +7462,7 @@ BOOLEAN InternalDoMercBattleSound( SOLDIERTYPE *pSoldier, UINT8 ubBattleSoundID,
else
{
sprintf( zFilename, "BATTLESNDS\\bad%d_%s.ogg", pSoldier->ubBattleSoundID, gBattleSndsData[ ubSoundID ].zName );
if ( !FileExists( (STR)zFilename ) )
if ( !FileExists( zFilename ) )
{
sprintf( zFilename, "BATTLESNDS\\bad%d_%s.wav", pSoldier->ubBattleSoundID, gBattleSndsData[ ubSoundID ].zName );
}
@@ -10349,7 +10349,7 @@ void SoldierCollapse( SOLDIERTYPE *pSoldier )
if ( (gTacticalStatus.uiFlags & TURNBASED) && (gTacticalStatus.uiFlags & INCOMBAT) && (pSoldier->uiStatusFlags & SOLDIER_UNDERAICONTROL))
{
#ifdef TESTAICONTROL
DebugAI( (STR)String("Ending turn for %d because of error from HandleItem", pSoldier->ubID ) );
DebugAI( String("Ending turn for %d because of error from HandleItem", pSoldier->ubID ) );
#endif
EndAIGuysTurn( pSoldier );
Tactical/Soldier Control.h
+1 -1
View File
@@ -378,7 +378,7 @@ typedef struct
INT8 bScientific;
// traits
INT16 sWeightCarriedAtTurnStart;
wchar_t name[ 10 ];
CHAR16 name[ 10 ];
INT8 bVisible; // to render or not to render...
Tactical/Soldier Create.h
+1 -1
View File
@@ -109,7 +109,7 @@ typedef struct
//Kris: Additions November 16, 1997 (padding down to 129 from 150)
BOOLEAN fVisible;
wchar_t name[ 10 ];
CHAR16 name[ 10 ];
UINT8 ubSoldierClass; //army, administrator, elite
Tactical/Soldier Init List.cpp
+5 -5
View File
@@ -299,9 +299,9 @@ BOOLEAN LoadSoldiersFromMap( INT8 **hBuffer )
}
if( fCowInSector )
{
UINT8 str[ 40 ];
sprintf( (char *)str, "Sounds\\\\cowmoo%d.wav", Random( 3 ) + 1 );
PlayJA2SampleFromFile( (STR8) str, RATE_11025, MIDVOLUME, 1, MIDDLEPAN );
CHAR8 str[ 40 ];
sprintf( str, "Sounds\\\\cowmoo%d.wav", Random( 3 ) + 1 );
PlayJA2SampleFromFile( str, RATE_11025, MIDVOLUME, 1, MIDDLEPAN );
}
return TRUE;
}
@@ -1865,7 +1865,7 @@ void AddSoldierInitListBloodcats()
ubSectorID != SEC_I16 && ubSectorID != SEC_N5 )
{
#ifdef JA2BETAVERSION
wchar_t str[200];
CHAR16 str[200];
swprintf( str, L"Table specifies that there are %d bloodcat placements in sector %c%d, but the map actually has %d bloodcat placements. Map value takes precedence. KM,LC:1",
pSector->bBloodCatPlacements, gWorldSectorY + 'A' - 1, gWorldSectorX, bBloodCatPlacements );
DoScreenIndependantMessageBox( str, MSG_BOX_FLAG_OK, NULL );
@@ -2101,7 +2101,7 @@ BOOLEAN ValidateSoldierInitLinks( UINT8 ubCode )
{
SOLDIERINITNODE *curr;
UINT32 uiNumInvalids = 0;
wchar_t str[512];
CHAR16 str[512];
curr = gSoldierInitHead;
while( curr )
{
Tactical/Soldier Profile.cpp
+9 -9
View File
@@ -213,17 +213,17 @@ BOOLEAN LoadMercProfiles(void)
DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"LoadMercProfiles");
// FILE *fptr;
HWFILE fptr;
char *pFileName = "BINARYDATA\\Prof.dat";
STR8 pFileName = "BINARYDATA\\Prof.dat";
char *pFileName1_Normal = "BINARYDATA\\Prof_Novice_NormalGuns.dat";
char *pFileName2_Normal = "BINARYDATA\\Prof_Experienced_NormalGuns.dat";
char *pFileName3_Normal = "BINARYDATA\\Prof_Expert_NormalGuns.dat";
char *pFileName4_Normal = "BINARYDATA\\Prof_Insane_NormalGuns.dat";
STR8 pFileName1_Normal = "BINARYDATA\\Prof_Novice_NormalGuns.dat";
STR8 pFileName2_Normal = "BINARYDATA\\Prof_Experienced_NormalGuns.dat";
STR8 pFileName3_Normal = "BINARYDATA\\Prof_Expert_NormalGuns.dat";
STR8 pFileName4_Normal = "BINARYDATA\\Prof_Insane_NormalGuns.dat";
char *pFileName1_Tons = "BINARYDATA\\Prof_Novice_TonsOfGuns.dat";
char *pFileName2_Tons = "BINARYDATA\\Prof_Experienced_TonsOfGuns.dat";
char *pFileName3_Tons = "BINARYDATA\\Prof_Expert_TonsOfGuns.dat";
char *pFileName4_Tons = "BINARYDATA\\Prof_Insane_TonsOfGuns.dat";
STR8 pFileName1_Tons = "BINARYDATA\\Prof_Novice_TonsOfGuns.dat";
STR8 pFileName2_Tons = "BINARYDATA\\Prof_Experienced_TonsOfGuns.dat";
STR8 pFileName3_Tons = "BINARYDATA\\Prof_Expert_TonsOfGuns.dat";
STR8 pFileName4_Tons = "BINARYDATA\\Prof_Insane_TonsOfGuns.dat";
UINT32 uiLoop, uiLoop2;//, uiLoop3;
UINT16 usItem;//, usNewGun, usAmmo, usNewAmmo;
Tactical/SoldierTooltips.cpp
+4 -4
View File
@@ -417,13 +417,13 @@ void DrawMouseTooltip()
UINT16 usRectColor2 = Get16BPPColor( FROMRGB( 227, 198, 88 ) );
static INT32 iX, iY, iW, iH;
extern INT16 GetWidthOfString(STR16);
extern INT16 GetNumberOfLinesInHeight(STR16);
extern void DisplayHelpTokenizedString(STR16,INT16,INT16);
extern INT16 GetWidthOfString(const STR16);
extern INT16 GetNumberOfLinesInHeight(const STR16);
extern void DisplayHelpTokenizedString(const STR16,INT16,INT16);
extern BOOLEAN initTooltipBuffer();
extern PTR LockTooltipBuffer(UINT32*);
extern void UnlockTooltipBuffer();
extern void DisplayTooltipString( STR16 pStringA, INT16 sX, INT16 sY );
extern void DisplayTooltipString( const STR16 pStringA, INT16 sX, INT16 sY );
extern void j_log(PTR,...);
iX = mouseTT.iX;iY = mouseTT.iY;
Tactical/Strategic Exit GUI.cpp
+5 -5
View File
@@ -522,7 +522,7 @@ void UpdateSectorExitMenu( )
MSYS_DisableRegion(&(gExitDialog.SingleRegion) );
if( gExitDialog.fSelectedMercIsEPC )
{ //EPCs cannot leave the sector alone and must be escorted
wchar_t str[ 256 ];
CHAR16 str[ 256 ];
swprintf( str, pExitingSectorHelpText[ EXIT_GUI_ESCORTED_CHARACTERS_MUST_BE_ESCORTED_HELPTEXT ], MercPtrs[ gusSelectedSoldier ]->name );
SetButtonFastHelpText( gExitDialog.uiSingleMoveButton, str );
SetRegionFastHelpText( &gExitDialog.SingleRegion, str );
@@ -531,7 +531,7 @@ void UpdateSectorExitMenu( )
{ //It has been previously determined that there are only two mercs in the squad, the selected merc
//isn't an EPC, but the other merc is. That means that this merc cannot leave the sector alone
//as he would isolate the EPC.
wchar_t str[ 256 ];
CHAR16 str[ 256 ];
if( !gExitDialog.fSquadHasMultipleEPCs )
{
if( gMercProfiles[ MercPtrs[ gusSelectedSoldier ]->ubProfile ].bSex == MALE )
@@ -562,7 +562,7 @@ void UpdateSectorExitMenu( )
}
else
{
wchar_t str[ 256 ];
CHAR16 str[ 256 ];
EnableButton( gExitDialog.uiSingleMoveButton );
MSYS_EnableRegion(&(gExitDialog.SingleRegion) );
swprintf( str, pExitingSectorHelpText[ EXIT_GUI_SINGLE_TRAVERSAL_WILL_SEPARATE_SQUADS_HELPTEXT ], MercPtrs[ gusSelectedSoldier ]->name );
@@ -698,7 +698,7 @@ BOOLEAN HandleSectorExitMenu( )
void RemoveSectorExitMenu( BOOLEAN fOk )
{
wchar_t Str[ 50 ];
CHAR16 Str[ 50 ];
if ( gfInSectorExitMenu )
{
@@ -740,7 +740,7 @@ void RemoveSectorExitMenu( BOOLEAN fOk )
// Check if there are more than one in this squad
if ( gExitDialog.ubNumPeopleOnSquad == 0 )
{
swprintf( (wchar_t *) Str, pMessageStrings[ MSG_EPC_CANT_TRAVERSE ], MercPtrs[ gusSelectedSoldier ]->name );
swprintf( Str, pMessageStrings[ MSG_EPC_CANT_TRAVERSE ], MercPtrs[ gusSelectedSoldier ]->name );
DoMessageBox( MSG_BOX_BASIC_STYLE, Str, GAME_SCREEN, ( UINT8 )MSG_BOX_FLAG_OK, NULL, NULL );
return;
Tactical/Tactical Save.cpp
+17 -17
View File
@@ -420,11 +420,11 @@ BOOLEAN LoadMapTempFilesFromSavedGameFile( HWFILE hFile )
if ( (gTacticalStatus.uiFlags & LOADING_SAVED_GAME) && guiSaveGameVersion < 78 )
{
INT8 pMapName[ 128 ];
CHAR8 pMapName[ 128 ];
// KILL IT!!! KILL KIT!!!! IT IS CORRUPTED!!!
GetMapTempFileName( SF_CIV_PRESERVED_TEMP_FILE_EXISTS, (STR)pMapName, sMapX, sMapY, 0 );
FileDelete( (STR)pMapName );
GetMapTempFileName( SF_CIV_PRESERVED_TEMP_FILE_EXISTS, pMapName, sMapX, sMapY, 0 );
FileDelete( pMapName );
// turn off the flag
SectorInfo[ SECTOR( sMapX,sMapY) ].uiFlags &= (~SF_CIV_PRESERVED_TEMP_FILE_EXISTS);
@@ -514,11 +514,11 @@ BOOLEAN LoadMapTempFilesFromSavedGameFile( HWFILE hFile )
return FALSE;
if ( (gTacticalStatus.uiFlags & LOADING_SAVED_GAME) && guiSaveGameVersion < 78 )
{
INT8 pMapName[ 128 ];
CHAR8 pMapName[ 128 ];
// KILL IT!!! KILL KIT!!!! IT IS CORRUPTED!!!
GetMapTempFileName( SF_CIV_PRESERVED_TEMP_FILE_EXISTS, (STR)pMapName, TempNode->ubSectorX, TempNode->ubSectorY, TempNode->ubSectorZ );
FileDelete( (STR)pMapName );
GetMapTempFileName( SF_CIV_PRESERVED_TEMP_FILE_EXISTS, pMapName, TempNode->ubSectorX, TempNode->ubSectorY, TempNode->ubSectorZ );
FileDelete( pMapName );
// turn off the flag
TempNode->uiFlags &= (~SF_CIV_PRESERVED_TEMP_FILE_EXISTS);
@@ -2981,51 +2981,51 @@ void GetMapTempFileName( UINT32 uiType, STR pMapName, INT16 sMapX, INT16 sMapY,
switch( uiType )
{
case SF_ITEM_TEMP_FILE_EXISTS:
sprintf( (char *)pMapName, "%s\\i_%s", MAPS_DIR, zTempName);
sprintf( pMapName, "%s\\i_%s", MAPS_DIR, zTempName);
break;
case SF_ROTTING_CORPSE_TEMP_FILE_EXISTS:
sprintf( (char *)pMapName, "%s\\r_%s", MAPS_DIR, zTempName);
sprintf( pMapName, "%s\\r_%s", MAPS_DIR, zTempName);
break;
case SF_MAP_MODIFICATIONS_TEMP_FILE_EXISTS:
sprintf( (char *)pMapName, "%s\\m_%s", MAPS_DIR, zTempName);
sprintf( pMapName, "%s\\m_%s", MAPS_DIR, zTempName);
break;
case SF_DOOR_TABLE_TEMP_FILES_EXISTS:
sprintf( (char *)pMapName, "%s\\d_%s", MAPS_DIR, zTempName);
sprintf( pMapName, "%s\\d_%s", MAPS_DIR, zTempName);
break;
case SF_REVEALED_STATUS_TEMP_FILE_EXISTS:
sprintf( (char *)pMapName, "%s\\v_%s", MAPS_DIR, zTempName);
sprintf( pMapName, "%s\\v_%s", MAPS_DIR, zTempName);
break;
case SF_DOOR_STATUS_TEMP_FILE_EXISTS:
sprintf( (char *)pMapName, "%s\\ds_%s", MAPS_DIR, zTempName);
sprintf( pMapName, "%s\\ds_%s", MAPS_DIR, zTempName);
break;
case SF_ENEMY_PRESERVED_TEMP_FILE_EXISTS:
sprintf( (char *)pMapName, "%s\\e_%s", MAPS_DIR, zTempName);
sprintf( pMapName, "%s\\e_%s", MAPS_DIR, zTempName);
break;
case SF_CIV_PRESERVED_TEMP_FILE_EXISTS:
// NB save game version 0 is "saving game"
if ( (gTacticalStatus.uiFlags & LOADING_SAVED_GAME) && guiSaveGameVersion != 0 && guiSaveGameVersion < 78 )
{
sprintf( (char *)pMapName, "%s\\c_%s", MAPS_DIR, zTempName);
sprintf( pMapName, "%s\\c_%s", MAPS_DIR, zTempName);
}
else
{
sprintf( (char *)pMapName, "%s\\cc_%s", MAPS_DIR, zTempName);
sprintf( pMapName, "%s\\cc_%s", MAPS_DIR, zTempName);
}
break;
case SF_SMOKE_EFFECTS_TEMP_FILE_EXISTS:
sprintf( (char *)pMapName, "%s\\sm_%s", MAPS_DIR, zTempName);
sprintf( pMapName, "%s\\sm_%s", MAPS_DIR, zTempName);
break;
case SF_LIGHTING_EFFECTS_TEMP_FILE_EXISTS:
sprintf( (char *)pMapName, "%s\\l_%s", MAPS_DIR, zTempName);
sprintf( pMapName, "%s\\l_%s", MAPS_DIR, zTempName);
break;
default:
Tactical/TeamTurns.cpp
+5 -5
View File
@@ -590,7 +590,7 @@ void DisplayHiddenTurnbased( SOLDIERTYPE * pActingSoldier )
//JA2Gold: use function to make sure flags turned off everywhere else
//pActingSoldier->uiStatusFlags |= SOLDIER_UNDERAICONTROL;
SetSoldierAsUnderAiControl( pActingSoldier );
DebugAI( (STR)String( "Giving AI control to %d", pActingSoldier->ubID ) );
DebugAI( String( "Giving AI control to %d", pActingSoldier->ubID ) );
pActingSoldier->fTurnInProgress = TRUE;
gTacticalStatus.uiTimeSinceMercAIStart = GetJA2Clock();
@@ -675,7 +675,7 @@ void StartInterrupt( void )
if (pSoldier->bTeam == OUR_TEAM)
{
// start interrupts for everyone on our side at once
INT16 sTemp[ 255 ];
CHAR16 sTemp[ 255 ];
UINT8 ubInterrupters = 0;
INT32 iSquad, iCounter;
@@ -716,7 +716,7 @@ void StartInterrupt( void )
// flush... display string, then clear it (we could have 20 names!)
// add comma to end, we know we have another person after this...
wcscat( sTemp, L", " );
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, (STR16) sTemp );
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, sTemp );
wcscpy( sTemp, L"" );
ubInterrupters = 1;
}
@@ -730,7 +730,7 @@ void StartInterrupt( void )
}
}
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, (STR16) sTemp );
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, sTemp );
DebugMsg( TOPIC_JA2, DBG_LEVEL_3, String("INTERRUPT: starting interrupt for %d", ubFirstInterrupter ) );
// gusSelectedSoldier should become the topmost guy on the interrupt list
@@ -1717,7 +1717,7 @@ void AddToIntList( UINT8 ubID, BOOLEAN fGainControl, BOOLEAN fCommunicate )
// turn off AI control flag if they lost control
if (Menptr[ubID].uiStatusFlags & SOLDIER_UNDERAICONTROL)
{
DebugAI( (STR)String( "Taking away AI control from %d", ubID ) );
DebugAI( String( "Taking away AI control from %d", ubID ) );
Menptr[ubID].uiStatusFlags &= (~SOLDIER_UNDERAICONTROL);
}
}
Tactical/Turn Based Input.cpp
+2 -2
View File
@@ -3895,7 +3895,7 @@ BOOLEAN HandleCheckForExitArrowsInput( BOOLEAN fAdjustConfirm )
}
else if( gubLoneMercAttemptingToAbandonEPCs )
{
wchar_t str[256];
CHAR16 str[256];
if( gubLoneMercAttemptingToAbandonEPCs == 1 )
{ //Use the singular version of the string
if( gMercProfiles[ MercPtrs[ gusSelectedSoldier ]->ubProfile ].bSex == MALE )
@@ -4208,7 +4208,7 @@ void RefreshSoldier()
}
if ( GetMouseMapPos( (INT16 *)&usMapPos ) )
sprintf( (char *)gDebugStr, "%d %d %d %d %d %d %d %d", gubWorldMovementCosts[ usMapPos ][ 0 ][ 0 ],
sprintf( gDebugStr, "%d %d %d %d %d %d %d %d", gubWorldMovementCosts[ usMapPos ][ 0 ][ 0 ],
gubWorldMovementCosts[ usMapPos ][ 1 ][gsInterfaceLevel],
gubWorldMovementCosts[ usMapPos ][ 2 ][gsInterfaceLevel],
gubWorldMovementCosts[ usMapPos ][ 3 ][gsInterfaceLevel],
Tactical/UI Cursors.cpp
+2 -2
View File
@@ -570,7 +570,7 @@ UINT8 HandleActivatedTargetCursor( SOLDIERTYPE *pSoldier, UINT16 usMapPos, BOOLE
{
//AXP 29.03.2007: Rooftop CtH fix. See below.
INT8 bTempTargetLevel = pSoldier->bTargetLevel;
pSoldier->bTargetLevel = gsInterfaceLevel;
pSoldier->bTargetLevel = (INT8) gsInterfaceLevel;
UINT32 uiHitChance;
uiHitChance = CalcChanceToHitGun( pSoldier, usMapPos, 0, pSoldier->bAimShotLocation );
@@ -590,7 +590,7 @@ UINT8 HandleActivatedTargetCursor( SOLDIERTYPE *pSoldier, UINT16 usMapPos, BOOLE
//AXP 29.03.2007: Rooftop CtH fix. Temporarily set soldier targetlevel to the real interface
//level (selected with TAB), so the first shot after switching TL is calculated correctly
INT8 bTempTargetLevel = pSoldier->bTargetLevel;
pSoldier->bTargetLevel = gsInterfaceLevel;
pSoldier->bTargetLevel = (INT8) gsInterfaceLevel;
UINT32 uiHitChance;
uiHitChance = CalcChanceToHitGun( pSoldier, usMapPos, (INT8)(pSoldier->bShownAimTime ), pSoldier->bAimShotLocation );
Tactical/Weapons.cpp
+13 -13
View File
@@ -283,7 +283,7 @@ EXPLOSIVETYPE Explosive[MAXITEMS+1];// =
//};
INT8 gzBurstSndStrings[MAXITEMS*2][128];// =
CHAR8 gzBurstSndStrings[MAXITEMS*2][128];// =
//{
// "", // NOAMMO
// "", // 38
@@ -328,7 +328,7 @@ struct
{
WEP_PARSE_STAGE curElement;
INT8 szCharData[MAX_CHAR_DATA_LENGTH+1];
CHAR8 szCharData[MAX_CHAR_DATA_LENGTH+1];
WEAPONTYPE curWeapon;
WEAPONTYPE * curWeaponList;
UINT32 maxWeapons;
@@ -340,7 +340,7 @@ typedef weaponParseData;
static void XMLCALL
weaponStartElementHandle(void *userData, const char *name, const char **atts)
weaponStartElementHandle(void *userData, const XML_Char *name, const XML_Char **atts)
{
weaponParseData * pData = (weaponParseData *)userData;
@@ -412,7 +412,7 @@ weaponStartElementHandle(void *userData, const char *name, const char **atts)
}
static void XMLCALL
weaponCharacterDataHandle(void *userData, const char *str, int len)
weaponCharacterDataHandle(void *userData, const XML_Char *str, int len)
{
weaponParseData * pData = (weaponParseData *)userData;
@@ -425,7 +425,7 @@ weaponCharacterDataHandle(void *userData, const char *str, int len)
static void XMLCALL
weaponEndElementHandle(void *userData, const char *name)
weaponEndElementHandle(void *userData, const XML_Char *name)
{
weaponParseData * pData = (weaponParseData *)userData;
@@ -702,7 +702,7 @@ BOOLEAN ReadInWeaponStats(STR fileName)
FilePrintf(hFile,"<WEAPONLIST>\r\n");
for(cnt = 0;cnt < MAXITEMS;cnt++)
{
INT8 * szRemainder = Weapon[cnt].szWeaponName; //the remaining string to be output (for making valid XML)
STR8 szRemainder = Weapon[cnt].szWeaponName; //the remaining string to be output (for making valid XML)
FilePrintf(hFile,"\t<WEAPON>\r\n");
FilePrintf(hFile,"\t\t<uiIndex>%d</uiIndex>\r\n", Weapon[cnt].uiIndex);
@@ -711,7 +711,7 @@ BOOLEAN ReadInWeaponStats(STR fileName)
while(szRemainder[0] != '\0')
{
UINT32 uiCharLoc = strcspn(szRemainder,"&<>\'\"\0");
INT8 invChar = szRemainder[uiCharLoc];
CHAR8 invChar = szRemainder[uiCharLoc];
if(uiCharLoc)
{
@@ -805,7 +805,7 @@ BOOLEAN WriteWeaponStats()
FilePrintf(hFile,"<WEAPONLIST>\r\n");
for(cnt = 0;cnt < MAXITEMS;cnt++)
{
INT8 * szRemainder = Weapon[cnt].szWeaponName; //the remaining string to be output (for making valid XML)
CHAR8 * szRemainder = Weapon[cnt].szWeaponName; //the remaining string to be output (for making valid XML)
FilePrintf(hFile,"\t<WEAPON>\r\n");
FilePrintf(hFile,"\t\t<uiIndex>%d</uiIndex>\r\n", cnt);//Weapon[cnt].uiIndex);
@@ -1512,7 +1512,7 @@ BOOLEAN UseGun( SOLDIERTYPE *pSoldier , INT16 sTargetGridNo )
UINT16 usItemNum;
BOOLEAN fBuckshot;
UINT8 ubVolume;
INT8 zBurstString[512];
CHAR8 zBurstString[512];
UINT8 ubDirection;
INT16 sNewGridNo;
UINT8 ubMerc;
@@ -1538,21 +1538,21 @@ BOOLEAN UseGun( SOLDIERTYPE *pSoldier , INT16 sTargetGridNo )
if( noisefactor < MAX_PERCENT_NOISE_VOLUME_FOR_SILENCED_SOUND || Weapon[ usItemNum ].ubAttackVolume <= 10 )
{
// Pick sound file baed on how many bullets we are going to fire...
sprintf( (char *)zBurstString, (const char*)gzBurstSndStrings[ Weapon[ usItemNum ].sSilencedBurstSound ], pSoldier->bBulletsLeft );
sprintf( zBurstString, gzBurstSndStrings[ Weapon[ usItemNum ].sSilencedBurstSound ], pSoldier->bBulletsLeft );
// Try playing sound...
pSoldier->iBurstSoundID = PlayJA2SampleFromFile( (STR8) zBurstString, RATE_11025, SoundVolume( HIGHVOLUME, pSoldier->sGridNo ), 1, SoundDir( pSoldier->sGridNo ) );
pSoldier->iBurstSoundID = PlayJA2SampleFromFile( zBurstString, RATE_11025, SoundVolume( HIGHVOLUME, pSoldier->sGridNo ), 1, SoundDir( pSoldier->sGridNo ) );
}
else
{
// Pick sound file baed on how many bullets we are going to fire...
// Lesh: changed next line
sprintf( (char *)zBurstString, (const char*)gzBurstSndStrings[ Weapon[ usItemNum ].sBurstSound ], pSoldier->bBulletsLeft );
sprintf( zBurstString, gzBurstSndStrings[ Weapon[ usItemNum ].sBurstSound ], pSoldier->bBulletsLeft );
INT8 volume = HIGHVOLUME;
if ( noisefactor < 100 ) volume = (volume * noisefactor) / 100;
// Try playing sound...
pSoldier->iBurstSoundID = PlayJA2SampleFromFile( (STR8) zBurstString, RATE_11025, SoundVolume( (INT8) volume, pSoldier->sGridNo ), 1, SoundDir( pSoldier->sGridNo ) );
pSoldier->iBurstSoundID = PlayJA2SampleFromFile( zBurstString, RATE_11025, SoundVolume( (INT8) volume, pSoldier->sGridNo ), 1, SoundDir( pSoldier->sGridNo ) );
}
/*
Tactical/Weapons.h
+2 -2
View File
@@ -259,7 +259,7 @@ typedef struct
UINT8 bBurstAP; // Snap: Burst AP cost replaces bBaseAutofireCost
UINT8 bAutofireShotsPerFiveAP;
INT8 szWeaponName[MAX_WEAPON_NAME_LENGTH+1]; //+1 for the null terminator
CHAR8 szWeaponName[MAX_WEAPON_NAME_LENGTH+1]; //+1 for the null terminator
UINT32 uiIndex;
BOOLEAN swapClips;
@@ -311,7 +311,7 @@ extern WEAPONTYPE Weapon[ MAXITEMS ];
extern ARMOURTYPE Armour[MAXITEMS+1];
extern MAGTYPE Magazine[MAXITEMS+1];
extern EXPLOSIVETYPE Explosive[MAXITEMS+1];
extern INT8 gzBurstSndStrings[MAXITEMS*2][128]; // Lesh: changed this
extern CHAR8 gzBurstSndStrings[MAXITEMS*2][128]; // Lesh: changed this
extern AMMOTYPE AmmoTypes[MAXITEMS];
extern BOOLEAN ReadInWeaponStats(STR fileName);
Tactical/XML_AmmoStrings.cpp
+11 -11
View File
@@ -48,7 +48,7 @@ struct
{
PARSE_STAGE curElement;
INT8 szCharData[MAX_CHAR_DATA_LENGTH+1];
CHAR8 szCharData[MAX_CHAR_DATA_LENGTH+1];
UINT32 maxArraySize;
UINT32 curIndex;
@@ -58,7 +58,7 @@ struct
typedef ammoParseData;
static void XMLCALL
ammoStartElementHandle(void *userData, const char *name, const char **atts)
ammoStartElementHandle(void *userData, const XML_Char *name, const XML_Char **atts)
{
ammoParseData * pData = (ammoParseData *)userData;
@@ -94,7 +94,7 @@ ammoStartElementHandle(void *userData, const char *name, const char **atts)
}
static void XMLCALL
ammoCharacterDataHandle(void *userData, const char *str, int len)
ammoCharacterDataHandle(void *userData, const XML_Char *str, int len)
{
ammoParseData * pData = (ammoParseData *)userData;
@@ -107,7 +107,7 @@ ammoCharacterDataHandle(void *userData, const char *str, int len)
static void XMLCALL
ammoEndElementHandle(void *userData, const char *name)
ammoEndElementHandle(void *userData, const XML_Char *name)
{
char temp;
ammoParseData * pData = (ammoParseData *)userData;
@@ -239,18 +239,18 @@ BOOLEAN WriteAmmoStats()
{
FilePrintf(hFile,"\t<AMMO>\r\n");
wchar_t * szRemainder = AmmoCaliber[cnt]; //the remaining string to be output (for making valid XML)
STR16 szRemainder = AmmoCaliber[cnt]; //the remaining string to be output (for making valid XML)
FilePrintf(hFile,"\t\t<AmmoCaliber>");
while(szRemainder[0] != '\0')
{
UINT32 uiCharLoc = strcspn(szRemainder,"&<>\'\"\0");
UINT16 invChar = szRemainder[uiCharLoc];
UINT32 uiCharLoc = wcscspn(szRemainder,L"&<>\'\"\0");
CHAR16 invChar = szRemainder[uiCharLoc];
if(uiCharLoc)
{
szRemainder[uiCharLoc] = '\0';
FilePrintf(hFile,"%s",szRemainder);
FilePrintf(hFile,"%S",szRemainder);
szRemainder[uiCharLoc] = invChar;
}
@@ -292,13 +292,13 @@ BOOLEAN WriteAmmoStats()
FilePrintf(hFile,"\t\t<BRCaliber>");
while(szRemainder[0] != '\0')
{
UINT32 uiCharLoc = strcspn(szRemainder,"&<>\'\"\0");
UINT16 invChar = szRemainder[uiCharLoc];
UINT32 uiCharLoc = wcscspn(szRemainder,L"&<>\'\"\0");
CHAR16 invChar = szRemainder[uiCharLoc];
if(uiCharLoc)
{
szRemainder[uiCharLoc] = '\0';
FilePrintf(hFile,"%s",szRemainder);
FilePrintf(hFile,"%S",szRemainder);
szRemainder[uiCharLoc] = invChar;
}
Tactical/XML_AmmoTypes.cpp
+12 -12
View File
@@ -49,7 +49,7 @@ struct
{
PARSE_STAGE curElement;
INT8 szCharData[MAX_CHAR_DATA_LENGTH+1];
CHAR8 szCharData[MAX_CHAR_DATA_LENGTH+1];
AMMOTYPE curAmmoType;
AMMOTYPE * curArray;
UINT32 maxArraySize;
@@ -60,7 +60,7 @@ struct
typedef ammotypeParseData;
static void XMLCALL
ammotypeStartElementHandle(void *userData, const char *name, const char **atts)
ammotypeStartElementHandle(void *userData, const XML_Char *name, const XML_Char **atts)
{
ammotypeParseData * pData = (ammotypeParseData *)userData;
@@ -126,7 +126,7 @@ ammotypeStartElementHandle(void *userData, const char *name, const char **atts)
}
static void XMLCALL
ammotypeCharacterDataHandle(void *userData, const char *str, int len)
ammotypeCharacterDataHandle(void *userData, const XML_Char *str, int len)
{
ammotypeParseData * pData = (ammotypeParseData *)userData;
@@ -139,7 +139,7 @@ ammotypeCharacterDataHandle(void *userData, const char *str, int len)
static void XMLCALL
ammotypeEndElementHandle(void *userData, const char *name)
ammotypeEndElementHandle(void *userData, const XML_Char *name)
{
ammotypeParseData * pData = (ammotypeParseData *)userData;
@@ -191,22 +191,22 @@ ammotypeEndElementHandle(void *userData, const char *name)
else if(strcmp(name, "armourImpactReductionMultiplier") == 0)
{
pData->curElement = ELEMENT;
pData->curAmmoType.armourImpactReductionMultiplier = (INT32) atol((char *)pData->szCharData);
pData->curAmmoType.armourImpactReductionMultiplier = (INT32) atol(pData->szCharData);
}
else if(strcmp(name, "afterArmourDamageMultiplier") == 0)
{
pData->curElement = ELEMENT;
pData->curAmmoType.afterArmourDamageMultiplier = (INT32) atol((char *)pData->szCharData);
pData->curAmmoType.afterArmourDamageMultiplier = (INT32) atol(pData->szCharData);
}
else if(strcmp(name, "beforeArmourDamageMultiplier") == 0)
{
pData->curElement = ELEMENT;
pData->curAmmoType.beforeArmourDamageMultiplier = (INT32) atol((char *)pData->szCharData);
pData->curAmmoType.beforeArmourDamageMultiplier = (INT32) atol(pData->szCharData);
}
else if(strcmp(name, "multipleBulletDamageMultiplier") == 0)
{
pData->curElement = ELEMENT;
pData->curAmmoType.multipleBulletDamageMultiplier = (INT32) atol((char *)pData->szCharData);
pData->curAmmoType.multipleBulletDamageMultiplier = (INT32) atol(pData->szCharData);
}
else if(strcmp(name, "structureImpactReductionDivisor") == 0)
{
@@ -216,22 +216,22 @@ ammotypeEndElementHandle(void *userData, const char *name)
else if(strcmp(name, "armourImpactReductionDivisor") == 0)
{
pData->curElement = ELEMENT;
pData->curAmmoType.armourImpactReductionDivisor = (INT32) atol((char *)pData->szCharData);
pData->curAmmoType.armourImpactReductionDivisor = (INT32) atol(pData->szCharData);
}
else if(strcmp(name, "afterArmourDamageDivisor") == 0)
{
pData->curElement = ELEMENT;
pData->curAmmoType.afterArmourDamageDivisor = (INT32) atol((char *)pData->szCharData);
pData->curAmmoType.afterArmourDamageDivisor = (INT32) atol(pData->szCharData);
}
else if(strcmp(name, "beforeArmourDamageDivisor") == 0)
{
pData->curElement = ELEMENT;
pData->curAmmoType.beforeArmourDamageDivisor = (INT32) atol((char *)pData->szCharData);
pData->curAmmoType.beforeArmourDamageDivisor = (INT32) atol(pData->szCharData);
}
else if(strcmp(name, "multipleBulletDamageDivisor") == 0)
{
pData->curElement = ELEMENT;
pData->curAmmoType.multipleBulletDamageDivisor = (INT32) atol((char *)pData->szCharData);
pData->curAmmoType.multipleBulletDamageDivisor = (INT32) atol(pData->szCharData);
}
else if(strcmp(name, "lockBustingPower") == 0)
{
Tactical/XML_Armour.cpp
+4 -4
View File
@@ -49,7 +49,7 @@ struct
{
PARSE_STAGE curElement;
INT8 szCharData[MAX_CHAR_DATA_LENGTH+1];
CHAR8 szCharData[MAX_CHAR_DATA_LENGTH+1];
ARMOURTYPE curArmour;
ARMOURTYPE * curArray;
UINT32 maxArraySize;
@@ -60,7 +60,7 @@ struct
typedef armourParseData;
static void XMLCALL
armourStartElementHandle(void *userData, const char *name, const char **atts)
armourStartElementHandle(void *userData, const XML_Char *name, const XML_Char **atts)
{
armourParseData * pData = (armourParseData *)userData;
@@ -102,7 +102,7 @@ armourStartElementHandle(void *userData, const char *name, const char **atts)
}
static void XMLCALL
armourCharacterDataHandle(void *userData, const char *str, int len)
armourCharacterDataHandle(void *userData, const XML_Char *str, int len)
{
armourParseData * pData = (armourParseData *)userData;
@@ -115,7 +115,7 @@ armourCharacterDataHandle(void *userData, const char *str, int len)
static void XMLCALL
armourEndElementHandle(void *userData, const char *name)
armourEndElementHandle(void *userData, const XML_Char *name)
{
armourParseData * pData = (armourParseData *)userData;
Tactical/XML_AttachmentInfo.cpp
+4 -4
View File
@@ -48,7 +48,7 @@ struct
{
PARSE_STAGE curElement;
INT8 szCharData[MAX_CHAR_DATA_LENGTH+1];
CHAR8 szCharData[MAX_CHAR_DATA_LENGTH+1];
AttachmentInfoStruct curAttachmentInfo;
AttachmentInfoStruct * curArray;
UINT32 maxArraySize;
@@ -59,7 +59,7 @@ struct
typedef attachmentinfoParseData;
static void XMLCALL
attachmentinfoStartElementHandle(void *userData, const char *name, const char **atts)
attachmentinfoStartElementHandle(void *userData, const XML_Char *name, const XML_Char **atts)
{
attachmentinfoParseData * pData = (attachmentinfoParseData *)userData;
@@ -101,7 +101,7 @@ attachmentinfoStartElementHandle(void *userData, const char *name, const char **
}
static void XMLCALL
attachmentinfoCharacterDataHandle(void *userData, const char *str, int len)
attachmentinfoCharacterDataHandle(void *userData, const XML_Char *str, int len)
{
attachmentinfoParseData * pData = (attachmentinfoParseData *)userData;
@@ -114,7 +114,7 @@ attachmentinfoCharacterDataHandle(void *userData, const char *str, int len)
static void XMLCALL
attachmentinfoEndElementHandle(void *userData, const char *name)
attachmentinfoEndElementHandle(void *userData, const XML_Char *name)
{
attachmentinfoParseData * pData = (attachmentinfoParseData *)userData;
Tactical/XML_Attachments.cpp
+4 -4
View File
@@ -48,7 +48,7 @@ struct
{
PARSE_STAGE curElement;
INT8 szCharData[MAX_CHAR_DATA_LENGTH+1];
CHAR8 szCharData[MAX_CHAR_DATA_LENGTH+1];
UINT16 curAttachment[3];
UINT32 maxArraySize;
@@ -59,7 +59,7 @@ struct
typedef attachmentParseData;
static void XMLCALL
attachmentStartElementHandle(void *userData, const char *name, const char **atts)
attachmentStartElementHandle(void *userData, const XML_Char *name, const XML_Char **atts)
{
attachmentParseData * pData = (attachmentParseData *)userData;
@@ -100,7 +100,7 @@ attachmentStartElementHandle(void *userData, const char *name, const char **atts
}
static void XMLCALL
attachmentCharacterDataHandle(void *userData, const char *str, int len)
attachmentCharacterDataHandle(void *userData, const XML_Char *str, int len)
{
attachmentParseData * pData = (attachmentParseData *)userData;
@@ -113,7 +113,7 @@ attachmentCharacterDataHandle(void *userData, const char *str, int len)
static void XMLCALL
attachmentEndElementHandle(void *userData, const char *name)
attachmentEndElementHandle(void *userData, const XML_Char *name)
{
attachmentParseData * pData = (attachmentParseData *)userData;
Tactical/XML_BurstSounds.cpp
+5 -5
View File
@@ -48,7 +48,7 @@ struct
{
PARSE_STAGE curElement;
INT8 szCharData[MAX_CHAR_DATA_LENGTH+1];
CHAR8 szCharData[MAX_CHAR_DATA_LENGTH+1];
UINT32 maxArraySize;
UINT32 curIndex;
@@ -58,7 +58,7 @@ struct
typedef burstSoundParseData;
static void XMLCALL
burstSoundStartElementHandle(void *userData, const char *name, const char **atts)
burstSoundStartElementHandle(void *userData, const XML_Char *name, const XML_Char **atts)
{
burstSoundParseData * pData = (burstSoundParseData *)userData;
@@ -86,7 +86,7 @@ burstSoundStartElementHandle(void *userData, const char *name, const char **atts
}
static void XMLCALL
burstSoundCharacterDataHandle(void *userData, const char *str, int len)
burstSoundCharacterDataHandle(void *userData, const XML_Char *str, int len)
{
burstSoundParseData * pData = (burstSoundParseData *)userData;
@@ -99,7 +99,7 @@ burstSoundCharacterDataHandle(void *userData, const char *str, int len)
static void XMLCALL
burstSoundEndElementHandle(void *userData, const char *name)
burstSoundEndElementHandle(void *userData, const XML_Char *name)
{
burstSoundParseData * pData = (burstSoundParseData *)userData;
@@ -212,7 +212,7 @@ BOOLEAN WriteBurstSoundArray()
{
FilePrintf(hFile,"\t<SOUND>");
INT8 * szRemainder = gzBurstSndStrings[cnt]; //the remaining string to be output (for making valid XML)
STR8 szRemainder = gzBurstSndStrings[cnt]; //the remaining string to be output (for making valid XML)
while(szRemainder[0] != '\0')
{
Tactical/XML_ComboMergeInfo.cpp
+4 -4
View File
@@ -49,7 +49,7 @@ struct
{
PARSE_STAGE curElement;
INT8 szCharData[MAX_CHAR_DATA_LENGTH+1];
CHAR8 szCharData[MAX_CHAR_DATA_LENGTH+1];
ComboMergeInfoStruct curAttachmentComboMerge;
ComboMergeInfoStruct * curArray;
UINT32 maxArraySize;
@@ -60,7 +60,7 @@ struct
typedef attachmentcombomergeParseData;
static void XMLCALL
attachmentcombomergeStartElementHandle(void *userData, const char *name, const char **atts)
attachmentcombomergeStartElementHandle(void *userData, const XML_Char *name, const XML_Char **atts)
{
attachmentcombomergeParseData * pData = (attachmentcombomergeParseData *)userData;
@@ -102,7 +102,7 @@ attachmentcombomergeStartElementHandle(void *userData, const char *name, const c
}
static void XMLCALL
attachmentcombomergeCharacterDataHandle(void *userData, const char *str, int len)
attachmentcombomergeCharacterDataHandle(void *userData, const XML_Char *str, int len)
{
attachmentcombomergeParseData * pData = (attachmentcombomergeParseData *)userData;
@@ -115,7 +115,7 @@ attachmentcombomergeCharacterDataHandle(void *userData, const char *str, int len
static void XMLCALL
attachmentcombomergeEndElementHandle(void *userData, const char *name)
attachmentcombomergeEndElementHandle(void *userData, const XML_Char *name)
{
attachmentcombomergeParseData * pData = (attachmentcombomergeParseData *)userData;
Tactical/XML_CompatibleFaceItems.cpp
+4 -4
View File
@@ -48,7 +48,7 @@ struct
{
PARSE_STAGE curElement;
INT8 szCharData[MAX_CHAR_DATA_LENGTH+1];
CHAR8 szCharData[MAX_CHAR_DATA_LENGTH+1];
UINT16 curCompatibleFaceItem[2];
UINT32 maxArraySize;
@@ -59,7 +59,7 @@ struct
typedef compatiblefaceitemParseData;
static void XMLCALL
compatiblefaceitemStartElementHandle(void *userData, const char *name, const char **atts)
compatiblefaceitemStartElementHandle(void *userData, const XML_Char *name, const XML_Char **atts)
{
compatiblefaceitemParseData * pData = (compatiblefaceitemParseData *)userData;
@@ -99,7 +99,7 @@ compatiblefaceitemStartElementHandle(void *userData, const char *name, const cha
}
static void XMLCALL
compatiblefaceitemCharacterDataHandle(void *userData, const char *str, int len)
compatiblefaceitemCharacterDataHandle(void *userData, const XML_Char *str, int len)
{
compatiblefaceitemParseData * pData = (compatiblefaceitemParseData *)userData;
@@ -112,7 +112,7 @@ compatiblefaceitemCharacterDataHandle(void *userData, const char *str, int len)
static void XMLCALL
compatiblefaceitemEndElementHandle(void *userData, const char *name)
compatiblefaceitemEndElementHandle(void *userData, const XML_Char *name)
{
compatiblefaceitemParseData * pData = (compatiblefaceitemParseData *)userData;
Tactical/XML_EnemyAmmoDrops.cpp
+4 -4
View File
@@ -49,7 +49,7 @@ struct
{
PARSE_STAGE curElement;
INT8 szCharData[MAX_CHAR_DATA_LENGTH+1];
CHAR8 szCharData[MAX_CHAR_DATA_LENGTH+1];
AMMO_DROPS curAmmoDrop;
AMMO_DROPS * curArray;
@@ -61,7 +61,7 @@ struct
typedef ammoDropParseData;
static void XMLCALL
ammoDropStartElementHandle(void *userData, const char *name, const char **atts)
ammoDropStartElementHandle(void *userData, const XML_Char *name, const XML_Char **atts)
{
ammoDropParseData * pData = (ammoDropParseData *)userData;
@@ -102,7 +102,7 @@ ammoDropStartElementHandle(void *userData, const char *name, const char **atts)
}
static void XMLCALL
ammoDropCharacterDataHandle(void *userData, const char *str, int len)
ammoDropCharacterDataHandle(void *userData, const XML_Char *str, int len)
{
ammoDropParseData * pData = (ammoDropParseData *)userData;
@@ -115,7 +115,7 @@ ammoDropCharacterDataHandle(void *userData, const char *str, int len)
static void XMLCALL
ammoDropEndElementHandle(void *userData, const char *name)
ammoDropEndElementHandle(void *userData, const XML_Char *name)
{
ammoDropParseData * pData = (ammoDropParseData *)userData;
Tactical/XML_EnemyArmourDrops.cpp
+4 -4
View File
@@ -49,7 +49,7 @@ struct
{
PARSE_STAGE curElement;
INT8 szCharData[MAX_CHAR_DATA_LENGTH+1];
CHAR8 szCharData[MAX_CHAR_DATA_LENGTH+1];
ARMOUR_DROPS curArmourDrop;
ARMOUR_DROPS * curArray;
@@ -61,7 +61,7 @@ struct
typedef armourDropParseData;
static void XMLCALL
armourDropStartElementHandle(void *userData, const char *name, const char **atts)
armourDropStartElementHandle(void *userData, const XML_Char *name, const XML_Char **atts)
{
armourDropParseData * pData = (armourDropParseData *)userData;
@@ -102,7 +102,7 @@ armourDropStartElementHandle(void *userData, const char *name, const char **atts
}
static void XMLCALL
armourDropCharacterDataHandle(void *userData, const char *str, int len)
armourDropCharacterDataHandle(void *userData, const XML_Char *str, int len)
{
armourDropParseData * pData = (armourDropParseData *)userData;
@@ -115,7 +115,7 @@ armourDropCharacterDataHandle(void *userData, const char *str, int len)
static void XMLCALL
armourDropEndElementHandle(void *userData, const char *name)
armourDropEndElementHandle(void *userData, const XML_Char *name)
{
armourDropParseData * pData = (armourDropParseData *)userData;
Tactical/XML_EnemyExplosiveDrops.cpp
+4 -4
View File
@@ -49,7 +49,7 @@ struct
{
PARSE_STAGE curElement;
INT8 szCharData[MAX_CHAR_DATA_LENGTH+1];
CHAR8 szCharData[MAX_CHAR_DATA_LENGTH+1];
EXPLOSIVE_DROPS curExplosiveDrop;
EXPLOSIVE_DROPS * curArray;
@@ -61,7 +61,7 @@ struct
typedef explosiveDropParseData;
static void XMLCALL
explosiveDropStartElementHandle(void *userData, const char *name, const char **atts)
explosiveDropStartElementHandle(void *userData, const XML_Char *name, const XML_Char **atts)
{
explosiveDropParseData * pData = (explosiveDropParseData *)userData;
@@ -102,7 +102,7 @@ explosiveDropStartElementHandle(void *userData, const char *name, const char **a
}
static void XMLCALL
explosiveDropCharacterDataHandle(void *userData, const char *str, int len)
explosiveDropCharacterDataHandle(void *userData, const XML_Char *str, int len)
{
explosiveDropParseData * pData = (explosiveDropParseData *)userData;
@@ -115,7 +115,7 @@ explosiveDropCharacterDataHandle(void *userData, const char *str, int len)
static void XMLCALL
explosiveDropEndElementHandle(void *userData, const char *name)
explosiveDropEndElementHandle(void *userData, const XML_Char *name)
{
explosiveDropParseData * pData = (explosiveDropParseData *)userData;
Tactical/XML_EnemyItemChoice.cpp
+4 -4
View File
@@ -49,7 +49,7 @@ struct
{
PARSE_STAGE curElement;
INT8 szCharData[MAX_CHAR_DATA_LENGTH+1];
CHAR8 szCharData[MAX_CHAR_DATA_LENGTH+1];
ARMY_GUN_CHOICE_TYPE curArmyItemChoices;
ARMY_GUN_CHOICE_TYPE * curArray;
UINT32 maxArraySize;
@@ -60,7 +60,7 @@ struct
typedef armyitemchoicesParseData;
static void XMLCALL
armyitemchoicesStartElementHandle(void *userData, const char *name, const char **atts)
armyitemchoicesStartElementHandle(void *userData, const XML_Char *name, const XML_Char **atts)
{
armyitemchoicesParseData * pData = (armyitemchoicesParseData *)userData;
@@ -149,7 +149,7 @@ armyitemchoicesStartElementHandle(void *userData, const char *name, const char *
}
static void XMLCALL
armyitemchoicesCharacterDataHandle(void *userData, const char *str, int len)
armyitemchoicesCharacterDataHandle(void *userData, const XML_Char *str, int len)
{
armyitemchoicesParseData * pData = (armyitemchoicesParseData *)userData;
@@ -162,7 +162,7 @@ armyitemchoicesCharacterDataHandle(void *userData, const char *str, int len)
static void XMLCALL
armyitemchoicesEndElementHandle(void *userData, const char *name)
armyitemchoicesEndElementHandle(void *userData, const XML_Char *name)
{
armyitemchoicesParseData * pData = (armyitemchoicesParseData *)userData;
Tactical/XML_EnemyMiscDrops.cpp
+4 -4
View File
@@ -49,7 +49,7 @@ struct
{
PARSE_STAGE curElement;
INT8 szCharData[MAX_CHAR_DATA_LENGTH+1];
CHAR8 szCharData[MAX_CHAR_DATA_LENGTH+1];
MISC_DROPS curMiscDrop;
MISC_DROPS * curArray;
@@ -61,7 +61,7 @@ struct
typedef miscDropParseData;
static void XMLCALL
miscDropStartElementHandle(void *userData, const char *name, const char **atts)
miscDropStartElementHandle(void *userData, const XML_Char *name, const XML_Char **atts)
{
miscDropParseData * pData = (miscDropParseData *)userData;
@@ -102,7 +102,7 @@ miscDropStartElementHandle(void *userData, const char *name, const char **atts)
}
static void XMLCALL
miscDropCharacterDataHandle(void *userData, const char *str, int len)
miscDropCharacterDataHandle(void *userData, const XML_Char *str, int len)
{
miscDropParseData * pData = (miscDropParseData *)userData;
@@ -115,7 +115,7 @@ miscDropCharacterDataHandle(void *userData, const char *str, int len)
static void XMLCALL
miscDropEndElementHandle(void *userData, const char *name)
miscDropEndElementHandle(void *userData, const XML_Char *name)
{
miscDropParseData * pData = (miscDropParseData *)userData;
Tactical/XML_EnemyWeaponChoice.cpp
+4 -4
View File
@@ -49,7 +49,7 @@ struct
{
PARSE_STAGE curElement;
INT8 szCharData[MAX_CHAR_DATA_LENGTH+1];
CHAR8 szCharData[MAX_CHAR_DATA_LENGTH+1];
ARMY_GUN_CHOICE_TYPE curExtendedArmyGunChoices;
ARMY_GUN_CHOICE_TYPE * curArray;
UINT32 maxArraySize;
@@ -60,7 +60,7 @@ struct
typedef extendedarmygunchoicesParseData;
static void XMLCALL
extendedarmygunchoicesStartElementHandle(void *userData, const char *name, const char **atts)
extendedarmygunchoicesStartElementHandle(void *userData, const XML_Char *name, const XML_Char **atts)
{
extendedarmygunchoicesParseData * pData = (extendedarmygunchoicesParseData *)userData;
@@ -149,7 +149,7 @@ extendedarmygunchoicesStartElementHandle(void *userData, const char *name, const
}
static void XMLCALL
extendedarmygunchoicesCharacterDataHandle(void *userData, const char *str, int len)
extendedarmygunchoicesCharacterDataHandle(void *userData, const XML_Char *str, int len)
{
extendedarmygunchoicesParseData * pData = (extendedarmygunchoicesParseData *)userData;
@@ -162,7 +162,7 @@ extendedarmygunchoicesCharacterDataHandle(void *userData, const char *str, int l
static void XMLCALL
extendedarmygunchoicesEndElementHandle(void *userData, const char *name)
extendedarmygunchoicesEndElementHandle(void *userData, const XML_Char *name)
{
extendedarmygunchoicesParseData * pData = (extendedarmygunchoicesParseData *)userData;
Tactical/XML_EnemyWeaponDrops.cpp
+4 -4
View File
@@ -49,7 +49,7 @@ struct
{
PARSE_STAGE curElement;
INT8 szCharData[MAX_CHAR_DATA_LENGTH+1];
CHAR8 szCharData[MAX_CHAR_DATA_LENGTH+1];
WEAPON_DROPS curWeaponDrop;
WEAPON_DROPS * curArray;
@@ -61,7 +61,7 @@ struct
typedef weaponDropParseData;
static void XMLCALL
weaponDropStartElementHandle(void *userData, const char *name, const char **atts)
weaponDropStartElementHandle(void *userData, const XML_Char *name, const XML_Char **atts)
{
weaponDropParseData * pData = (weaponDropParseData *)userData;
@@ -102,7 +102,7 @@ weaponDropStartElementHandle(void *userData, const char *name, const char **atts
}
static void XMLCALL
weaponDropCharacterDataHandle(void *userData, const char *str, int len)
weaponDropCharacterDataHandle(void *userData, const XML_Char *str, int len)
{
weaponDropParseData * pData = (weaponDropParseData *)userData;
@@ -115,7 +115,7 @@ weaponDropCharacterDataHandle(void *userData, const char *str, int len)
static void XMLCALL
weaponDropEndElementHandle(void *userData, const char *name)
weaponDropEndElementHandle(void *userData, const XML_Char *name)
{
weaponDropParseData * pData = (weaponDropParseData *)userData;
Tactical/XML_Explosive.cpp
+4 -4
View File
@@ -49,7 +49,7 @@ struct
{
PARSE_STAGE curElement;
INT8 szCharData[MAX_CHAR_DATA_LENGTH+1];
CHAR8 szCharData[MAX_CHAR_DATA_LENGTH+1];
EXPLOSIVETYPE curExplosive;
EXPLOSIVETYPE * curArray;
UINT32 maxArraySize;
@@ -60,7 +60,7 @@ struct
typedef explosiveParseData;
static void XMLCALL
explosiveStartElementHandle(void *userData, const char *name, const char **atts)
explosiveStartElementHandle(void *userData, const XML_Char *name, const XML_Char **atts)
{
explosiveParseData * pData = (explosiveParseData *)userData;
@@ -107,7 +107,7 @@ explosiveStartElementHandle(void *userData, const char *name, const char **atts)
}
static void XMLCALL
explosiveCharacterDataHandle(void *userData, const char *str, int len)
explosiveCharacterDataHandle(void *userData, const XML_Char *str, int len)
{
explosiveParseData * pData = (explosiveParseData *)userData;
@@ -120,7 +120,7 @@ explosiveCharacterDataHandle(void *userData, const char *str, int len)
static void XMLCALL
explosiveEndElementHandle(void *userData, const char *name)
explosiveEndElementHandle(void *userData, const XML_Char *name)
{
explosiveParseData * pData = (explosiveParseData *)userData;
Tactical/XML_IMPItemChoices.cpp
+4 -4
View File
@@ -49,7 +49,7 @@ struct
{
PARSE_STAGE curElement;
INT8 szCharData[MAX_CHAR_DATA_LENGTH+1];
CHAR8 szCharData[MAX_CHAR_DATA_LENGTH+1];
IMP_ITEM_CHOICE_TYPE curIMPItemChoices;
IMP_ITEM_CHOICE_TYPE * curArray;
UINT32 maxArraySize;
@@ -60,7 +60,7 @@ struct
typedef IMPitemchoicesParseData;
static void XMLCALL
IMPitemchoicesStartElementHandle(void *userData, const char *name, const char **atts)
IMPitemchoicesStartElementHandle(void *userData, const XML_Char *name, const XML_Char **atts)
{
IMPitemchoicesParseData * pData = (IMPitemchoicesParseData *)userData;
@@ -150,7 +150,7 @@ IMPitemchoicesStartElementHandle(void *userData, const char *name, const char **
}
static void XMLCALL
IMPitemchoicesCharacterDataHandle(void *userData, const char *str, int len)
IMPitemchoicesCharacterDataHandle(void *userData, const XML_Char *str, int len)
{
IMPitemchoicesParseData * pData = (IMPitemchoicesParseData *)userData;
@@ -163,7 +163,7 @@ IMPitemchoicesCharacterDataHandle(void *userData, const char *str, int len)
static void XMLCALL
IMPitemchoicesEndElementHandle(void *userData, const char *name)
IMPitemchoicesEndElementHandle(void *userData, const XML_Char *name)
{
IMPitemchoicesParseData * pData = (IMPitemchoicesParseData *)userData;
Tactical/XML_IncompatibleAttachments.cpp
+4 -4
View File
@@ -48,7 +48,7 @@ struct
{
PARSE_STAGE curElement;
INT8 szCharData[MAX_CHAR_DATA_LENGTH+1];
CHAR8 szCharData[MAX_CHAR_DATA_LENGTH+1];
UINT16 curIncompatibleAttachment[2];
UINT32 maxArraySize;
@@ -59,7 +59,7 @@ struct
typedef incompatibleattachmentParseData;
static void XMLCALL
incompatibleattachmentStartElementHandle(void *userData, const char *name, const char **atts)
incompatibleattachmentStartElementHandle(void *userData, const XML_Char *name, const XML_Char **atts)
{
incompatibleattachmentParseData * pData = (incompatibleattachmentParseData *)userData;
@@ -99,7 +99,7 @@ incompatibleattachmentStartElementHandle(void *userData, const char *name, const
}
static void XMLCALL
incompatibleattachmentCharacterDataHandle(void *userData, const char *str, int len)
incompatibleattachmentCharacterDataHandle(void *userData, const XML_Char *str, int len)
{
incompatibleattachmentParseData * pData = (incompatibleattachmentParseData *)userData;
@@ -112,7 +112,7 @@ incompatibleattachmentCharacterDataHandle(void *userData, const char *str, int l
static void XMLCALL
incompatibleattachmentEndElementHandle(void *userData, const char *name)
incompatibleattachmentEndElementHandle(void *userData, const XML_Char *name)
{
incompatibleattachmentParseData * pData = (incompatibleattachmentParseData *)userData;
Tactical/XML_Launchable.cpp
+4 -4
View File
@@ -48,7 +48,7 @@ struct
{
PARSE_STAGE curElement;
INT8 szCharData[MAX_CHAR_DATA_LENGTH+1];
CHAR8 szCharData[MAX_CHAR_DATA_LENGTH+1];
UINT16 curLaunchable[2];
UINT32 maxArraySize;
@@ -59,7 +59,7 @@ struct
typedef launchableParseData;
static void XMLCALL
launchableStartElementHandle(void *userData, const char *name, const char **atts)
launchableStartElementHandle(void *userData, const XML_Char *name, const XML_Char **atts)
{
launchableParseData * pData = (launchableParseData *)userData;
@@ -99,7 +99,7 @@ launchableStartElementHandle(void *userData, const char *name, const char **atts
}
static void XMLCALL
launchableCharacterDataHandle(void *userData, const char *str, int len)
launchableCharacterDataHandle(void *userData, const XML_Char *str, int len)
{
launchableParseData * pData = (launchableParseData *)userData;
@@ -112,7 +112,7 @@ launchableCharacterDataHandle(void *userData, const char *str, int len)
static void XMLCALL
launchableEndElementHandle(void *userData, const char *name)
launchableEndElementHandle(void *userData, const XML_Char *name)
{
launchableParseData * pData = (launchableParseData *)userData;
Tactical/XML_Magazine.cpp
+4 -4
View File
@@ -49,7 +49,7 @@ struct
{
PARSE_STAGE curElement;
INT8 szCharData[MAX_CHAR_DATA_LENGTH+1];
CHAR8 szCharData[MAX_CHAR_DATA_LENGTH+1];
MAGTYPE curMagazine;
MAGTYPE * curArray;
UINT32 maxArraySize;
@@ -60,7 +60,7 @@ struct
typedef magazineParseData;
static void XMLCALL
magazineStartElementHandle(void *userData, const char *name, const char **atts)
magazineStartElementHandle(void *userData, const XML_Char *name, const XML_Char **atts)
{
magazineParseData * pData = (magazineParseData *)userData;
@@ -101,7 +101,7 @@ magazineStartElementHandle(void *userData, const char *name, const char **atts)
}
static void XMLCALL
magazineCharacterDataHandle(void *userData, const char *str, int len)
magazineCharacterDataHandle(void *userData, const XML_Char *str, int len)
{
magazineParseData * pData = (magazineParseData *)userData;
@@ -114,7 +114,7 @@ magazineCharacterDataHandle(void *userData, const char *str, int len)
static void XMLCALL
magazineEndElementHandle(void *userData, const char *name)
magazineEndElementHandle(void *userData, const XML_Char *name)
{
magazineParseData * pData = (magazineParseData *)userData;
Tactical/XML_Merge.cpp
+4 -4
View File
@@ -48,7 +48,7 @@ struct
{
PARSE_STAGE curElement;
INT8 szCharData[MAX_CHAR_DATA_LENGTH+1];
CHAR8 szCharData[MAX_CHAR_DATA_LENGTH+1];
UINT16 curMerge[6];
UINT32 maxArraySize;
@@ -59,7 +59,7 @@ struct
typedef mergeParseData;
static void XMLCALL
mergeStartElementHandle(void *userData, const char *name, const char **atts)
mergeStartElementHandle(void *userData, const XML_Char *name, const XML_Char **atts)
{
mergeParseData * pData = (mergeParseData *)userData;
@@ -103,7 +103,7 @@ mergeStartElementHandle(void *userData, const char *name, const char **atts)
}
static void XMLCALL
mergeCharacterDataHandle(void *userData, const char *str, int len)
mergeCharacterDataHandle(void *userData, const XML_Char *str, int len)
{
mergeParseData * pData = (mergeParseData *)userData;
@@ -116,7 +116,7 @@ mergeCharacterDataHandle(void *userData, const char *str, int len)
static void XMLCALL
mergeEndElementHandle(void *userData, const char *name)
mergeEndElementHandle(void *userData, const XML_Char *name)
{
mergeParseData * pData = (mergeParseData *)userData;
Tactical/XML_Sounds.cpp
+5 -5
View File
@@ -48,7 +48,7 @@ struct
{
PARSE_STAGE curElement;
INT8 szCharData[MAX_CHAR_DATA_LENGTH+1];
CHAR8 szCharData[MAX_CHAR_DATA_LENGTH+1];
UINT32 maxArraySize;
UINT32 curIndex;
@@ -58,7 +58,7 @@ struct
typedef soundParseData;
static void XMLCALL
soundStartElementHandle(void *userData, const char *name, const char **atts)
soundStartElementHandle(void *userData, const XML_Char *name, const XML_Char **atts)
{
soundParseData * pData = (soundParseData *)userData;
@@ -86,7 +86,7 @@ soundStartElementHandle(void *userData, const char *name, const char **atts)
}
static void XMLCALL
soundCharacterDataHandle(void *userData, const char *str, int len)
soundCharacterDataHandle(void *userData, const XML_Char *str, int len)
{
soundParseData * pData = (soundParseData *)userData;
@@ -99,7 +99,7 @@ soundCharacterDataHandle(void *userData, const char *str, int len)
static void XMLCALL
soundEndElementHandle(void *userData, const char *name)
soundEndElementHandle(void *userData, const XML_Char *name)
{
soundParseData * pData = (soundParseData *)userData;
@@ -212,7 +212,7 @@ BOOLEAN WriteSoundArray()
{
FilePrintf(hFile,"\t<SOUND>");
char * szRemainder = szSoundEffects[cnt]; //the remaining string to be output (for making valid XML)
STR8 szRemainder = szSoundEffects[cnt]; //the remaining string to be output (for making valid XML)
while(szRemainder[0] != '\0')
{
Tactical/XML_TonyInventory.cpp
+4 -4
View File
@@ -49,7 +49,7 @@ struct
{
PARSE_STAGE curElement;
INT8 szCharData[MAX_CHAR_DATA_LENGTH+1];
CHAR8 szCharData[MAX_CHAR_DATA_LENGTH+1];
DEALER_POSSIBLE_INV curInventory;
DEALER_POSSIBLE_INV * curArray;
UINT32 maxArraySize;
@@ -60,7 +60,7 @@ struct
typedef inventoryParseData;
static void XMLCALL
inventoryStartElementHandle(void *userData, const char *name, const char **atts)
inventoryStartElementHandle(void *userData, const XML_Char *name, const XML_Char **atts)
{
inventoryParseData * pData = (inventoryParseData *)userData;
@@ -100,7 +100,7 @@ inventoryStartElementHandle(void *userData, const char *name, const char **atts)
}
static void XMLCALL
inventoryCharacterDataHandle(void *userData, const char *str, int len)
inventoryCharacterDataHandle(void *userData, const XML_Char *str, int len)
{
inventoryParseData * pData = (inventoryParseData *)userData;
@@ -113,7 +113,7 @@ inventoryCharacterDataHandle(void *userData, const char *str, int len)
static void XMLCALL
inventoryEndElementHandle(void *userData, const char *name)
inventoryEndElementHandle(void *userData, const XML_Char *name)
{
inventoryParseData * pData = (inventoryParseData *)userData;
Tactical/interface Dialogue.h
+1 -1
View File
@@ -39,7 +39,7 @@ typedef struct
BOOLEAN fHandledCanDeleteVal;
BOOLEAN fRenderSubTitlesNow;
BOOLEAN fSetupSubTitles;
INT16 zQuoteStr[ 480 ]; //QIALOGUE_SIZE is in dialog control which includes this file...
CHAR16 zQuoteStr[ 480 ]; //QIALOGUE_SIZE is in dialog control which includes this file...
} NPC_DIALOGUE_TYPE;
Tactical/opplist.cpp
+6 -6
View File
@@ -4313,7 +4313,7 @@ void DebugSoldierPage3( )
}
void AppendAttachmentCode( UINT16 usItem, wchar_t *str )
void AppendAttachmentCode( UINT16 usItem, STR16 str )
{
switch( usItem )
{
@@ -4334,7 +4334,7 @@ void AppendAttachmentCode( UINT16 usItem, wchar_t *str )
void WriteQuantityAndAttachments( OBJECTTYPE *pObject, INT32 yp )
{
wchar_t szAttach[30];
CHAR16 szAttach[30];
BOOLEAN fAttachments;
//100% Qty: 2 Attach:
//100% Qty: 2
@@ -4360,8 +4360,8 @@ void WriteQuantityAndAttachments( OBJECTTYPE *pObject, INT32 yp )
{ //ammo
if( pObject->ubNumberOfObjects > 1 )
{
wchar_t str[50];
wchar_t temp[5];
CHAR16 str[50];
CHAR16 temp[5];
UINT8 i;
swprintf( str, L"Clips: %d (%d", pObject->ubNumberOfObjects, pObject->bStatus[0] );
for( i = 1; i < pObject->ubNumberOfObjects; i++ )
@@ -4400,8 +4400,8 @@ void DebugSoldierPage4( )
{
SOLDIERTYPE *pSoldier;
UINT32 uiMercFlags;
wchar_t szOrders[20];
wchar_t szAttitude[20];
CHAR16 szOrders[20];
CHAR16 szAttitude[20];
UINT16 usSoldierIndex;
UINT8 ubLine;
Tactical/soldier profile type.h
+2 -2
View File
@@ -161,8 +161,8 @@ typedef enum{
typedef struct
{
wchar_t zName[ NAME_LENGTH ];
wchar_t zNickname[ NICKNAME_LENGTH ];
CHAR16 zName[ NAME_LENGTH ];
CHAR16 zNickname[ NICKNAME_LENGTH ];
UINT32 uiAttnSound;
UINT32 uiCurseSound;
UINT32 uiDieSound;