From 5ceac11e53c46d78064b649d59929b327868e165 Mon Sep 17 00:00:00 2001
From: Michael Townsend <michael@doublespeakgames.com>
Date: Sat, 26 Jul 2014 11:42:50 -0400
Subject: [PATCH] merge leave cooldowns

---
 script/engine.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/script/engine.js b/script/engine.js
index ff3dbef..4053d82 100644
--- a/script/engine.js
+++ b/script/engine.js
@@ -562,13 +562,14 @@
 		},
 	
 		keyDown: function(e) {
+			e = e || window.event;
 			if(!Engine.keyPressed && !Engine.keyLock) {
 				Engine.pressed = true;
 				if(Engine.activeModule.keyDown) {
 					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) {