summaryrefslogtreecommitdiff
path: root/src/game
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-02-12 12:53:11 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-02-12 12:53:11 (GMT)
commitec6d1012b263049241984dfc96fae37f4280e7eb (patch)
treeccd5196e7cb207dba032838dfb783dc438030f4c /src/game
parentd604fac18f611685f90c724ee84a7bc6c63da309 (diff)
downloadpowder-ec6d1012b263049241984dfc96fae37f4280e7eb.zip
powder-ec6d1012b263049241984dfc96fae37f4280e7eb.tar.gz
Somewhat working lua console, no element function overrides, no keyboard, mouse or tick events
Diffstat (limited to 'src/game')
-rw-r--r--src/game/GameController.cpp4
-rw-r--r--src/game/GameController.h3
2 files changed, 4 insertions, 3 deletions
diff --git a/src/game/GameController.cpp b/src/game/GameController.cpp
index c652298..7f6addd 100644
--- a/src/game/GameController.cpp
+++ b/src/game/GameController.cpp
@@ -79,8 +79,8 @@ GameController::GameController():
gameView->AttachController(this);
gameModel->AddObserver(gameView);
- commandInterface = new TPTScriptInterface();
- commandInterface->AttachGameModel(gameModel);
+ commandInterface = new LuaScriptInterface(gameModel);//new TPTScriptInterface();
+ //commandInterface->AttachGameModel(gameModel);
//sim = new Simulation();
}
diff --git a/src/game/GameController.h b/src/game/GameController.h
index ba3ae70..559f0c1 100644
--- a/src/game/GameController.h
+++ b/src/game/GameController.h
@@ -11,7 +11,8 @@
#include "login/LoginController.h"
#include "ssave/SSaveController.h"
#include "console/ConsoleController.h"
-#include "cat/TPTScriptInterface.h"
+//#include "cat/TPTScriptInterface.h"
+#include "cat/LuaScriptInterface.h"
#include "Menu.h"
using namespace std;