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

Do not spoil arrays map if array is not found

This commit is contained in:
Vasilii Rogin 2023-04-27 20:41:33 +03:00
parent d4f3dddf7c
commit 232085584a
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/sfall_arrays.cc
View File

@ -283,9 +283,20 @@ ArrayId CreateTempArray(int len, uint32_t flags)
return array_id; return array_id;
} }
std::unique_ptr<SFallArray>& get_array_by_id(ArrayId array_id)
{
static auto not_found = std::unique_ptr<SFallArray>(nullptr);
auto it = arrays.find(array_id);
if (it == arrays.end()) {
return not_found;
} else {
return it->second;
}
}
ProgramValue GetArrayKey(ArrayId array_id, int index) ProgramValue GetArrayKey(ArrayId array_id, int index)
{ {
auto& arr = arrays[array_id]; auto& arr = get_array_by_id(array_id);
if (!arr) { if (!arr) {
return ProgramValue(0); return ProgramValue(0);
}; };
@ -294,7 +305,7 @@ ProgramValue GetArrayKey(ArrayId array_id, int index)
int LenArray(ArrayId array_id) int LenArray(ArrayId array_id)
{ {
auto& arr = arrays[array_id]; auto& arr = get_array_by_id(array_id);
if (!arr) { if (!arr) {
return -1; return -1;
}; };
@ -304,7 +315,7 @@ int LenArray(ArrayId array_id)
ProgramValue GetArray(ArrayId array_id, const ProgramValue& key) ProgramValue GetArray(ArrayId array_id, const ProgramValue& key)
{ {
auto& arr = arrays[array_id]; auto& arr = get_array_by_id(array_id);
if (!arr) { if (!arr) {
return ProgramValue(0); return ProgramValue(0);
@ -315,7 +326,7 @@ ProgramValue GetArray(ArrayId array_id, const ProgramValue& key)
void SetArray(ArrayId array_id, const ProgramValue& key, const ProgramValue& val, bool allowUnset) void SetArray(ArrayId array_id, const ProgramValue& key, const ProgramValue& val, bool allowUnset)
{ {
auto& arr = arrays[array_id]; auto& arr = get_array_by_id(array_id);
if (!arr) { if (!arr) {
return; return;
} }
@ -352,7 +363,7 @@ void sfallArraysReset()
void ResizeArray(ArrayId array_id, int newLen) void ResizeArray(ArrayId array_id, int newLen)
{ {
auto& arr = arrays[array_id]; auto& arr = get_array_by_id(array_id);
if (!arr) { if (!arr) {
return; return;
}; };