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

New and restored functionality

Browse Source 
Added a new div-function to resource-sets. It allows to calculate the amount of times one resource set, for example income, has to be accumulated in order to reach another resource-set, for example required resource. It will return INT_MAX if it's impossible.

Restored the "<" operator-function and made it actually work like it's supposed to.
This commit is contained in:
Xilmi
2024-07-19 15:16:05 +02:00
parent b0f37748d6
commit 37c0972a50
1 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
lib/ResourceSet.h
View File

@@ -148,6 +148,26 @@ public:
return ret;
}
int div(const ResourceSet& income) {
int ret = 0; // Initialize to 0 because we want the maximum number of accumulations
for (size_t i = 0; i < container.size(); ++i) {
if (container.at(i) > 0) { // We only care about fulfilling positive needs
if (income[i] == 0) {
// If income is 0 and we need a positive amount, it's impossible to fulfill
return INT_MAX;
}
else {
// Calculate the number of times we need to accumulate income to fulfill the need
float divisionResult = static_cast<float>(container.at(i)) / static_cast<float>(income[i]);
int ceiledResult = static_cast<int>(std::ceil(divisionResult));
ret = std::max(ret, ceiledResult);
}
}
}
return ret;
}
ResourceSet & operator=(const TResource &rhs)
{
for(int & i : container)
@@ -171,14 +191,14 @@ public:
// WARNING: comparison operators are used for "can afford" relation: a <= b means that foreach i a[i] <= b[i]
// that doesn't work the other way: a > b doesn't mean that a cannot be afforded with b, it's still b can afford a
// bool operator<(const ResourceSet &rhs)
// {
// for(int i = 0; i < size(); i++)
// if(at(i) >= rhs[i])
// return false;
//
// return true;
// }
bool operator<(const ResourceSet &rhs)
{
for(int i = 0; i < size(); i++)
if (this->container.at(i) < rhs[i])
return true;
return false;
}
template <typename Handler> void serialize(Handler &h)
{