1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00

- updated icons + psd file

- better log messages if server failed to open port
 - 1148 should be fixed. Cleanup in CGameHandler::moveHero()
 - compile fixes
This commit is contained in:
Ivan Savenko
2012-11-15 21:29:22 +00:00
parent c54b983663
commit 8eba824ada
13 changed files with 131 additions and 124 deletions

View File

@@ -515,16 +515,28 @@ int main(int argc, char** argv)
{
io_service io_service;
CVCMIServer server;
while(!end2)
try
{
server.start();
while(!end2)
{
server.start();
}
io_service.run();
}
io_service.run();
}
catch(boost::system::system_error &e) //for boost errors just log, not crash - probably client shut down connection
catch(boost::system::system_error &e) //for boost errors just log, not crash - probably client shut down connection
{
tlog1 << e.what() << std::endl;
end2 = true;
}HANDLE_EXCEPTION
}
catch(boost::system::system_error &e)
{
tlog1 << e.what() << std::endl;
end2 = true;
}HANDLE_EXCEPTION
//catch any startup errors (e.g. can't access port) errors
//and return non-zero status so client can detect error
throw;
}
return 0;
}