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

Merge branch 'resource' of https://github.com/Laserlicht/vcmi into resource

Browse Source
This commit is contained in:
Laserlicht
2025-09-21 22:10:18 +02:00
parent 6c6350ad8b c8e13f1fd0
commit 245782cb68
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/ResourceSet.cpp
View File

@@ -124,7 +124,7 @@ std::string ResourceSet::toString() const
bool ResourceSet::nziterator::valid() const bool ResourceSet::nziterator::valid() const
{ {
return cur.resType < GameResID::COUNT && cur.resVal; return static_cast<int>(cur.resType) < LIBRARY->resourceTypeHandler->getAllObjects().size() && cur.resVal;
} }
ResourceSet::nziterator ResourceSet::nziterator::operator++() ResourceSet::nziterator ResourceSet::nziterator::operator++()
@@ -155,9 +155,9 @@ void ResourceSet::nziterator::advance()
do do
{ {
++cur.resType; ++cur.resType;
} while(cur.resType < GameResID::COUNT && !(cur.resVal=rs[cur.resType])); } while(static_cast<int>(cur.resType) < LIBRARY->resourceTypeHandler->getAllObjects().size() && !(cur.resVal=rs[cur.resType]));
if(cur.resType >= GameResID::COUNT) if(static_cast<int>(cur.resType) >= LIBRARY->resourceTypeHandler->getAllObjects().size())
cur.resVal = -1; cur.resVal = -1;
} }