From 689cbbc5abb7e63dfe63aafcba6d828e11c92e82 Mon Sep 17 00:00:00 2001
From: Wanne <Wanne@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Tue, 3 Dec 2013 15:25:10 +0000
Subject: [PATCH] - Fixed mouse cursor issue when calling sector inventory
 using hotkey in MovementPlottingMode and ChangeArrivalSectorMode (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6678 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 Strategic/Map Screen Interface Border.cpp | 12 ++++++++++++
 Strategic/mapscreen.cpp                   |  9 +++++++++
 Strategic/mapscreen.h                     |  1 +
 3 files changed, 22 insertions(+)

diff --git a/Strategic/Map Screen Interface Border.cpp b/Strategic/Map Screen Interface Border.cpp
index 5e22177b..64584542 100644
--- a/Strategic/Map Screen Interface Border.cpp	
+++ b/Strategic/Map Screen Interface Border.cpp	
@@ -987,6 +987,10 @@ void ToggleAirspaceMode( void )
 		{
 			AbortMovementPlottingMode( );
 		}
+		else if ( gfInChangeArrivalSectorMode )
+		{
+			CancelChangeArrivalSectorMode( );
+		}
 
 		// dirty regions
 		fMapPanelDirty = TRUE;
@@ -1621,6 +1625,10 @@ void TurnOnItemFilterMode( void )
 		{
 			AbortMovementPlottingMode( );
 		}
+		else if ( gfInChangeArrivalSectorMode )
+		{
+			CancelChangeArrivalSectorMode( );
+		}
 
 		// dirty regions
 		fMapPanelDirty = TRUE;
@@ -1672,6 +1680,10 @@ void TurnOnMobileFilterMode( void )
 		{
 			AbortMovementPlottingMode( );
 		}
+		else if ( gfInChangeArrivalSectorMode )
+		{
+			CancelChangeArrivalSectorMode( );
+		}
 
 		STR16 pwString = NULL;
 
diff --git a/Strategic/mapscreen.cpp b/Strategic/mapscreen.cpp
index 99dd51d0..3116d95e 100644
--- a/Strategic/mapscreen.cpp
+++ b/Strategic/mapscreen.cpp
@@ -8107,6 +8107,15 @@ void GetMapKeyboardInput( UINT32 *puiNewEvent )
 					// if not already in sector inventory
 					if ( !fShowMapInventoryPool )
 					{
+						if( ( bSelectedDestChar != -1 ) || ( fPlotForHelicopter == TRUE ) )
+						{
+							AbortMovementPlottingMode( );
+						}
+						else if ( gfInChangeArrivalSectorMode )
+						{
+							CancelChangeArrivalSectorMode( );
+						}
+
 						// show sector inventory for selected sector
 						ChangeSelectedMapSector( sSelMapX, sSelMapY, ( INT8 ) iCurrentMapSectorZ );
 
diff --git a/Strategic/mapscreen.h b/Strategic/mapscreen.h
index 7ca9a52f..a825b103 100644
--- a/Strategic/mapscreen.h
+++ b/Strategic/mapscreen.h
@@ -84,6 +84,7 @@ void CancelPathsOfAllSelectedCharacters();
 INT32 GetPathTravelTimeDuringPlotting( PathStPtr pPath );
 
 void AbortMovementPlottingMode( void );
+void CancelChangeArrivalSectorMode( void );
 
 void ExplainWhySkyriderCantFly( void );