mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-08-10 16:19:59 +00:00
Code Issues Releases Wiki Activity

Some simplifications in ingredient name handling, by Henrik Holst

Browse source
This commit is contained in:
fgenesis 2012-07-11 22:00:14 +02:00
parent 0caed714fb
commit 918c69d15b
3 changed files with 4 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Aquaria/Continuity.cpp
View file

@ -3263,14 +3263,12 @@ void Continuity::reset()
if(dsq->mod.isActive())
{
//load mod ingredients
fname = localisePath(dsq->mod.getPath() + "ingredients.txt", dsq->mod.getPath());
loadIngredientData(fname);
loadIngredientData(dsq->mod.getPath() + "ingredients.txt");
}
//load ingredients for the main game
if(ingredientData.empty() && recipes.empty()) {
fname = localisePath("data/ingredients.txt");
loadIngredientData(fname);
loadIngredientData("data/ingredients.txt");
}
loadPetData();