Precise Shooting mission: Fix Lua errors when enemy dies after hero
authorWuzzy <Wuzzy2@mail.ru>
Wed, 07 Feb 2018 00:36:04 +0100
changeset 12913 9abb04174323
parent 12912 7bf84ebc6389
child 12914 b5d3b79c90cf
Precise Shooting mission: Fix Lua errors when enemy dies after hero
share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit03.lua
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit03.lua	Tue Feb 06 23:56:28 2018 +0100
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit03.lua	Wed Feb 07 00:36:04 2018 +0100
@@ -173,6 +173,9 @@
 
 -- Display ammo icon above gear. i = offset (start at 1)
 local function displayAmmoIcon(gear, ammoType, i)
+	if not GetHealth(gear) then
+		return
+	end
 	local x = GetX(gear) + 2
 	local y = GetY(gear) + 32 * i
 	local vgear = AddVisualGear(x, y, vgtAmmo, 0, true)
@@ -184,7 +187,7 @@
 end
 
 function onGearDelete(gear)
-	if (isHog(gear)) then
+	if (isEnemyHog(gear) and GetHealth(hero.gear)) then
 		local availableTeleports = GetAmmoCount(hero.gear,amTeleport)
 		local availableSniper = GetAmmoCount(hero.gear,amSniperRifle)
 		local ammolist = ""
@@ -308,21 +311,16 @@
 	end
 end
 
-function isHog(gear)
-	local hog = false
-	for i=1,table.getn(enemiesOdd) do
+function isEnemyHog(gear)
+	for i=1, table.getn(enemiesOdd) do
 		if gear == enemiesOdd[i].gear then
-			hog = true
-			break
+			return true
 		end
 	end
-	if not hog then
-		for i=1,table.getn(enemiesEven) do
-			if gear == enemiesEven then
-				hog = true
-				break
-			end
+	for i=1, table.getn(enemiesEven) do
+		if gear == enemiesEven then
+			return true
 		end
 	end
-	return hog
+	return false
 end