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

First step at unifying game identifiers code

Browse Source
This commit is contained in:
Ivan Savenko
2023-08-18 13:38:19 +03:00
parent b0eec85aca
commit ec8d31bbfc
34 changed files with 294 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/ResourceSet.cpp
View File

@@ -119,7 +119,7 @@ std::string ResourceSet::toString() const
bool ResourceSet::nziterator::valid() const
{
return cur.resType < GameConstants::RESOURCE_QUANTITY && cur.resVal;
return cur.resType < GameResID::COUNT && cur.resVal;
}
ResourceSet::nziterator ResourceSet::nziterator::operator++()
@@ -150,9 +150,9 @@ void ResourceSet::nziterator::advance()
do
{
++cur.resType;
} while(cur.resType < GameConstants::RESOURCE_QUANTITY && !(cur.resVal=rs[cur.resType]));
} while(cur.resType < GameResID::COUNT && !(cur.resVal=rs[cur.resType]));
if(cur.resType >= GameConstants::RESOURCE_QUANTITY)
if(cur.resType >= GameResID::COUNT)
cur.resVal = -1;
}