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.cpp | |
| 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.cpp')
| -rw-r--r-- | src/gui/game/GameController.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/gui/game/GameController.cpp b/src/gui/game/GameController.cpp index ed1a866..d7b808b 100644 --- a/src/gui/game/GameController.cpp +++ b/src/gui/game/GameController.cpp @@ -145,8 +145,12 @@ GameController::GameController(): gameView->AttachController(this); gameModel->AddObserver(gameView); - commandInterface = new LuaScriptInterface(this, gameModel);//new TPTScriptInterface(); +#ifdef LUACONSOLE + commandInterface = new LuaScriptInterface(this, gameModel); ((LuaScriptInterface*)commandInterface)->SetWindow(gameView); +#else + commandInterface = new TPTScriptInterface(this, gameModel); +#endif commandInterface->OnBrushChanged(gameModel->GetBrushID(), gameModel->GetBrush()->GetRadius().X, gameModel->GetBrush()->GetRadius().X); ActiveToolChanged(0, gameModel->GetActiveTool(0)); @@ -706,7 +710,9 @@ void GameController::Tick() { if(firstTick) { +#ifdef LUACONSOLE ((LuaScriptInterface*)commandInterface)->Init(); +#endif if(!Client::Ref().GetPrefBool("InstallCheck", false)) { Client::Ref().SetPref("InstallCheck", true); |