mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-10-17 20:09:35 +00:00
Code Issues Releases Wiki Activity

Removed textureMemoryMultiplier again; a bit more debug output for differing texture sizes

Browse source
This commit is contained in:
fgenesis 2012-06-15 17:58:18 +02:00
commit b719b8fd60
5 changed files with 14 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Aquaria/Game.cpp
View file

@ -2028,8 +2028,9 @@ void Game::fillGridFromQuad(Quad *q, ObsType obsType, bool trim)
if (trim)
{
std::vector<TileVector> obsCopy = obs;
obs.clear();
std::vector<TileVector> obsCopy;
obsCopy.swap(obs);
// obs now empty
int sides = 0;
for (int i = 0; i < obsCopy.size(); i++)

15
Aquaria/UserSettings.cpp
View file

@ -274,12 +274,6 @@ void UserSettings::save()
}
doc.InsertEndChild(xml_net);
TiXmlElement xml_debug("Debug");
{
xml_debug.SetAttribute("textureMemoryMultiplier", debug.textureMemoryMultiplier);
}
doc.InsertEndChild(xml_debug);
}
#if defined(BBGE_BUILD_UNIX)
@ -566,12 +560,6 @@ void UserSettings::load(bool doApply, const std::string &overrideFile)
network.masterServer = serv;
}
TiXmlElement *xml_debug = doc.FirstChildElement("Debug");
if (xml_debug)
{
xml_debug->Attribute("textureMemoryMultiplier", &debug.textureMemoryMultiplier);
}
if (system.locale.empty())
getSystemLocale();
else
@ -618,9 +606,6 @@ void UserSettings::apply()
core->settings.prebufferSounds = audio.prebuffer;
if (debug.textureMemoryMultiplier >= 1)
Texture::textureMemoryMultiplier = debug.textureMemoryMultiplier;
#endif
}

6
Aquaria/UserSettings.h
View file

@ -178,12 +178,6 @@ public:
std::string masterServer;
} network;
struct Debug
{
Debug() { textureMemoryMultiplier = 1; }
int textureMemoryMultiplier;
} debug;
void loadDefaults(bool doApply=true);
void load(bool doApply=true, const std::string &overrideFile="");
void save();