mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-07-03 22:44:32 +00:00
Code Issues Releases Wiki Activity

Remove unnecessary exception handling. Hopefully fixes build on linux.

Browse source
This commit is contained in:
fgenesis 2013-06-21 20:35:24 +02:00
parent 0d98efadc4
commit 8da8b5462b
4 changed files with 116 additions and 144 deletions
Download patch file Download diff file Expand all files Collapse all files

7
BBGE/Core.cpp
View file

@ -3956,16 +3956,9 @@ void Core::clearResources()
{ {
deletedResources.push_back (resources[i]); deletedResources.push_back (resources[i]);
Resource *r = resources[i]; Resource *r = resources[i];
try
{
r->destroy(); r->destroy();
delete r; delete r;
} }
catch(...)
{
errorLog("Resource could not be deleted " + resourceNames[i]);
}
}
} }
resourceNames.clear(); resourceNames.clear();
resources.clear(); resources.clear();

4
BBGE/Resource.h
View file

@ -45,10 +45,6 @@ public:
ref--; ref--;
if (ref == 0) if (ref == 0)
destroy(); destroy();
/*
else if (ref < 0)
throw std::exception("ref count out of bounds < 0");
*/
} }
int getRef() { return ref; } int getRef() { return ref; }
std::string name; std::string name;

10
BBGE/Shader.cpp
View file

@ -260,9 +260,6 @@ void Shader::load(const std::string &file, const std::string &fragFile)
g_location_mode = 0; g_location_mode = 0;
g_location_value = 0; g_location_value = 0;
try
{
debugLog("Shader::load 1"); debugLog("Shader::load 1");
this->vertFile = file; this->vertFile = file;
this->fragFile = fragFile; this->fragFile = fragFile;
@ -378,12 +375,7 @@ void Shader::load(const std::string &file, const std::string &fragFile)
debugLog("Shader::load 7"); debugLog("Shader::load 7");
loaded = true; loaded = true;
}
catch(...)
{
debugLog("caught exception in shader::load");
loaded = false;
}
#endif #endif
debugLog("End Shader::load()"); debugLog("End Shader::load()");
} }

9
BBGE/StateManager.cpp
View file

@ -122,20 +122,11 @@ void StateData::eraseRenderObjects()
for (int i = 0; i < renderObjects.size(); i++) for (int i = 0; i < renderObjects.size(); i++)
{ {
RenderObject *r = renderObjects[i]; RenderObject *r = renderObjects[i];
//try
{
if (r && !r->isDead()) if (r && !r->isDead())
{ {
core->enqueueRenderObjectDeletion(renderObjects[i]); core->enqueueRenderObjectDeletion(renderObjects[i]);
} }
} }
/*
catch(...)
{
debugLog("Caught exception in StateData::eraseRenderObjects");
}
*/
}
renderObjects.clear(); renderObjects.clear();
} }