diff options
| author | jacob1 <jfu614@gmail.com> | 2013-05-12 01:47:13 (GMT) |
|---|---|---|
| committer | jacob1 <jfu614@gmail.com> | 2013-05-12 01:47:13 (GMT) |
| commit | 51f27bfad72e7fbc72388f63c3b8a48162e509a1 (patch) | |
| tree | abd95cad4e12085fb8a67f63bce788db44f61f03 /src/gui/game/GameController.h | |
| parent | 9d89d4b79b26584490e55cfb992fc58d3e11ea2b (diff) | |
| parent | a0a0e305a92b41923f7634fca1d30b0e71ee12e0 (diff) | |
| download | powder-51f27bfad72e7fbc72388f63c3b8a48162e509a1.zip powder-51f27bfad72e7fbc72388f63c3b8a48162e509a1.tar.gz | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src/gui/game/GameController.h')
| -rw-r--r-- | src/gui/game/GameController.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gui/game/GameController.h b/src/gui/game/GameController.h index c34d44a..f2cf26b 100644 --- a/src/gui/game/GameController.h +++ b/src/gui/game/GameController.h @@ -14,8 +14,11 @@ #include "gui/console/ConsoleController.h" #include "gui/localbrowser/LocalBrowserController.h" #include "gui/options/OptionsController.h" -//#include "cat/TPTScriptInterface.h" +#ifdef LUACONSOLE #include "cat/LuaScriptInterface.h" +#else +#include "cat/TPTScriptInterface.h" +#endif #include "client/ClientListener.h" #include "RenderPreset.h" #include "Menu.h" |