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

Big change: Introduced new mechanism to handle queries. It should not cause any visible changes ATM apart from fixing several long-standing bugs realted to handling post-visit/battle/levelup callback, including infamous creature bank issues: #955, #1053, #1063, #1191. Needs testing.

Browse Source 
Minor changes:
* default log level set to trace
* LOG_TRACE raii guardian lifetime will last till the end of block
* compile fixes
* minor refactorings
This commit is contained in:
Michał W. Urbańczyk
2013-04-20 11:34:01 +00:00
parent 1fca335a2c
commit e8354908c3
30 changed files with 1481 additions and 875 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/ResourceSet.cpp
View File

@@ -92,7 +92,7 @@ void Res::ResourceSet::nziterator::advance()
{
do
{
cur.resType++;
vstd::advance(cur.resType, +1);
} while(cur.resType < GameConstants::RESOURCE_QUANTITY && !(cur.resVal=rs[cur.resType]));
if(cur.resType >= GameConstants::RESOURCE_QUANTITY)
@@ -102,8 +102,8 @@ void Res::ResourceSet::nziterator::advance()
Res::ResourceSet::nziterator::nziterator(const ResourceSet &RS)
: rs(RS)
{
cur.resType = 0;
cur.resVal = rs[0];
cur.resType = WOOD;
cur.resVal = rs[WOOD];
if(!valid())
advance();