merge leave cooldowns

This commit is contained in:
Michael Townsend
2014-07-26 11:42:50 -04:00
parent cc3cdb72fe
commit 5ceac11e53
+2 -1
View File
@@ -562,13 +562,14 @@
}, },
keyDown: function(e) { keyDown: function(e) {
e = e || window.event;
if(!Engine.keyPressed && !Engine.keyLock) { if(!Engine.keyPressed && !Engine.keyLock) {
Engine.pressed = true; Engine.pressed = true;
if(Engine.activeModule.keyDown) { if(Engine.activeModule.keyDown) {
Engine.activeModule.keyDown(e); Engine.activeModule.keyDown(e);
} }
} }
return !(jQuery.inArray(window.event.keycode, [37,38,39,40])); return !(jQuery.inArray(e.keycode, [37,38,39,40]));
}, },
keyUp: function(e) { keyUp: function(e) {