1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-06 09:09:40 +02:00

Introduced strongly typed QueryID.

Exchange between heroes is now a proper first-class query. Fixes #1269. #66 should also be finally fully fixed.
VC projects: /Zm flag to fix compilation issues with recent Boost.
This commit is contained in:
Michał W. Urbańczyk
2013-05-27 10:53:28 +00:00
parent 09e2f0f021
commit 79026bdfde
28 changed files with 173 additions and 116 deletions

View File

@@ -56,10 +56,10 @@ bool CCallback::moveHero(const CGHeroInstance *h, int3 dst)
return true;
}
int CCallback::selectionMade(int selection, int queryID)
int CCallback::selectionMade(int selection, QueryID queryID)
{
ASSERT_IF_CALLED_WITH_PLAYER
if(queryID == -1)
if(queryID == QueryID(-1))
{
logGlobal->errorStream() << "Cannot answer the query -1!";
return false;