From: <geo...@us...> - 2009-01-11 22:21:41
|
Revision: 2738 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=2738&view=rev Author: geoffthemedio Date: 2009-01-11 22:21:38 +0000 (Sun, 11 Jan 2009) Log Message: ----------- -Grooming -Gave kroddn programming credit Modified Paths: -------------- trunk/FreeOrion/client/human/HumanClientApp.cpp trunk/FreeOrion/default/credits.xml Modified: trunk/FreeOrion/client/human/HumanClientApp.cpp =================================================================== --- trunk/FreeOrion/client/human/HumanClientApp.cpp 2009-01-11 17:12:02 UTC (rev 2737) +++ trunk/FreeOrion/client/human/HumanClientApp.cpp 2009-01-11 22:21:38 UTC (rev 2738) @@ -474,32 +474,30 @@ void HumanClientApp::HandleSystemEvents() { - try { - SDLGUI::HandleSystemEvents(); - } - catch (const std::runtime_error& e) { - std::cerr << "std::runtime_error exception caught while SDLGUI::HandleSystemEvents() in HumanClientApp::HandleSystemEvents(): " << e.what() << std::endl; - throw e; - } + try { + SDLGUI::HandleSystemEvents(); + } catch (const std::runtime_error& e) { + std::cerr << "std::runtime_error exception caught while SDLGUI::HandleSystemEvents() in HumanClientApp::HandleSystemEvents(): " << e.what() << std::endl; + throw e; + } - try { - if (m_connected && !Networking().Connected()) { - m_connected = false; - // Note that Disconnections are handled with a post_event instead of a process_event. This is because a - // Disconnection inherently precipitates a transition out of any state S that handles it, and if another event - // that also causes a transition out of S is currently active (e.g. MPLobby), a double-destruction of S will - // occur. - m_fsm->post_event(Disconnection()); - } else if (Networking().MessageAvailable()) { - Message msg; - Networking().GetMessage(msg); - HandleMessage(msg); - } - } - catch (const std::runtime_error& e) { - std::cerr << "std::runtime_error exception caught in HumanClientApp::HandleSystemEvents(): " << e.what() << std::endl; - throw e; - } + try { + if (m_connected && !Networking().Connected()) { + m_connected = false; + // Note that Disconnections are handled with a post_event instead of a process_event. This is because a + // Disconnection inherently precipitates a transition out of any state S that handles it, and if another event + // that also causes a transition out of S is currently active (e.g. MPLobby), a double-destruction of S will + // occur. + m_fsm->post_event(Disconnection()); + } else if (Networking().MessageAvailable()) { + Message msg; + Networking().GetMessage(msg); + HandleMessage(msg); + } + } catch (const std::runtime_error& e) { + std::cerr << "std::runtime_error exception caught in HumanClientApp::HandleSystemEvents(): " << e.what() << std::endl; + throw e; + } } void HumanClientApp::HandleNonGGEvent(const SDL_Event& event) Modified: trunk/FreeOrion/default/credits.xml =================================================================== --- trunk/FreeOrion/default/credits.xml 2009-01-11 17:12:02 UTC (rev 2737) +++ trunk/FreeOrion/default/credits.xml 2009-01-11 22:21:38 UTC (rev 2738) @@ -70,7 +70,7 @@ <PERSON name="Ivan Sanchez" nick="Ivan s c" task="Spanish Translation"/> <PERSON name="Myckel Habets" nick="Myckel" task="Dutch Translation"/> <PERSON name="Martin Roth" nick="Captain Rage" task="Swedish Translation"/> - <PERSON name="Markus Sinner" nick="kroddn" task="German Translation"/> + <PERSON name="Markus Sinner" nick="kroddn" task="German Translation, Programming"/> <PERSON name="Fran Valenzuela" nick="Synyestro" task="Spanish Translation"/> <PERSON name="Guillaume" nick="nyquist" task="French Translation"/> </GROUP> |