Fix cut scenes not being skipped when pressing precise in enemy turn (
bug #280)
--- a/ChangeLog.txt Tue May 07 15:50:15 2019 +0200
+++ b/ChangeLog.txt Tue May 07 16:08:27 2019 +0200
@@ -17,6 +17,7 @@
* Fix broken behaviour of airborne attacks when placed near bounce world edge
* Deny placement of airborne attack in “impossible” places in maps with bounce world edge
* Deny placement of piano beyond bounce world edge
+ * Fix cut scenes not being skipped when pressing precise in enemy turn
Styles and schemes:
+ The Specialists: Unlock game scheme
--- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/backstab.lua Tue May 07 15:50:15 2019 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/backstab.lua Tue May 07 16:08:27 2019 +0200
@@ -1226,7 +1226,7 @@
end
end
-function onPrecise()
+function onPreciseLocal()
if GameTime > 2500 and AnimInProgress() then
SetAnimSkip(true)
return
--- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/dragon.lua Tue May 07 15:50:15 2019 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/dragon.lua Tue May 07 16:08:27 2019 +0200
@@ -753,7 +753,7 @@
end
end
-function onPrecise()
+function onPreciseLocal()
if GameTime > 2500 and AnimInProgress() then
SetAnimSkip(true)
end
--- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/enemy.lua Tue May 07 15:50:15 2019 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/enemy.lua Tue May 07 16:08:27 2019 +0200
@@ -714,7 +714,7 @@
end
end
-function onPrecise()
+function onPreciseLocal()
if GameTime > 3000 and AnimInProgress() then
SetAnimSkip(true)
end
--- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/epil.lua Tue May 07 15:50:15 2019 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/epil.lua Tue May 07 16:08:27 2019 +0200
@@ -492,7 +492,7 @@
SetTurnTimeLeft(MAX_TURN_TIME)
end
-function onPrecise()
+function onPreciseLocal()
if GameTime > 2500 then
SetAnimSkip(true)
end
--- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/family.lua Tue May 07 15:50:15 2019 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/family.lua Tue May 07 16:08:27 2019 +0200
@@ -661,14 +661,9 @@
end
end
-function onPrecise()
+function onPreciseLocal()
if GameTime > 2500 and AnimInProgress() then
SetAnimSkip(true)
return
end
--- HideHedge(princess)
--- for i = 1, 5 do
--- DeleteGear(cyborgs[i])
--- end
--- AddAmmo(natives[1], amTeleport, 100)
end
--- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/first_blood.lua Tue May 07 15:50:15 2019 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/first_blood.lua Tue May 07 16:08:27 2019 +0200
@@ -890,7 +890,7 @@
end
end
-function onPrecise()
+function onPreciseLocal()
if GameTime > 2000 then
SetAnimSkip(true)
end
--- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/journey.lua Tue May 07 15:50:15 2019 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/journey.lua Tue May 07 16:08:27 2019 +0200
@@ -1210,7 +1210,7 @@
end
end
-function onPrecise()
+function onPreciseLocal()
if GameTime > 2500 and AnimInProgress() then
SetAnimSkip(true)
return
--- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/queen.lua Tue May 07 15:50:15 2019 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/queen.lua Tue May 07 16:08:27 2019 +0200
@@ -852,7 +852,7 @@
end
end
-function onPrecise()
+function onPreciseLocal()
if GameTime > 2500 and AnimInProgress() then
SetAnimSkip(true)
end
--- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/shadow.lua Tue May 07 15:50:15 2019 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/shadow.lua Tue May 07 16:08:27 2019 +0200
@@ -1142,7 +1142,7 @@
end
end
-function onPrecise()
+function onPreciseLocal()
if GameTime > 2500 and AnimInProgress() then
SetAnimSkip(true)
return
--- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/united.lua Tue May 07 15:50:15 2019 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/united.lua Tue May 07 16:08:27 2019 +0200
@@ -545,7 +545,7 @@
end
end
-function onPrecise()
+function onPreciseLocal()
if GameTime > 2500 then
SetAnimSkip(true)
end
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/cosmos.lua Tue May 07 15:50:15 2019 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/cosmos.lua Tue May 07 16:08:27 2019 +0200
@@ -271,7 +271,7 @@
setFoundDeviceVisual()
end
-function onPrecise()
+function onPreciseLocal()
if GameTime > 3000 then
SetAnimSkip(true)
end
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/death01.lua Tue May 07 15:50:15 2019 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/death01.lua Tue May 07 16:08:27 2019 +0200
@@ -245,7 +245,7 @@
end
end
-function onPrecise()
+function onPreciseLocal()
if GameTime > 3000 then
SetAnimSkip(true)
end
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert01.lua Tue May 07 15:50:15 2019 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert01.lua Tue May 07 16:08:27 2019 +0200
@@ -296,7 +296,7 @@
end
end
-function onPrecise()
+function onPreciseLocal()
if GameTime > 3000 then
SetAnimSkip(true)
end
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert02.lua Tue May 07 15:50:15 2019 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert02.lua Tue May 07 16:08:27 2019 +0200
@@ -156,7 +156,7 @@
end
end
-function onPrecise()
+function onPreciseLocal()
if GameTime > 3000 then
SetAnimSkip(true)
end
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert03.lua Tue May 07 15:50:15 2019 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert03.lua Tue May 07 16:08:27 2019 +0200
@@ -120,7 +120,7 @@
SetAmmo(amRCPlane, 0, 0, 0, 1)
end
-function onPrecise()
+function onPreciseLocal()
if GameTime > 3000 then
SetAnimSkip(true)
end
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/final.lua Tue May 07 15:50:15 2019 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/final.lua Tue May 07 16:08:27 2019 +0200
@@ -192,7 +192,7 @@
end
end
-function onPrecise()
+function onPreciseLocal()
if GameTime > 3000 then
SetAnimSkip(true)
end
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit01.lua Tue May 07 15:50:15 2019 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit01.lua Tue May 07 16:08:27 2019 +0200
@@ -256,7 +256,7 @@
SetAmmo(amWatermelon, 0, 0, 0, 1)
end
-function onPrecise()
+function onPreciseLocal()
if GameTime > 3000 then
SetAnimSkip(true)
end
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit02.lua Tue May 07 15:50:15 2019 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit02.lua Tue May 07 16:08:27 2019 +0200
@@ -315,7 +315,7 @@
end
end
-function onPrecise()
+function onPreciseLocal()
if GameTime > 3000 then
SetAnimSkip(true)
end
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/ice01.lua Tue May 07 15:50:15 2019 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/ice01.lua Tue May 07 16:08:27 2019 +0200
@@ -354,7 +354,7 @@
end
end
-function onPrecise()
+function onPreciseLocal()
if GameTime > 3000 then
SetAnimSkip(true)
end
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/ice02.lua Tue May 07 15:50:15 2019 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/ice02.lua Tue May 07 16:08:27 2019 +0200
@@ -216,7 +216,7 @@
end
end
-function onPrecise()
+function onPreciseLocal()
if GameTime > 3000 then
SetAnimSkip(true)
end
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/moon01.lua Tue May 07 15:50:15 2019 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/moon01.lua Tue May 07 16:08:27 2019 +0200
@@ -264,7 +264,7 @@
end
end
-function onPrecise()
+function onPreciseLocal()
if GameTime > 3000 then
SetAnimSkip(true)
end
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/moon02.lua Tue May 07 15:50:15 2019 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/moon02.lua Tue May 07 16:08:27 2019 +0200
@@ -174,7 +174,7 @@
end
end
-function onPrecise()
+function onPreciseLocal()
if GameTime > 3000 then
SetAnimSkip(true)
end
--- a/share/hedgewars/Data/Missions/Challenge/User_Mission_-_That_Sinking_Feeling.lua Tue May 07 15:50:15 2019 +0200
+++ b/share/hedgewars/Data/Missions/Challenge/User_Mission_-_That_Sinking_Feeling.lua Tue May 07 16:08:27 2019 +0200
@@ -29,7 +29,7 @@
end
-- allow skipping of the intro via hitting precise key
-function onPrecise()
+function onPreciseLocal()
if introStage < 100 then
introStage = 110
genCounter = 0