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

Merge branch 'master' of /home/fg/fgone/Aquaria_fg_clean

Browse source
This commit is contained in:
fgenesis 2012-07-12 02:43:13 +00:00
commit 93892ff46a
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()) if(dsq->mod.isActive())
{ {
//load mod ingredients //load mod ingredients
fname = localisePath(dsq->mod.getPath() + "ingredients.txt", dsq->mod.getPath()); loadIngredientData(dsq->mod.getPath() + "ingredients.txt");
loadIngredientData(fname);
} }
//load ingredients for the main game //load ingredients for the main game
if(ingredientData.empty() && recipes.empty()) { if(ingredientData.empty() && recipes.empty()) {
fname = localisePath("data/ingredients.txt"); loadIngredientData("data/ingredients.txt");
loadIngredientData(fname);
} }
loadPetData(); loadPetData();

10
Aquaria/RecipeMenuEntry.cpp
View file

@ -129,15 +129,7 @@ RecipeMenuEntry::RecipeMenuEntry(Recipe *recipe) : RenderObject(), recipe(recipe
text->scale = Vector(0.8, 0.8); text->scale = Vector(0.8, 0.8);
text->position = Vector(100*c, 0); //-20 text->position = Vector(100*c, 0); //-20
std::string typeName = recipe->types[i].typeName; std::string typeName = dsq->continuity.getIngredientDisplayName(recipe->types[i].typeName);
size_t loc = typeName.find("Type");
if (loc != std::string::npos)
{
typeName = typeName.substr(0, loc) + typeName.substr(loc+4, typeName.size());
}
typeName = dsq->continuity.getIngredientDisplayName(typeName);
if (recipe->types[i].type != IT_ANYTHING) if (recipe->types[i].type != IT_ANYTHING)
typeName = dsq->continuity.stringBank.get(2031) + "\n" + typeName; typeName = dsq->continuity.stringBank.get(2031) + "\n" + typeName;

2
files/data/ingredientnames.txt
View file

@ -38,7 +38,7 @@ Mushroom Mushroom
Oil Oil Oil Oil
Part Part Part Part
Perogi Perogi Perogi Perogi
PerogiType Perogi Type PerogiType Perogi
PlantBulb Plant Bulb PlantBulb Plant Bulb
PlantLeaf Plant Leaf PlantLeaf Plant Leaf
PlumpPerogi Plump Perogi PlumpPerogi Plump Perogi