Future/iw5-gsc-utils
1
0
Fork 0
mirror of https://github.com/fedddddd/iw5-gsc-utils.git synced 2025-04-20 21:05:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #16

Browse Source
This commit is contained in:
Federico Cecchetto 2022-03-27 23:42:47 +02:00
parent 39b9e7e352
commit d72c6f7057
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/component/gsc.cpp
View File

@ -21,7 +21,7 @@ namespace gsc
{ {
std::string method_name(unsigned int id) std::string method_name(unsigned int id)
{ {
const auto map = *game::plutonium::method_map_rev; const auto& map = *game::plutonium::method_map_rev;
for (const auto& function : map) for (const auto& function : map)
{ {
@ -36,7 +36,7 @@ namespace gsc
std::string function_name(unsigned int id) std::string function_name(unsigned int id)
{ {
const auto map = *game::plutonium::function_map_rev; const auto& map = *game::plutonium::function_map_rev;
for (const auto& function : map) for (const auto& function : map)
{ {
@ -192,7 +192,7 @@ namespace gsc
return scr_get_object_field_hook.invoke<void>(classnum, entnum, offset); return scr_get_object_field_hook.invoke<void>(classnum, entnum, offset);
} }
const auto field = custom_fields[classnum][offset]; const auto& field = custom_fields[classnum][offset];
try try
{ {
@ -217,7 +217,7 @@ namespace gsc
} }
const auto args = get_arguments(); const auto args = get_arguments();
const auto field = custom_fields[classnum][offset]; const auto& field = custom_fields[classnum][offset];
try try
{ {
@ -272,11 +272,20 @@ namespace gsc
const std::function<scripting::script_value(unsigned int entnum)>& getter, const std::function<scripting::script_value(unsigned int entnum)>& getter,
const std::function<void(unsigned int entnum, const scripting::script_value&)>& setter) const std::function<void(unsigned int entnum, const scripting::script_value&)>& setter)
{ {
const auto token_id = token_map_start++; uint16_t token_id{};
const auto offset = field_offset_start++; auto& token_map = *game::plutonium::token_map_rev;
if (token_map.find(name) != token_map.end())
{
token_id = token_map.at(name);
}
else
{
token_id = token_map_start++;
token_map.insert(std::make_pair(name, token_id));
}
const auto offset = field_offset_start++;
custom_fields[classnum][offset] = {name, getter, setter}; custom_fields[classnum][offset] = {name, getter, setter};
(*game::plutonium::token_map_rev)[name] = token_id;
post_load_callbacks.push_back([classnum, name, token_id, offset]() post_load_callbacks.push_back([classnum, name, token_id, offset]()
{ {
@ -320,7 +329,7 @@ namespace gsc
scr_set_object_field_hook.create(0x52BCC0, scr_set_object_field_stub); scr_set_object_field_hook.create(0x52BCC0, scr_set_object_field_stub);
scr_post_load_scripts_hook.create(0x628B50, scr_post_load_scripts_stub); scr_post_load_scripts_hook.create(0x628B50, scr_post_load_scripts_stub);
field::add(classid::entity, "flags", field::add(classid::entity, "entityflags",
[](unsigned int entnum) -> scripting::script_value [](unsigned int entnum) -> scripting::script_value
{ {
const auto entity = &game::g_entities[entnum]; const auto entity = &game::g_entities[entnum];