games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-10-31 00:07:39 +02:00
Code Issues Releases Activity

Code review tweaks

Browse Source
This commit is contained in:
nordsoft
2023-09-01 15:17:46 +04:00
parent 15037b782f
commit 8040cafb3d
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/modding/CModVersion.cpp
View File

@@ -61,16 +61,14 @@ std::string CModVersion::toString() const
bool CModVersion::compatible(const CModVersion & other, bool checkMinor, bool checkPatch) const
{
if(minor == Any || other.minor == Any)
checkMinor = false;
if(patch == Any || other.patch == Any)
checkPatch = false;
bool doCheckMinor = checkMinor && minor != Any && other.minor != Any;
bool doCheckPatch = checkPatch && patch != Any && other.patch != Any;
assert(!checkPatch || (checkPatch && checkMinor));
assert(!doCheckPatch || (doCheckPatch && doCheckMinor));
return (major == other.major &&
(!checkMinor || minor >= other.minor) &&
(!checkPatch || minor > other.minor || (minor == other.minor && patch >= other.patch)));
(!doCheckMinor || minor >= other.minor) &&
(!doCheckPatch || minor > other.minor || (minor == other.minor && patch >= other.patch)));
}
bool CModVersion::isNull() const