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

Fixes for pluto update

Browse Source
This commit is contained in:
Federico Cecchetto 2021-11-07 02:33:16 +01:00
parent e8cad54293
commit 705ad50d65
4 changed files with 7 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
src/component/gsc.cpp
View File

@ -14,8 +14,6 @@
namespace gsc namespace gsc
{ {
std::unordered_map<const char*, const char*> replaced_functions;
function_args::function_args(std::vector<scripting::script_value> values) function_args::function_args(std::vector<scripting::script_value> values)
: values_(values) : values_(values)
{ {
@ -109,7 +107,7 @@ namespace gsc
{ {
if (id < 0x200) if (id < 0x200)
{ {
return reinterpret_cast<builtin_function*>(0x1D6EB34)[id](); return reinterpret_cast<builtin_function*>(0x20689DD8)[id]();
} }
try try
@ -135,7 +133,7 @@ namespace gsc
{ {
if (id < 0x8400) if (id < 0x8400)
{ {
return reinterpret_cast<builtin_method*>(0x1D4F258)[id](ent); return reinterpret_cast<builtin_method*>(0x2068A5A8)[id - 0x8000](ent);
} }
try try
@ -201,62 +199,6 @@ namespace gsc
retn retn
} }
} }
const char* replaced_pos = 0;
void get_replaced_pos(const char* pos)
{
if (replaced_functions.find(pos) != replaced_functions.end())
{
replaced_pos = replaced_functions[pos];
}
}
__declspec(naked) void vm_execute_stub()
{
__asm
{
pushad
push esi
call get_replaced_pos
pop esi
popad
cmp replaced_pos, 0
jne set_pos
movzx eax, byte ptr[esi]
inc esi
jmp loc_1
loc_1:
mov [ebp - 0x18], eax
mov [ebp - 0x8], esi
push ecx
mov ecx, 0x20B8E28
mov [ecx], eax
mov ecx, 0x20B4A5C
mov[ecx], esi
pop ecx
cmp eax, 0x98
push 0x56B740
retn
set_pos:
mov esi, replaced_pos
mov replaced_pos, 0
movzx eax, byte ptr[esi]
inc esi
jmp loc_1
}
}
} }
namespace function namespace function
@ -292,16 +234,6 @@ namespace gsc
return {}; return {};
}); });
function::add("replacefunc", [](const function_args& args) -> scripting::script_value
{
const auto what = args[0].as<scripting::function>();
const auto with = args[1].as<scripting::function>();
replaced_functions[what.get_pos()] = with.get_pos();
return {};
});
function::add("addcommand", [](const function_args& args) -> scripting::script_value function::add("addcommand", [](const function_args& args) -> scripting::script_value
{ {
const auto name = args[0].as<std::string>(); const auto name = args[0].as<std::string>();
@ -360,11 +292,12 @@ namespace gsc
playerState->perks[0] = toggle playerState->perks[0] = toggle
? flags | 0x4000u ? flags | 0x4000u
: flags & ~0x4000u; : flags & ~0x4000u;
return {};
}); });
utils::hook::jump(0x56C8EB, call_builtin_stub); utils::hook::jump(0x56C8EB, call_builtin_stub);
utils::hook::jump(0x56CBDC, call_builtin_method_stub); utils::hook::jump(0x56CBDC, call_builtin_method_stub);
utils::hook::jump(0x56B726, vm_execute_stub);
} }
}; };
} }

2
src/component/gsc.hpp
View File

@ -2,8 +2,6 @@
namespace gsc namespace gsc
{ {
extern std::unordered_map<const char*, const char*> replaced_functions;
class function_args class function_args
{ {
public: public:

1
src/component/scripting.cpp
View File

@ -77,7 +77,6 @@ namespace scripting
{ {
userinfo::clear_overrides(); userinfo::clear_overrides();
command::clear_script_commands(); command::clear_script_commands();
gsc::replaced_functions.clear();
g_shutdown_game_hook.invoke<void>(free_scripts); g_shutdown_game_hook.invoke<void>(free_scripts);
} }

6
src/game/scripting/functions.cpp
View File

@ -59,15 +59,15 @@ namespace scripting
script_function get_function_by_index(const unsigned index) script_function get_function_by_index(const unsigned index)
{ {
static const auto function_table = 0x1D6EB34; static const auto function_table = 0x20689DD8;
static const auto method_table = 0x1D4F258; static const auto method_table = 0x2068A5A8;
if (index < 0x1C7) if (index < 0x1C7)
{ {
return reinterpret_cast<script_function*>(function_table)[index]; return reinterpret_cast<script_function*>(function_table)[index];
} }
return reinterpret_cast<script_function*>(method_table)[index]; return reinterpret_cast<script_function*>(method_table)[index - 0x8000];
} }
} }