diff --git a/Assets/Scripts/aiAgent.lua b/Assets/Scripts/aiAgent.lua index 88b66ac..6798414 100644 --- a/Assets/Scripts/aiAgent.lua +++ b/Assets/Scripts/aiAgent.lua @@ -10,14 +10,6 @@ function executeBtNode(agent, btNode) func = btNode.children[i].func args = btNode.children[i].args res = agent[func](agent, args) - - a1 = args and args.tfId or nil - a1 = a1 and a1 or '' - - a2 = args and args.spId or nil - a2 = a2 and a2 or '' - - print('executing: ' .. func .. ', args: tf: ' .. a1 .. ', sp: ' .. a2 .. ', res: ' .. res) else res = executeBtNode(agent, btNode.children[i]) end diff --git a/game.cpp b/game.cpp index 5f15385..b1926f9 100644 --- a/game.cpp +++ b/game.cpp @@ -33,15 +33,13 @@ namespace battleship{ return game; } - void Game::resetLuaGameObjects(){} - void Game::endGame(bool victory){ ended = true; StateManager *sm = GameManager::getSingleton()->getStateManager(); sm->dettachAppState(sm->getAppStateByType(AppStateType::ACTIVE_STATE)); - togglePause(); + togglePause(); string endGameScreen = (victory ? "victory.lua" : "defeat.lua"); ConcreteGuiManager::getSingleton()->readLuaScreenScript(endGameScreen); diff --git a/game.h b/game.h index 26aa1d5..fb34af6 100644 --- a/game.h +++ b/game.h @@ -39,7 +39,6 @@ namespace battleship{ inline Ability getAbility(int id){return abilities[id];} private: Game(){} - void resetLuaGameObjects(); void endGame(bool); std::vector parseTechTable(int, std::string, std::string, std::string);