games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-12-01 23:12:49 +02:00
Code Issues Releases Activity

Merged Ivan's changes from trunk (r1921)

Browse Source
This commit is contained in:
Michał W. Urbańczyk
2011-01-28 02:33:26 +00:00
parent e5bf71538f 551d1f1b26
commit 15011e611d
8 changed files with 62 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
client/Client.cpp
View File

@@ -215,7 +215,9 @@ void CClient::endGame( bool closeConnection /*= true*/ )
const_cast<CGameInfo*>(CGI)->state.dellNull();
tlog0 << "Deleted mapHandler and gameState." << std::endl;
CPlayerInterface * oldInt = LOCPLINT;
LOCPLINT = NULL;
oldInt->pim->unlock();
while (!playerint.empty())
{
CGameInterface *pint = playerint.begin()->second;
@@ -520,20 +522,15 @@ void CClient::stopConnection()
{
terminate = true;
if (serv)
if (serv) //request closing connection
{
tlog0 << "Connection has been requested to be closed.\n";
boost::unique_lock<boost::mutex>(*serv->wmx);
*serv << &CloseServer();
tlog0 << "Sent closing signal to the server\n";
serv->close();
delete serv;
serv = NULL;
tlog3 << "Our socket has been closed." << std::endl;
}
if(connectionHandler)
if(connectionHandler)//end connection handler
{
if(connectionHandler->get_id() != boost::this_thread::get_id())
connectionHandler->join();
@@ -543,6 +540,14 @@ void CClient::stopConnection()
delete connectionHandler;
connectionHandler = NULL;
}
if (serv) //and delete connection
{
serv->close();
delete serv;
serv = NULL;
tlog3 << "Our socket has been closed." << std::endl;
}
}
void CClient::battleStarted(const BattleInfo * info)