mirror of
https://github.com/AquariaOSE/Aquaria.git
synced 2025-08-11 00:29:53 +00:00
Fixed handling of IET_SCRIPT, rename Lua callback func getIngredientString() to getIngredientEffectString(), compile fix
This commit is contained in:
parent
9d2dcc2d0f
commit
153dd522c9
2 changed files with 10 additions and 11 deletions
|
@ -591,6 +591,14 @@ std::string Continuity::getIEString(IngredientData *data, int i)
|
|||
case IET_LI:
|
||||
return dsq->continuity.stringBank.get(227);
|
||||
break;
|
||||
case IET_SCRIPT:
|
||||
if(dsq->game->cookingScript)
|
||||
{
|
||||
std::string ret = "";
|
||||
dsq->game->cookingScript->call("getIngredientEffectString", data->name.c_str(), &ret);
|
||||
return ret;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
return "";
|
||||
|
@ -866,16 +874,6 @@ bool Continuity::applyIngredientEffects(IngredientData *data)
|
|||
|
||||
std::string Continuity::getIngredientAffectsString(IngredientData *data)
|
||||
{
|
||||
if(data->type == IET_SCRIPT)
|
||||
{
|
||||
if(dsq->game->cookingScript)
|
||||
{
|
||||
std::string ret = "";
|
||||
dsq->game->cookingScript->call("getIngredientString", data->name.c_str(), &ret);
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
|
||||
return getAllIEString(data);
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue