From ece5d551c128e4c2f31e36d9fba058bce8ac1b74 Mon Sep 17 00:00:00 2001
From: AalaarDB <AalaarDB@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Fri, 28 Sep 2007 00:38:47 +0000
Subject: [PATCH] Fixed bug where if a merc with an extended ear, and out of
 normal talking range, tried to interact with a shopkeeper the game would
 crash. Now the merc will run up to the shopkeeper and then interact.

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

diff --git a/Tactical/ShopKeeper Interface.cpp b/Tactical/ShopKeeper Interface.cpp
index bf969f73c..8fedb68a1 100644
--- a/Tactical/ShopKeeper Interface.cpp	
+++ b/Tactical/ShopKeeper Interface.cpp	
@@ -51,6 +51,8 @@
 	#include "los.h"
 	#include "NPC.h"
 	#include "Soldier Create.h"
+	#include "PATHAI.h"
+	#include "Points.h"
 #endif
 
 #include "BuildDefines.h"
@@ -707,6 +709,8 @@ UINT32	ShopKeeperScreenHandle()
 		{
 			gfSKIScreenExit = TRUE;
 			EnterTacticalScreen( );
+			//ADB if we fail, unpause the game
+			UnPauseGame();
 
 			return( SHOPKEEPER_SCREEN );
 		}
@@ -817,7 +821,62 @@ BOOLEAN EnterShopKeeperInterface()
 	UINT8						ubCnt;
 	CHAR8						zTemp[32];
 	VSURFACE_DESC		vs_desc;
-	SOLDIERTYPE			*pSoldier;
+
+	//ADB if we are here, we must be able to talk with an extended ear (CheckIfRadioIsEquipped())
+	//but if we are physically too far away, we don't have extended arms!
+
+	SOLDIERTYPE* pSoldier = MercPtrs[ gusSelectedSoldier ];
+	SOLDIERTYPE* pShopkeeper = FindSoldierByProfileID( ArmsDealerInfo[ gbSelectedArmsDealerID ].ubShopKeeperID, FALSE );
+	if ( GetRangeFromGridNoDiff( pSoldier->sGridNo, pShopkeeper->sGridNo ) > NPC_TALK_RADIUS )
+	{
+		//so now we know we are too far away to trade, so instead of just quitting,
+		//either post a message or run to the guy like HandleTalkInit does
+		if( (gTacticalStatus.uiFlags & TURNBASED) && (gTacticalStatus.uiFlags & INCOMBAT) )	
+		{
+			ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_UI_FEEDBACK, L"Unable to interact with shopkeeper during combat" );
+			return( FALSE );
+		}
+		else
+		{
+			// First calculate APs and validate...
+			// Check AP cost...
+			if ( !EnoughPoints( pSoldier, AP_TALK, 0, TRUE ) )
+			{
+				return( FALSE );
+			}
+
+			// First get an adjacent gridno....
+			UINT8 ubDirection;
+			INT16 sActionGridNo =  FindAdjacentGridEx( pSoldier, pShopkeeper->sGridNo, &ubDirection, NULL, FALSE, TRUE );
+
+			if ( sActionGridNo == -1 )
+			{
+				ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_UI_FEEDBACK, TacticalStr[ NO_PATH ] );
+				return( FALSE );
+			}
+
+			if ( UIPlotPath( pSoldier, sActionGridNo, NO_COPYROUTE, FALSE, TEMPORARY, (UINT16)pSoldier->usUIMovementMode, NOT_STEALTH, FORWARD, pSoldier->bActionPoints ) == 0 )
+			{
+				ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_UI_FEEDBACK, TacticalStr[ NO_PATH ] );
+				return( FALSE );
+			}
+
+			// Walk up and talk to buddy....
+			gfNPCCircularDistLimit = TRUE;
+			INT16 sGoodGridNo = FindGridNoFromSweetSpotWithStructData( pSoldier, pSoldier->usUIMovementMode, pShopkeeper->sGridNo, (NPC_TALK_RADIUS-1), &ubDirection, TRUE );
+			gfNPCCircularDistLimit = FALSE;
+
+			// Now walkup to talk....
+			pSoldier->ubPendingAction = MERC_TALK;
+			pSoldier->uiPendingActionData1 = pShopkeeper->ubID;
+			pSoldier->ubPendingActionAnimCount = 0;
+
+			// WALK UP TO DEST FIRST
+			EVENT_InternalGetNewSoldierPath( pSoldier, sGoodGridNo, pSoldier->usUIMovementMode , TRUE , pSoldier->fNoAPToFinishMove );					
+
+			return( FALSE );
+		}
+	}
 
 
 	// make sure current merc is close enough and eligible to talk to the shopkeeper.