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

Convert SOLDIERTYPE->ubNextToPreviousAttackerID to SoldierID

Browse Source
This commit is contained in:
Asdow
2024-11-15 22:58:25 +02:00
parent 131172e41a
commit 8346d5bfa1
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Multiplayer/client.cpp
+3 -3
View File
@@ -3848,7 +3848,7 @@ void send_death( SOLDIERTYPE *pSoldier )
{ {
if (pSoldier->ubPreviousAttackerID < NOBODY) if (pSoldier->ubPreviousAttackerID < NOBODY)
nDeath.attacker_id = pSoldier->ubPreviousAttackerID; nDeath.attacker_id = pSoldier->ubPreviousAttackerID;
else if (pSoldier->ubNextToPreviousAttackerID != NOBODY && pSoldier->ubNextToPreviousAttackerID != NULL) else if (pSoldier->ubNextToPreviousAttackerID < NOBODY)
nDeath.attacker_id = pSoldier->ubNextToPreviousAttackerID; nDeath.attacker_id = pSoldier->ubNextToPreviousAttackerID;
} }
@@ -3867,8 +3867,8 @@ void send_death( SOLDIERTYPE *pSoldier )
{ {
pAttacker = pSoldier->ubPreviousAttackerID; pAttacker = pSoldier->ubPreviousAttackerID;
// check if the new attacker was also a friendly... // check if the new attacker was also a friendly...
if (pAttacker->bTeam == pSoldier->bTeam && pSoldier->ubNextToPreviousAttackerID != NULL && pSoldier->ubNextToPreviousAttackerID != NOBODY) if (pAttacker->bTeam == pSoldier->bTeam && pSoldier->ubNextToPreviousAttackerID < NOBODY)
pAttacker=MercPtrs[ pSoldier->ubNextToPreviousAttackerID ]; pAttacker = pSoldier->ubNextToPreviousAttackerID;
// if its still a friendly, use the original attacker id...for posterity // if its still a friendly, use the original attacker id...for posterity
// guy must snore too loudly if all his mates wanna kill him :) // guy must snore too loudly if all his mates wanna kill him :)
if (pAttacker->bTeam == pSoldier->bTeam && pSoldier->ubAttackerID != NOBODY) if (pAttacker->bTeam == pSoldier->bTeam && pSoldier->ubAttackerID != NOBODY)
Tactical/Soldier Control.h
+1 -1
View File
@@ -1504,7 +1504,7 @@ public:
UINT8 ubLastDamageReason; UINT8 ubLastDamageReason;
INT32 sLastTwoLocations[2]; INT32 sLastTwoLocations[2];
INT32 uiTimeSinceLastBleedGrunt; INT32 uiTimeSinceLastBleedGrunt;
UINT16 ubNextToPreviousAttackerID; SoldierID ubNextToPreviousAttackerID;
UINT8 bDoAutofire; UINT8 bDoAutofire;
INT8 numFlanks; INT8 numFlanks;
INT32 lastFlankSpot; INT32 lastFlankSpot;