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

Fixed #1679.

Browse Source
This commit is contained in:
Michał W. Urbańczyk 2014-03-01 12:23:33 +00:00
parent b8b809bd50
commit f5d945d1b2
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
CCallback.cpp
View File

@ -238,11 +238,24 @@ void CCallback::setFormation(const CGHeroInstance * hero, bool tight)
void CCallback::setSelection(const CArmedInstance * obj) void CCallback::setSelection(const CArmedInstance * obj)
{ {
if(!player || obj->getOwner() != *player)
{
logGlobal->errorStream() << boost::format("Cannot set selection to the object that is not owned. Object owner is %s, callback player %s") % obj->getOwner() % player;
return;
}
SetSelection ss; SetSelection ss;
ss.player = *player; ss.player = *player;
ss.id = obj->id; ss.id = obj->id;
sendRequest(&(CPackForClient&)ss); sendRequest(&(CPackForClient&)ss);
if(obj->getOwner() != *player)
{
// Cf. bug #1679 http://bugs.vcmi.eu/view.php?id=1679
logGlobal->warnStream() << "The selection request became invalid because of event that occurred after it was made. Object owner is now " << obj->getOwner();
throw std::runtime_error("setSelection not allowed");
}
if(obj->ID == Obj::HERO) if(obj->ID == Obj::HERO)
{ {
if(cl->pathInfo->hero != obj) //calculate new paths only if we selected a different hero if(cl->pathInfo->hero != obj) //calculate new paths only if we selected a different hero