Future/iw5-gsc-utils
1
0
Fork 0
mirror of https://github.com/fedddddd/iw5-gsc-utils.git synced 2026-08-01 04:40:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add custom entity field support

Browse Source
This commit is contained in:
Federico Cecchetto
2021-11-07 23:42:56 +01:00
parent 7526de9b76
commit eee68760e4
7 changed files with 176 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/scripting/array.cpp
+15 -15
View File
@@ -129,9 +129,9 @@ namespace scripting
}
}
std::vector<array_key> array::get_keys() const
std::vector<script_value> array::get_keys() const
{
std::vector<array_key> result;
std::vector<script_value> result;
const auto offset = 0xC800 * (this->id_ & 1);
auto current = game::scr_VarGlob->objectVariableChildren[this->id_].firstChild;
@@ -149,16 +149,14 @@ namespace scripting
const auto string_value = (unsigned int)((unsigned __int8)var.name_lo + (var.k.keys.name_hi << 8));
const auto* str = game::SL_ConvertToString(string_value);
array_key key;
script_value key;
if (string_value < 0x40000 && str)
{
key.is_string = true;
key.key = str;
key = str;
}
else
{
key.is_integer = true;
key.index = (string_value - 0x800000) & 0xFFFFFF;
key = (string_value - 0x800000) & 0xFFFFFF;
}
result.push_back(key);
@@ -206,16 +204,18 @@ namespace scripting
return value;
}
script_value array::get(const array_key& key) const
script_value array::get(const script_value& key) const
{
if (key.is_integer)
if (key.is<int>())
{
return this->get(key.index);
return this->get(key.as<int>());
}
else
{
return this->get(key.key);
return this->get(key.as<std::string>());
}
return {};
}
script_value array::get(const std::string& key) const
@@ -253,15 +253,15 @@ namespace scripting
return variable;
}
void array::set(const array_key& key, const script_value& value) const
void array::set(const script_value& key, const script_value& value) const
{
if (key.is_integer)
if (key.is<int>())
{
this->set(key.index, value);
this->set(key.as<int>(), value);
}
else
{
this->set(key.key, value);
this->set(key.as<std::string>(), value);
}
}