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

Return plain poiner in get_array_by_id

This commit is contained in:
Vasilii Rogin 2023-04-27 21:03:47 +03:00
parent 232085584a
commit 2c0254a840
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/sfall_arrays.cc
View File

@ -283,20 +283,19 @@ ArrayId CreateTempArray(int len, uint32_t flags)
return array_id; return array_id;
} }
std::unique_ptr<SFallArray>& get_array_by_id(ArrayId array_id) SFallArray* get_array_by_id(ArrayId array_id)
{ {
static auto not_found = std::unique_ptr<SFallArray>(nullptr);
auto it = arrays.find(array_id); auto it = arrays.find(array_id);
if (it == arrays.end()) { if (it == arrays.end()) {
return not_found; return nullptr;
} else { } else {
return it->second; return it->second.get();
} }
} }
ProgramValue GetArrayKey(ArrayId array_id, int index) ProgramValue GetArrayKey(ArrayId array_id, int index)
{ {
auto& arr = get_array_by_id(array_id); auto arr = get_array_by_id(array_id);
if (!arr) { if (!arr) {
return ProgramValue(0); return ProgramValue(0);
}; };
@ -305,7 +304,7 @@ ProgramValue GetArrayKey(ArrayId array_id, int index)
int LenArray(ArrayId array_id) int LenArray(ArrayId array_id)
{ {
auto& arr = get_array_by_id(array_id); auto arr = get_array_by_id(array_id);
if (!arr) { if (!arr) {
return -1; return -1;
}; };
@ -315,7 +314,7 @@ int LenArray(ArrayId array_id)
ProgramValue GetArray(ArrayId array_id, const ProgramValue& key) ProgramValue GetArray(ArrayId array_id, const ProgramValue& key)
{ {
auto& arr = get_array_by_id(array_id); auto arr = get_array_by_id(array_id);
if (!arr) { if (!arr) {
return ProgramValue(0); return ProgramValue(0);
@ -326,7 +325,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 = get_array_by_id(array_id); auto arr = get_array_by_id(array_id);
if (!arr) { if (!arr) {
return; return;
} }
@ -363,7 +362,7 @@ void sfallArraysReset()
void ResizeArray(ArrayId array_id, int newLen) void ResizeArray(ArrayId array_id, int newLen)
{ {
auto& arr = get_array_by_id(array_id); auto arr = get_array_by_id(array_id);
if (!arr) { if (!arr) {
return; return;
}; };