immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better exception handling in CRobotMain

master
Piotr Dziwinski 2015-07-14 18:46:22 +02:00
parent 0d1b97510d
commit 3f41555a61
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/object/robotmain.cpp
View File

@ -572,7 +572,7 @@ void CRobotMain::ChangePhase(Phase phase)
m_sound->StopMusic(0.0f); m_sound->StopMusic(0.0f);
if (m_base == nullptr || loading) StartMusic(); if (m_base == nullptr || loading) StartMusic();
} }
catch (const CLevelParserException& e) catch (const std::runtime_error& e)
{ {
CLogger::GetInstancePointer()->Error("An error occured while trying to load a level\n"); CLogger::GetInstancePointer()->Error("An error occured while trying to load a level\n");
CLogger::GetInstancePointer()->Error("%s\n", e.what()); CLogger::GetInstancePointer()->Error("%s\n", e.what());
@ -619,7 +619,7 @@ void CRobotMain::ChangePhase(Phase phase)
} }
StartMusic(); StartMusic();
} }
catch (const CLevelParserException& e) catch (const std::runtime_error& e)
{ {
CLogger::GetInstancePointer()->Error("An error occured while trying to load win scene\n"); CLogger::GetInstancePointer()->Error("An error occured while trying to load win scene\n");
CLogger::GetInstancePointer()->Error("%s\n", e.what()); CLogger::GetInstancePointer()->Error("%s\n", e.what());
@ -652,7 +652,7 @@ void CRobotMain::ChangePhase(Phase phase)
StartMusic(); StartMusic();
} }
catch (const CLevelParserException& e) catch (const std::runtime_error& e)
{ {
CLogger::GetInstancePointer()->Error("An error occured while trying to load lost scene\n"); CLogger::GetInstancePointer()->Error("An error occured while trying to load lost scene\n");
CLogger::GetInstancePointer()->Error("%s\n", e.what()); CLogger::GetInstancePointer()->Error("%s\n", e.what());
@ -2862,7 +2862,7 @@ void CRobotMain::ScenePerso()
{ {
CreateScene(false, true, false); // sets scene CreateScene(false, true, false); // sets scene
} }
catch (const CLevelParserException& e) catch (const std::runtime_error& e)
{ {
CLogger::GetInstancePointer()->Error("An error occured while trying to load apperance scene\n"); CLogger::GetInstancePointer()->Error("An error occured while trying to load apperance scene\n");
CLogger::GetInstancePointer()->Error("%s\n", e.what()); CLogger::GetInstancePointer()->Error("%s\n", e.what());
@ -3540,8 +3540,16 @@ void CRobotMain::CreateScene(bool soluce, bool fixScene, bool resetObject)
} }
catch (const CObjectCreateException& e) catch (const CObjectCreateException& e)
{ {
GetLogger()->Error("Error loading level object: %s\n", e.what()); if (gadget)
continue; {
GetLogger()->Warn("Error loading decorative object: %s\n", e.what());
continue;
}
else
{
GetLogger()->Error("Error loading level object: %s\n", e.what());
throw;
}
} }
if (m_fixScene && type == OBJECT_HUMAN) if (m_fixScene && type == OBJECT_HUMAN)
@ -5341,7 +5349,7 @@ void CRobotMain::ResetCreate()
} }
} }
} }
catch (const CLevelParserException& e) catch (const std::runtime_error& e)
{ {
CLogger::GetInstancePointer()->Error("An error occured while trying to reset scene\n"); CLogger::GetInstancePointer()->Error("An error occured while trying to reset scene\n");
CLogger::GetInstancePointer()->Error("%s\n", e.what()); CLogger::GetInstancePointer()->Error("%s\n", e.what());