games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-27 22:49:25 +02:00
Code Issues Releases Activity

* Server will strictly require answering the queries before taking any actions. Let me know, if this causes any freezes.

Browse Source 
* Fixed crash on new week after we lost battle with neutral monster but killed the top stack (merging failed then).
* minor changes
This commit is contained in:
Michał W. Urbańczyk
2011-09-06 06:00:32 +00:00
parent 5fff82a3d2
commit 8b7a2f179c
9 changed files with 37 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
client/Client.cpp
View File

@@ -214,10 +214,7 @@ void CClient::endGame( bool closeConnection /*= true*/ )
delete pint;
}
BOOST_FOREACH(CCallback *cb, callbacks)
{
delete cb;
}
callbacks.clear();
tlog0 << "Deleted playerInts." << std::endl;
tlog0 << "Client stopped." << std::endl;
@@ -379,6 +376,7 @@ void CClient::newGame( CConnection *con, StartInfo *si )
battleints[color] = playerint[color];
playerint[color]->init(cb);
callbacks[color] = std::auto_ptr<CCallback>(cb);
}
else
{
@@ -465,10 +463,9 @@ void CClient::serialize( Handler &h, const int version )
else
nInt = new CPlayerInterface(pid);
CCallback *callback = new CCallback(gs,pid,this);
callbacks.insert(callback);
callbacks[pid] = std::auto_ptr<CCallback>(new CCallback(gs,pid,this));
battleints[pid] = playerint[pid] = nInt;
nInt->init(callback);
nInt->init(callbacks[pid].get());
nInt->serialize(h, version);
}