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

Use SoldierID instead of pSoldier

Browse Source 
ContinueDialogue was possible to be called with pSoldier that isn't null but is not valid pointer to MercPtrs array resulting in debugger catching an illegal memory access.
This commit is contained in:
Asdow
2025-09-25 22:47:51 +03:00
parent e14a337e03
commit f5a7c32bff
2 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/mapscreen.cpp
+4 -8
View File
@@ -863,7 +863,7 @@ extern BOOLEAN CanPlayerUseSectorInventory( SOLDIERTYPE *pSelectedSoldier );
// handle talking
void HandleSpontanousTalking( void );
BOOLEAN ContinueDialogue(SOLDIERTYPE *pSoldier, BOOLEAN fDone );
BOOLEAN ContinueDialogue(SoldierID id, BOOLEAN fDone );
extern void CreateDestroyMilitiaSectorButtons( void );
extern void CreateDestroySupplySectorButtons();
@@ -13098,17 +13098,13 @@ void UpdatePausedStatesDueToTimeCompression( void )
}
BOOLEAN ContinueDialogue(SOLDIERTYPE *pSoldier, BOOLEAN fDone )
BOOLEAN ContinueDialogue(SoldierID id, BOOLEAN fDone )
{
// continue this grunts dialogue, restore when done
static INT16 bOldSelectedInfoChar = -1;
static BOOLEAN fTalkingingGuy = FALSE;
UINT16 bCounter = 0;
if( fDone == TRUE )
{
if( fTalkingingGuy == TRUE )
@@ -13131,7 +13127,7 @@ BOOLEAN ContinueDialogue(SOLDIERTYPE *pSoldier, BOOLEAN fDone )
}
// check if valid character talking?
if( pSoldier == NULL )
if( id >= NOBODY )
{
return FALSE;
}
@@ -13141,7 +13137,7 @@ BOOLEAN ContinueDialogue(SOLDIERTYPE *pSoldier, BOOLEAN fDone )
{
if( gCharactersList[bCounter].fValid == TRUE )
{
if( gCharactersList[bCounter].usSolID == pSoldier->ubID )
if( gCharactersList[bCounter].usSolID == id )
{
if( bSelectedInfoChar != bCounter )
{
Tactical/Dialogue Control.cpp
+3 -4
View File
@@ -203,7 +203,7 @@ void RenderSubtitleBoxOverlay( VIDEO_OVERLAY *pBlitter );
void RenderFaceOverlay( VIDEO_OVERLAY *pBlitter );
extern BOOLEAN ContinueDialogue(SOLDIERTYPE *pSoldier, BOOLEAN fDone );
extern BOOLEAN ContinueDialogue(SoldierID id, BOOLEAN fDone );
extern void HandlePendingInitConv( );
extern BOOLEAN WillMercRenew( SOLDIERTYPE *pSoldier, BOOLEAN fSayQuote );
extern void DrawFace( INT16 sCharNumber );
@@ -253,7 +253,7 @@ void HandleExternNPCSpeechFace( INT32 iIndex );
extern BOOLEAN ContinueDialogue(SOLDIERTYPE *pSoldier, BOOLEAN fDone );
extern BOOLEAN ContinueDialogue(SoldierID id, BOOLEAN fDone );
extern BOOLEAN DoSkiMessageBox( UINT8 ubStyle, STR16 zString, UINT32 uiExitScreen, UINT8 ubFlags, MSGBOX_CALLBACK ReturnCallback );
@@ -3005,10 +3005,9 @@ void HandleTacticalSpeechUI( UINT8 ubCharacterNum, INT32 iFaceIndex )
// If so, set current guy active to talk.....
if ( pSoldier != NULL )
{
ContinueDialogue( pSoldier, FALSE );
ContinueDialogue( pSoldier->ubID, FALSE );
}
}
}