From 24f18eeec1cf09175c1d126150f0a47a238b1137 Mon Sep 17 00:00:00 2001
From: Shadooow <Shadooow@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Wed, 2 Mar 2022 02:29:19 +0000
Subject: [PATCH] Fixed vanilla bug where grenades and launchers in some maps
 aren't working properly which manifested either by merc able to
 throw/toss/launch only 1 tile far or much farther than it should.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9315 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 TileEngine/physics.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/TileEngine/physics.cpp b/TileEngine/physics.cpp
index 9bc20d715..b3a157116 100644
--- a/TileEngine/physics.cpp
+++ b/TileEngine/physics.cpp
@@ -21,6 +21,7 @@
 	#include "opplist.h"
 	#include "Buildings.h"
 	#include "Dialogue Control.h"	// added by Flugente
+	#include "Map Information.h"	// added by Shadooow
 #endif
 #include "connect.h"
 #include "PATHAI.H"
@@ -30,6 +31,7 @@
 class OBJECTTYPE;
 class SOLDIERTYPE;
 extern INT16 EffectiveDexterity(SOLDIERTYPE* pSoldier, BOOLEAN fTrainer);
+extern bool GridNoOnWalkableWorldTile(INT32 sGridNo);
 
 #define NO_TEST_OBJECT												0
 #define TEST_OBJECT_NO_COLLISIONS							1
@@ -2295,6 +2297,12 @@ FLOAT CalculateForceFromRange(UINT16 usItem, INT16 sRange, FLOAT dDegrees, INT32
 	// OK, use a fake gridno, find the new gridno based on range, use height of merc, end height of ground,
 	// 45 degrees
 	sSrcGridNo	= INT32(WORLD_COLS/2+double(WORLD_COLS)*WORLD_ROWS/5.914);
+	//shadooow: so it looks like it doesn't work in all maps afterall...
+	//note that my hack will not work in custom made maps where neither 4408 and center GridNo aren't walkable, if such map exists then we need to solve this in some other way
+	if (!GridNoOnWalkableWorldTile(sSrcGridNo))
+	{
+		sSrcGridNo = gMapInformation.sCenterGridNo;
+	}
 	sDestGridNo = sSrcGridNo + ( sRange * WORLD_COLS );
 
 //	sSrcGridNo	= 4408;