ArtilleryStrike: supply GetArtilleryLaunchParams with launcher item and not just mortar shell, as it will check it's range later.

Add smoke after explosion: improved code.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8913 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Sevenfm
2020-10-30 17:55:11 +00:00
parent 1200ce8de3
commit dd9c6b1f3e
2 changed files with 18 additions and 19 deletions
+7 -1
View File
@@ -11893,8 +11893,14 @@ BOOLEAN ArtilleryStrike( UINT16 usItem, UINT8 ubOwnerID, UINT32 usStartingGridNo
OBJECTTYPE shellobj;
CreateItem( usItem, 100, &shellobj );
// sevenfm: find launcher for usItem
UINT16 usLauncher = GetLauncherFromLaunchable(usItem);
if (usLauncher == NOTHING)
return FALSE;
// Get basic launch params...
if (!GetArtilleryLaunchParams(usStartingGridNo, sTargetGridNo, ubLevel, sStartZ, sEndZ, usItem, &shellobj, &dForce, &dDegrees))
// sevenfm: we need to supply GetArtilleryLaunchParams with launcher item and not just mortar shell, as it will check it's range later
if (!GetArtilleryLaunchParams(usStartingGridNo, sTargetGridNo, ubLevel, sStartZ, sEndZ, usLauncher, &shellobj, &dForce, &dDegrees))
return FALSE;
// Get XY from gridno