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

fix Eye of magi, also fix #1608

Browse Source 
Conflicts:
	lib/CObjectHandler.cpp
This commit is contained in:
AlexVinS
2014-06-21 17:41:05 +04:00
parent c7772aa5a4
commit 4e4ba6654c
5 changed files with 47 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
client/CPlayerInterface.cpp
View File

@ -101,7 +101,6 @@ struct OCM_HLP_CGIN
} ocmptwo_cgin ;
CPlayerInterface::CPlayerInterface(PlayerColor Player)
{
logGlobal->traceStream() << "\tHuman player interface for player " << Player << " being constructed";
@ -1503,8 +1502,16 @@ void CPlayerInterface::centerView (int3 pos, int focusTime)
if(focusTime)
{
GH.totalRedraw();
#ifdef VCMI_SDL1
CSDL_Ext::update(screen);
SDL_Delay(focusTime);
#else
{
auto unlockPim = vstd::makeUnlockGuard(*pim);
IgnoreEvents ignore(*this);
SDL_Delay(focusTime);
}
#endif
}
}
@ -2553,6 +2560,16 @@ bool CPlayerInterface::capturedAllEvents()
return true;
}
if(ignoreEvents)
{
boost::unique_lock<boost::mutex> un(eventsM);
while(!events.empty())
{
events.pop();
}
return true;
}
return false;
}