From 143711f1ac931b626b253f4c8c56a426ab32a97c Mon Sep 17 00:00:00 2001
From: Shadooow <Shadooow@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Sun, 27 Jun 2021 02:22:30 +0000
Subject: [PATCH] fix: no more moving around with vehicle that has no fuel

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

diff --git a/Strategic/Map Screen Interface.cpp b/Strategic/Map Screen Interface.cpp
index 59eded1c7..e7430fec2 100644
--- a/Strategic/Map Screen Interface.cpp	
+++ b/Strategic/Map Screen Interface.cpp	
@@ -5992,6 +5992,24 @@ BOOLEAN CanCharacterMoveInStrategic( SOLDIERTYPE *pSoldier, INT8 *pbErrorNumber
 			return( FALSE );
 		}
 	}
+	else if (pSoldier->bAssignment == VEHICLE && VehicleIdIsValid(pSoldier->bVehicleID))
+	{
+		SOLDIERTYPE *pVehicle = GetSoldierStructureForVehicle(pSoldier->bVehicleID);
+
+		// too damaged?
+		if (pVehicle->stats.bLife < OKLIFE)
+		{
+			*pbErrorNumber = 47;
+			return(FALSE);
+		}
+
+		// out of fuel?
+		if (!VehicleHasFuel(pVehicle))
+		{
+			*pbErrorNumber = 42;
+			return(FALSE);
+		}
+	}
 	else	// non-vehicle
 	{
 		// dead?