From 433a41f03b76e449532618734a54cb8534f3d250 Mon Sep 17 00:00:00 2001
From: Flugente <Flugente@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Mon, 14 Jun 2021 21:05:59 +0000
Subject: [PATCH] Fix: use of uninitialized variables

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9083 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 Tactical/Handle UI.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Tactical/Handle UI.cpp b/Tactical/Handle UI.cpp
index d89a4f1d..4c2b2c70 100644
--- a/Tactical/Handle UI.cpp	
+++ b/Tactical/Handle UI.cpp	
@@ -2790,6 +2790,7 @@ void UIHandleMercAttack( SOLDIERTYPE *pSoldier , SOLDIERTYPE *pTargetSoldier, IN
 	{
 		sTargetGridNo		= pTargetSoldier->sGridNo;
 		bTargetLevel	= pTargetSoldier->pathing.bLevel;
+		sGridNo = sTargetGridNo;
 	}
 	else
 	{
@@ -2817,7 +2818,7 @@ void UIHandleMercAttack( SOLDIERTYPE *pSoldier , SOLDIERTYPE *pTargetSoldier, IN
 	if ( pIntNode != NULL	)
 	{
 		// Are we in the same gridno?
-		if ( sGridNo == pSoldier->sGridNo && ubItemCursor != AIDCURS )
+		if ( sGridNo == pSoldier->sGridNo && ubItemCursor != AIDCURS && pStructure )
 		{
 			// Get orientation....
 			switch( pStructure->ubWallOrientation )