From 1fd143711cb78be06096885f8631a7772f64b957 Mon Sep 17 00:00:00 2001
From: Asdow <20314541+Asdow@users.noreply.github.com>
Date: Sat, 22 Nov 2025 17:10:31 +0200
Subject: [PATCH] Fix nullptr dereference when spotting mines

---
 Tactical/Overhead.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Tactical/Overhead.cpp b/Tactical/Overhead.cpp
index 7852df8be..3a4844376 100644
--- a/Tactical/Overhead.cpp
+++ b/Tactical/Overhead.cpp
@@ -2269,15 +2269,15 @@ BOOLEAN HandleGotoNewGridNo( SOLDIERTYPE *pSoldier, BOOLEAN *pfKeepMoving, BOOLE
             if ( !( gTacticalStatus.uiFlags & INCOMBAT ) )
             {
                 SOLDIERTYPE *pSoldier2;
-                SoldierID id = gTacticalStatus.Team[ gbPlayerNum ].bLastID;
+                SoldierID id = gTacticalStatus.Team[gbPlayerNum].bFirstID;
 
                 // look for all mercs on the same team,
-                for ( ; id >= gTacticalStatus.Team[ gbPlayerNum ].bFirstID; --id )
+                for ( ; id < gTacticalStatus.Team[gbPlayerNum].bLastID; ++id )
                 {
                     pSoldier2 = id;
                     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 ) )
             {
                 SOLDIERTYPE *pSoldier2;
-                SoldierID cnt2 = gTacticalStatus.Team[ gbPlayerNum ].bLastID;
+                SoldierID cnt2 = gTacticalStatus.Team[ gbPlayerNum ].bFirstID;
 
                 // look for all mercs on the same team,
-                for ( ; cnt2 >= gTacticalStatus.Team[ gbPlayerNum ].bFirstID; --cnt2 )
+                for ( ; cnt2 < gTacticalStatus.Team[gbPlayerNum].bLastID; ++cnt2 )
                 {
                     pSoldier2 = cnt2;
                     if ( pSoldier2->bActive )
                     {
-                        pSoldier2->EVENT_StopMerc( pSoldier2->sGridNo, pSoldier2->ubDirection );
+                        pSoldier2->EVENT_StopMerc(pSoldier2->sGridNo, pSoldier2->ubDirection);
                     }
                 }
             }