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

Convert to SoldierID

Browse Source
This commit is contained in:
Asdow
2024-11-17 19:41:34 +02:00
parent 74d752d452
commit 9532fbfe2c
6 changed files with 112 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Dialogue Control.cpp
+2 -2
View File
@@ -1992,7 +1992,7 @@ BOOLEAN SpecialCharacterDialogueEventWithExtraParam( UINT32 uiSpecialEventFlag,
}
extern INT8 gbSelectedArmsDealerID;
extern UINT16 gusIDOfCivTrader;
extern SoldierID gusIDOfCivTrader;
BOOLEAN ExecuteCharacterDialogue( UINT8 ubCharacterNum, UINT16 usQuoteNum, INT32 iFaceIndex, UINT8 bUIHandlerID, BOOLEAN fFromSoldier )
{
@@ -2107,7 +2107,7 @@ BOOLEAN ExecuteCharacterDialogue( UINT8 ubCharacterNum, UINT16 usQuoteNum, INT32
&& iFaceIndex == -1
&& gusIDOfCivTrader != NOBODY )
{
SOLDIERTYPE* pShopkeeper = MercPtrs[gusIDOfCivTrader];
SOLDIERTYPE* pShopkeeper = gusIDOfCivTrader;
if ( pShopkeeper )
{