From 9f18ebb3822723a20e004ba1144cd64ddbd61c80 Mon Sep 17 00:00:00 2001
From: Shadooow <Shadooow@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Sun, 17 Oct 2021 21:58:13 +0000
Subject: [PATCH] fix: mercs in a helicopter can initiate movement by clicking
 in their destination column, like regular on-foot/in-car movement (by rfrt)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9185 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 Strategic/Map Screen Interface.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Strategic/Map Screen Interface.cpp b/Strategic/Map Screen Interface.cpp
index 41d80d3f..fd716b24 100644
--- a/Strategic/Map Screen Interface.cpp	
+++ b/Strategic/Map Screen Interface.cpp	
@@ -6003,15 +6003,16 @@ BOOLEAN CanCharacterMoveInStrategic( SOLDIERTYPE *pSoldier, INT8 *pbErrorNumber
 	{
 		SOLDIERTYPE *pVehicle = GetSoldierStructureForVehicle(pSoldier->iVehicleId);
 
+		if (pSoldier->iVehicleId == iHelicopterVehicleId)
+			; // intentionally do nothing to skip the following checks
 		// too damaged?
-		if (pVehicle->stats.bLife < OKLIFE)
+		else if (pVehicle->stats.bLife < OKLIFE)
 		{
 			*pbErrorNumber = 47;
 			return(FALSE);
 		}
-
 		// out of fuel?
-		if (!VehicleHasFuel(pVehicle))
+		else if (!VehicleHasFuel(pVehicle))
 		{
 			*pbErrorNumber = 42;
 			return(FALSE);