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

Fix nullptr dereference when spotting mines

Browse Source
This commit is contained in:
Asdow
2025-11-22 17:10:58 +02:00
parent 3061237e58
commit 4e24a6b9ba
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Overhead.cpp
+6 -6
View File
@@ -2269,15 +2269,15 @@ BOOLEAN HandleGotoNewGridNo( SOLDIERTYPE *pSoldier, BOOLEAN *pfKeepMoving, BOOLE
if ( !( gTacticalStatus.uiFlags & INCOMBAT ) ) if ( !( gTacticalStatus.uiFlags & INCOMBAT ) )
{ {
SOLDIERTYPE *pSoldier2; SOLDIERTYPE *pSoldier2;
SoldierID id = gTacticalStatus.Team[ gbPlayerNum ].bLastID; SoldierID id = gTacticalStatus.Team[gbPlayerNum].bFirstID;
// look for all mercs on the same team, // look for all mercs on the same team,
for ( ; id >= gTacticalStatus.Team[ gbPlayerNum ].bFirstID; --id ) for ( ; id < gTacticalStatus.Team[gbPlayerNum].bLastID; ++id )
{ {
pSoldier2 = id; pSoldier2 = id;
if ( pSoldier2->bActive ) if ( pSoldier2->bActive )
{ {
pSoldier2->EVENT_StopMerc( pSoldier2->sGridNo, pSoldier2->ubDirection ); pSoldier2->EVENT_StopMerc(pSoldier2->sGridNo, pSoldier2->ubDirection);
} }
} }
} }
@@ -2975,15 +2975,15 @@ BOOLEAN HandleAtNewGridNo( SOLDIERTYPE *pSoldier, BOOLEAN *pfKeepMoving )
if ( !( gTacticalStatus.uiFlags & INCOMBAT ) ) if ( !( gTacticalStatus.uiFlags & INCOMBAT ) )
{ {
SOLDIERTYPE *pSoldier2; SOLDIERTYPE *pSoldier2;
SoldierID cnt2 = gTacticalStatus.Team[ gbPlayerNum ].bLastID; SoldierID cnt2 = gTacticalStatus.Team[ gbPlayerNum ].bFirstID;
// look for all mercs on the same team, // look for all mercs on the same team,
for ( ; cnt2 >= gTacticalStatus.Team[ gbPlayerNum ].bFirstID; --cnt2 ) for ( ; cnt2 < gTacticalStatus.Team[gbPlayerNum].bLastID; ++cnt2 )
{ {
pSoldier2 = cnt2; pSoldier2 = cnt2;
if ( pSoldier2->bActive ) if ( pSoldier2->bActive )
{ {
pSoldier2->EVENT_StopMerc( pSoldier2->sGridNo, pSoldier2->ubDirection ); pSoldier2->EVENT_StopMerc(pSoldier2->sGridNo, pSoldier2->ubDirection);
} }
} }
} }