From 5a99e22b6446ccfe913f18991d2c05b1686d3b04 Mon Sep 17 00:00:00 2001
From: Michael Townsend <mtownsend@tripadvisor.com>
Date: Fri, 23 Sep 2016 11:39:07 -0400
Subject: [PATCH] Fixing bugs

---
 script/engine.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/script/engine.js b/script/engine.js
index 71847a1..44c836a 100644
--- a/script/engine.js
+++ b/script/engine.js
@@ -577,10 +577,6 @@
 					stores.animate({right: -(panelIndex * 700) + 'px'}, 300 * diff);
 				}
 
-				Engine.activeModule = module;
-
-				module.onArrival(diff);
-
 				if(Engine.activeModule == Room || Engine.activeModule == Path) {
 					// Don't fade out the weapons if we're switching to a module
 					// where we're going to keep showing them anyway.
@@ -593,6 +589,8 @@
 					$('div#weapons').animate({opacity: 1}, 300);
 				}
 
+				Engine.activeModule = module;
+				module.onArrival(diff);
 				Notifications.printQueue(module);
 
 			}