Commit 469b1815 authored by talljosh's avatar talljosh

Merging post-camp fixes from unstable

--HG--
branch : camp
......@@ -1215,10 +1215,12 @@ class Player(Unit):
if self.grapplingHook.hookState == HOOK_NOT_ACTIVE:
self.grapplingHook.hookTarget = None
self.grapplingHook.hookPosition = None
self.grapplingHook.oldHookPosition = None
self.grapplingHook.hookAimedAtSurface = False
else:
self.grapplingHook.hookTarget = (msg.hookTargetX, msg.hookTargetY)
self.grapplingHook.hookPosition = (msg.hookX, msg.hookY)
self.grapplingHook.oldHookPosition = (msg.hookX, msg.hookY)
self.grapplingHook.hookAimedAtSurface = msg.hookSolid
def buildResyncAcknowledgement(self):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment