1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-16 14:47:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use SoldierID for checks

Browse Source
This commit is contained in:
Asdow
2025-09-28 00:34:07 +03:00
parent 35984f57d0
commit fb34eb6776
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/ShopKeeper Interface.cpp
+4 -4
View File
@@ -1173,10 +1173,10 @@ BOOLEAN ExitShopKeeperInterface()
if( gubQuest[ QUEST_FIX_LAPTOP ] == QUESTDONE && !( gJa25SaveStruct.uiJa25GeneralFlags & JA_GF__PLAYER_SAID_LAPTOP_FIXED_QUOTE ) ) if( gubQuest[ QUEST_FIX_LAPTOP ] == QUESTDONE && !( gJa25SaveStruct.uiJa25GeneralFlags & JA_GF__PLAYER_SAID_LAPTOP_FIXED_QUOTE ) )
{ {
//Have a new merc say a quote //Have a new merc say a quote
INT16 bSoldierID = RandomSoldierIdFromNewMercsOnPlayerTeam(); SoldierID bSoldierID = RandomSoldierIdFromNewMercsOnPlayerTeam();
if( bSoldierID > -1 ) if( bSoldierID != NOBODY )
{ {
TacticalCharacterDialogue( &Menptr[bSoldierID], QUOTE_JA2UB_LAPTOP_FIXED ); TacticalCharacterDialogue( bSoldierID, QUOTE_JA2UB_LAPTOP_FIXED );
} }
gJa25SaveStruct.uiJa25GeneralFlags |= JA_GF__PLAYER_SAID_LAPTOP_FIXED_QUOTE; gJa25SaveStruct.uiJa25GeneralFlags |= JA_GF__PLAYER_SAID_LAPTOP_FIXED_QUOTE;
@@ -6538,7 +6538,7 @@ BOOLEAN SKITryToReturnInvToOwnerOrCurrentMerc( INVENTORY_IN_SLOT *pInv )
{ {
SoldierID sSoldierID = GetSoldierIDFromMercID( pInv->ubIdOfMercWhoOwnsTheItem ); SoldierID sSoldierID = GetSoldierIDFromMercID( pInv->ubIdOfMercWhoOwnsTheItem );
// if that soldier is not in player's hire any longer // if that soldier is not in player's hire any longer
if ( sSoldierID == -1 ) if ( sSoldierID >= NOBODY )
{ {
return(FALSE); return(FALSE);
} }