dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup: Use std::vector in DeterministicSpriteGroup.

Browse Source 
(cherry picked from commit 1aeaf39954)
This commit is contained in:
Peter Nelson
2021-05-02 00:00:06 +01:00
committed by Jonathan G Rennison
parent d3b9d19c5a
commit a69a1d19a9
3 changed files with 13 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/newgrf_spritegroup.cpp
View File

@@ -56,12 +56,6 @@ TemporaryStorageArray<int32, 0x110> _temp_store;
}
}
DeterministicSpriteGroup::~DeterministicSpriteGroup()
{
free(this->adjusts);
free(this->ranges);
}
RandomizedSpriteGroup::~RandomizedSpriteGroup()
{
free(this->groups);
@@ -207,8 +201,8 @@ const SpriteGroup *DeterministicSpriteGroup::Resolve(ResolverObject &object) con
ScopeResolver *scope = object.GetScope(this->var_scope);
for (i = 0; i < this->num_adjusts; i++) {
DeterministicSpriteGroupAdjust *adjust = &this->adjusts[i];
for (i = 0; i < this->adjusts.size(); i++) {
const DeterministicSpriteGroupAdjust *adjust = &this->adjusts[i];
/* Try to get the variable. We shall assume it is available, unless told otherwise. */
GetVariableExtra extra(adjust->and_mask << adjust->shift_num);
@@ -253,16 +247,16 @@ const SpriteGroup *DeterministicSpriteGroup::Resolve(ResolverObject &object) con
return &nvarzero;
}
if (this->num_ranges > 4) {
DeterministicSpriteGroupRange *lower = std::lower_bound(this->ranges + 0, this->ranges + this->num_ranges, value, RangeHighComparator);
if (lower != this->ranges + this->num_ranges && lower->low <= value) {
if (this->ranges.size() > 4) {
const auto &lower = std::lower_bound(this->ranges.begin(), this->ranges.end(), value, RangeHighComparator);
if (lower != this->ranges.end() && lower->low <= value) {
assert(lower->low <= value && value <= lower->high);
return SpriteGroup::Resolve(lower->group, object, false);
}
} else {
for (i = 0; i < this->num_ranges; i++) {
if (this->ranges[i].low <= value && value <= this->ranges[i].high) {
return SpriteGroup::Resolve(this->ranges[i].group, object, false);
for (const auto &range : this->ranges) {
if (range.low <= value && value <= range.high) {
return SpriteGroup::Resolve(range.group, object, false);
}
}
}