Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cppcheck cleanup

This commit is contained in:
Mark Vejvoda 2013-11-05 20:59:28 +00:00
parent 282feba074
commit 5ab99d2469
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/glest_game/types/faction_type.cpp
View File

@ -173,7 +173,7 @@ void FactionType::load(const string &factionName, const TechTree *techTree, Chec
}
catch(megaglest_runtime_error& ex) {
if(validationMode == false) {
throw ex;
throw;
}
else {
SystemFlags::OutputDebug(SystemFlags::debugError,"In [%s::%s Line: %d] Error [%s]\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__,ex.what());
@ -201,7 +201,7 @@ void FactionType::load(const string &factionName, const TechTree *techTree, Chec
}
catch(megaglest_runtime_error& ex) {
if(validationMode == false) {
throw ex;
throw;
}
else {
SystemFlags::OutputDebug(SystemFlags::debugError,"In [%s::%s Line: %d] Error [%s]\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__,ex.what());
@ -242,7 +242,7 @@ void FactionType::load(const string &factionName, const TechTree *techTree, Chec
}
catch(megaglest_runtime_error& ex) {
if(validationMode == false) {
throw ex;
throw;
}
else {
SystemFlags::OutputDebug(SystemFlags::debugError,"In [%s::%s Line: %d] Error [%s]\nFor FactionType: %s for StartResource: %s\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__,ex.what(),this->name.c_str(),name.c_str());

8
source/glest_game/types/unit_type.cpp
View File

@ -477,7 +477,7 @@ void UnitType::loaddd(int id,const string &dir, const TechTree *techTree,
}
catch(megaglest_runtime_error& ex) {
if(validationMode == false) {
throw ex;
throw;
}
else {
SystemFlags::OutputDebug(SystemFlags::debugError,"In [%s::%s Line: %d] Error [%s]\nFor UnitType: %s Cost: %d\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__,ex.what(),name.c_str(),iterMap->second);
@ -519,7 +519,7 @@ void UnitType::loaddd(int id,const string &dir, const TechTree *techTree,
}
catch(megaglest_runtime_error& ex) {
if(validationMode == false) {
throw ex;
throw;
}
else {
SystemFlags::OutputDebug(SystemFlags::debugError,"In [%s::%s Line: %d] Error [%s]\nFor UnitType: %s Store: %d\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__,ex.what(),name.c_str(),iterMap->second);
@ -647,7 +647,7 @@ void UnitType::loaddd(int id,const string &dir, const TechTree *techTree,
}
catch(megaglest_runtime_error& ex) {
if(validationMode == false) {
throw ex;
throw;
}
else {
SystemFlags::OutputDebug(SystemFlags::debugError,"In [%s::%s Line: %d] Error [%s]\nFor UnitType: %s SkillType: %s\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__,ex.what(),name.c_str(),classId.c_str());
@ -672,7 +672,7 @@ void UnitType::loaddd(int id,const string &dir, const TechTree *techTree,
}
catch(megaglest_runtime_error& ex) {
if(validationMode == false) {
throw ex;
throw;
}
else {
SystemFlags::OutputDebug(SystemFlags::debugError,"In [%s::%s Line: %d] Error [%s]\nFor UnitType: %s CommandType:%s\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__,ex.what(),name.c_str(),classId.c_str());

2
source/glest_game/types/upgrade_type.cpp
View File

@ -707,7 +707,7 @@ void UpgradeType::load(const string &dir, const TechTree *techTree,
}
catch(megaglest_runtime_error& ex) {
if(validationMode == false) {
throw ex;
throw;
}
else {
SystemFlags::OutputDebug(SystemFlags::debugError,"In [%s::%s Line: %d] Error [%s]\nFor UpgradeType: %s Cost: %d\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__,ex.what(),name.c_str(),iterMap->second);