eukara
/
fallout2-ce
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moving into ArrayElement

This commit is contained in:
Vasilii Rogin 2023-05-14 22:19:59 +03:00
parent e77029508f
commit 9441d5f4af
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/sfall_arrays.cc
View File

@ -341,8 +341,11 @@ public:
// size check // size check
if (size() >= ARRAY_MAX_SIZE) return; if (size() >= ARRAY_MAX_SIZE) return;
keys.push_back(keyEl); keys.push_back(std::move(keyEl));
map[keyEl] = ArrayElement { val, program };
// Not very good that we copy string into map key and into keys array
auto keyElForMap = ArrayElement { key, program };
map.emplace(std::move(keyElForMap), ArrayElement { val, program });
} }
} }
} }
@ -354,17 +357,10 @@ public:
// only allow to reduce number of elements (adding range of elements is meaningless for maps) // only allow to reduce number of elements (adding range of elements is meaningless for maps)
if (newLen >= 0 && newLen < size()) { if (newLen >= 0 && newLen < size()) {
std::vector<ArrayElement> newKeys;
newKeys.reserve(newLen);
for (size_t i = 0; i < newLen; i++) {
newKeys[i] = std::move(keys[i]);
};
for (size_t i = newLen; i < size(); i++) { for (size_t i = newLen; i < size(); i++) {
map.erase(keys[i]); map.erase(keys[i]);
}; };
keys = newKeys; keys.resize(newLen);
} else if (newLen < 0) { } else if (newLen < 0) {
if (newLen < (ARRAY_ACTION_SHUFFLE - 2)) return; if (newLen < (ARRAY_ACTION_SHUFFLE - 2)) return;
MapSort(newLen); MapSort(newLen);
@ -393,7 +389,9 @@ void SFallArrayAssoc::MapSort(int type)
if (sortByValue) { if (sortByValue) {
ListSort(keys, type, [this](const ArrayElement& a, const ArrayElement& b) -> bool { ListSort(keys, type, [this](const ArrayElement& a, const ArrayElement& b) -> bool {
return this->map[a] < this->map[b]; auto& aEl = this->map[a];
auto& bEl = this->map[b];
return aEl < bEl;
}); });
} else { } else {
ListSort(keys, type, std::less<ArrayElement>()); ListSort(keys, type, std::less<ArrayElement>());