summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorjacob1 <jfu614@gmail.com>2013-06-06 03:17:34 (GMT)
committer jacob1 <jfu614@gmail.com>2013-06-06 03:17:34 (GMT)
commit2119343b6a76bdc6bda0fb62cea46f0a6b2df285 (patch)
tree55b48c9d58f2f3b215aa5d5474886c2542e164a9 /src/gui
parentc7ce3fa4b23bf14222af6403de36a501a05637a1 (diff)
downloadpowder-2119343b6a76bdc6bda0fb62cea46f0a6b2df285.zip
powder-2119343b6a76bdc6bda0fb62cea46f0a6b2df285.tar.gz
fix sim.NUM_PARTS, other small changes
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/game/GameController.cpp5
-rw-r--r--src/gui/game/GameController.h5
2 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/game/GameController.cpp b/src/gui/game/GameController.cpp
index f4992b2..97a81c5 100644
--- a/src/gui/game/GameController.cpp
+++ b/src/gui/game/GameController.cpp
@@ -27,6 +27,11 @@
#include "gui/interface/Keys.h"
#include "simulation/Snapshot.h"
#include "debug/DebugInfo.h"
+#ifdef LUACONSOLE
+#include "cat/LuaScriptInterface.h"
+#else
+#include "cat/TPTScriptInterface.h"
+#endif
//#include "debug/ElementPopulation.h"
using namespace std;
diff --git a/src/gui/game/GameController.h b/src/gui/game/GameController.h
index cc49f3b..32755df 100644
--- a/src/gui/game/GameController.h
+++ b/src/gui/game/GameController.h
@@ -14,11 +14,6 @@
#include "gui/console/ConsoleController.h"
#include "gui/localbrowser/LocalBrowserController.h"
#include "gui/options/OptionsController.h"
-#ifdef LUACONSOLE
-#include "cat/LuaScriptInterface.h"
-#else
-#include "cat/TPTScriptInterface.h"
-#endif
#include "client/ClientListener.h"
#include "RenderPreset.h"
#include "Menu.h"