diff --git a/Aquaria/Game.cpp b/Aquaria/Game.cpp index 5f2e90b..4b838e1 100644 --- a/Aquaria/Game.cpp +++ b/Aquaria/Game.cpp @@ -819,7 +819,7 @@ void TreasureSlot::onUpdate(float dt) { doubleClickTimer = 0; - dsq->runScriptNum("scripts/global/menu-treasures.lua", "useTreasure", flag); + dsq->game->onUseTreasure(flag); } else { @@ -7152,10 +7152,18 @@ void Game::onUseTreasure() if (selectedTreasureFlag != -1) { - dsq->runScriptNum("scripts/global/menu-treasures.lua", "useTreasure", selectedTreasureFlag); + onUseTreasure(selectedTreasureFlag); } } +void Game::onUseTreasure(int flag) +{ + if(dsq->mod.isActive()) + dsq->runScriptNum(dsq->mod.getPath() + "scripts/menu-treasures.lua", "useTreasure", flag); + else + dsq->runScriptNum("scripts/global/menu-treasures.lua", "useTreasure", flag); +} + Recipe *Game::findRecipe(const std::vector &list) { if (list.size() < 2) return 0; diff --git a/Aquaria/Game.h b/Aquaria/Game.h index 773b5c8..d2030d3 100644 --- a/Aquaria/Game.h +++ b/Aquaria/Game.h @@ -939,6 +939,7 @@ public: void onRecipes(); void updateCookList(); void onUseTreasure(); + void onUseTreasure(int flag); void onPrevFoodPage(); void onNextFoodPage(); diff --git a/Aquaria/ScriptInterface.cpp b/Aquaria/ScriptInterface.cpp index 62dbce7..c7cfa1f 100644 --- a/Aquaria/ScriptInterface.cpp +++ b/Aquaria/ScriptInterface.cpp @@ -6156,15 +6156,7 @@ luaFunc(entity_partSetSegs) luaFunc(entity_getID) { Entity *e = entity(L); - int id = 0; - if (e) - { - id = e->getID(); - std::ostringstream os; - os << "id: " << id; - debugLog(os.str()); - } - luaReturnNum(id); + luaReturnNum(e ? e->getID() : 0); } luaFunc(getEntityByID)