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

Use SoldierID

Browse Source
This commit is contained in:
Asdow
2024-11-21 23:56:44 +02:00
parent 1ac5d153fb
commit 0d97e36c34
22 changed files with 218 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Interface Dialogue.cpp
+8 -8
View File
@@ -3224,7 +3224,7 @@ void HandleNPCDoAction( UINT8 ubTargetNPC, UINT16 usActionCode, UINT8 ubQuoteNum
if ( pSoldier )
{
INT32 sNearestPC;
UINT16 ubID;
SoldierID ubID;
INT8 bMoneySlot;
INT8 bEmptySlot;
@@ -3235,7 +3235,7 @@ void HandleNPCDoAction( UINT8 ubTargetNPC, UINT16 usActionCode, UINT8 ubQuoteNum
ubID = WhoIsThere2( sNearestPC, 0 );
if (ubID != NOBODY)
{
pSoldier2 = MercPtrs[ ubID ];
pSoldier2 = ubID;
}
}
@@ -3357,7 +3357,7 @@ void HandleNPCDoAction( UINT8 ubTargetNPC, UINT16 usActionCode, UINT8 ubQuoteNum
pSoldier = FindSoldierByProfileID( ubTargetNPC, FALSE );
if (pSoldier)
{
UINT16 ubTargetID;
SoldierID ubTargetID;
SOLDIERTYPE *pTarget;
// Target a different merc....
@@ -3384,7 +3384,7 @@ void HandleNPCDoAction( UINT8 ubTargetNPC, UINT16 usActionCode, UINT8 ubQuoteNum
}
else
{
pTarget = MercPtrs[ ubTargetID ];
pTarget = ubTargetID;
}
// Use a different approach....
@@ -3477,7 +3477,7 @@ void HandleNPCDoAction( UINT8 ubTargetNPC, UINT16 usActionCode, UINT8 ubQuoteNum
pSoldier = FindSoldierByProfileID( ubTargetNPC, FALSE );
if (pSoldier)
{
UINT16 ubTargetID;
SoldierID ubTargetID;
SOLDIERTYPE *pTarget;
INT32 cnt;
BOOLEAN fGoodTarget = FALSE;
@@ -3491,7 +3491,7 @@ void HandleNPCDoAction( UINT8 ubTargetNPC, UINT16 usActionCode, UINT8 ubQuoteNum
}
else
{
pTarget = MercPtrs[ ubTargetID ];
pTarget = ubTargetID;
}
pSoldier->aiData.uiPendingActionData4 = APPROACH_DONE_PUNCH_1;
@@ -3901,7 +3901,7 @@ void HandleNPCDoAction( UINT8 ubTargetNPC, UINT16 usActionCode, UINT8 ubQuoteNum
if ( !gfInTalkPanel )
{
INT32 sNearestPC;
UINT16 ubID;
SoldierID ubID;
pSoldier = FindSoldierByProfileID( ubTargetNPC, FALSE );
if ( pSoldier )
@@ -3914,7 +3914,7 @@ void HandleNPCDoAction( UINT8 ubTargetNPC, UINT16 usActionCode, UINT8 ubQuoteNum
ubID = WhoIsThere2( sNearestPC, 0 );
if (ubID != NOBODY)
{
pSoldier2 = MercPtrs[ ubID ];
pSoldier2 = ubID;
}
}