share/hedgewars/Data/Scripts/Animate.lua
changeset 12088 1da37e2ba6fd
parent 12084 ccab0d396a7f
child 12594 d8adae379d3c
--- a/share/hedgewars/Data/Scripts/Animate.lua	Sun Nov 27 00:00:25 2016 +0100
+++ b/share/hedgewars/Data/Scripts/Animate.lua	Sun Nov 27 01:30:41 2016 +0100
@@ -50,8 +50,17 @@
   RemoveFunction()
 end
 
-function AnimInit()
-  animPos = 1
+local function startCinemaLock()
+     SetCinematicMode(true)
+     SetInputMask(bnot(gmAnimate+gmAttack+gmDown+gmHJump+gmLeft+gmLJump+gmRight+gmSlot+gmSwitch+gmTimer+gmUp+gmWeapon))
+end
+
+local function stopCinemaLock()
+     SetInputMask(0xFFFFFFFF)
+     SetCinematicMode(false)
+end
+
+function AnimInit(startAnimating)
   lastx = 0
   lasty = 0
   jumpTypes = {long = gmLJump, high = gmHJump, back = gmHJump}
@@ -72,6 +81,10 @@
   FunctionListNum = 0
   skipping = false
   skipFuncList = {}
+  animPos = 1
+  if startAnimating then
+     startCinemaLock()
+  end
 end
 
 function AnimSwitchHog(gear)
@@ -288,8 +301,7 @@
 function Animate(steps)
   if skipping == true then
     animPos = 1
-    SetCinematicMode(false)
-    SetInputMask(0xFFFFFFFF)
+    stopCinemaLock()
     SkipAnimation(steps)
     return true
   end
@@ -300,8 +312,7 @@
 
   if steps[animPos] == nil then
       animPos = 1
-      SetCinematicMode(false)
-      SetInputMask(0xFFFFFFFF)
+      stopCinemaLock()
       return true
   end
   
@@ -310,8 +321,7 @@
       AnimSwitchHog(steps[animPos].args[1])
   end
 
-  SetInputMask(bnot(gmAnimate+gmAttack+gmDown+gmHJump+gmLeft+gmLJump+gmRight+gmSlot+gmSwitch+gmTimer+gmUp+gmWeapon))
-  SetCinematicMode(true)
+  startCinemaLock()
   retVal = steps[animPos].func(unpack(steps[animPos].args))
   if (retVal ~= false) then
     animPos = animPos + 1