mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-02-26 07:53:58 +00:00
Code Issues Releases Wiki Activity

allow mods to use treasure scripts + remove debug spam in entity_getID()

Browse source
This commit is contained in:
fgenesis 2013-03-01 01:14:59 +01:00
parent 23e0707c5b
commit eef2289fb2
3 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Aquaria/Game.cpp
View file

@ -819,7 +819,7 @@ void TreasureSlot::onUpdate(float dt)
{ {
doubleClickTimer = 0; doubleClickTimer = 0;
dsq->runScriptNum("scripts/global/menu-treasures.lua", "useTreasure", flag); dsq->game->onUseTreasure(flag);
} }
else else
{ {
@ -7152,10 +7152,18 @@ void Game::onUseTreasure()
if (selectedTreasureFlag != -1) 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<IngredientData*> &list) Recipe *Game::findRecipe(const std::vector<IngredientData*> &list)
{ {
if (list.size() < 2) return 0; if (list.size() < 2) return 0;

1
Aquaria/Game.h
View file

@ -939,6 +939,7 @@ public:
void onRecipes(); void onRecipes();
void updateCookList(); void updateCookList();
void onUseTreasure(); void onUseTreasure();
void onUseTreasure(int flag);
void onPrevFoodPage(); void onPrevFoodPage();
void onNextFoodPage(); void onNextFoodPage();

10
Aquaria/ScriptInterface.cpp
View file

@ -6156,15 +6156,7 @@ luaFunc(entity_partSetSegs)
luaFunc(entity_getID) luaFunc(entity_getID)
{ {
Entity *e = entity(L); Entity *e = entity(L);
int id = 0; luaReturnNum(e ? e->getID() : 0);
if (e)
{
id = e->getID();
std::ostringstream os;
os << "id: " << id;
debugLog(os.str());
}
luaReturnNum(id);
} }
luaFunc(getEntityByID) luaFunc(getEntityByID)