Future/T4SP-Server-Plugin
1
0
Fork 0
mirror of https://github.com/JezuzLizard/T4SP-Server-Plugin.git synced 2025-04-19 21:22:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix this symbol (again)

Browse Source
This commit is contained in:
ineed bots 2023-09-13 00:50:17 -06:00
parent a49298d915
commit bde17390e5
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/component/decomp/clientscript/re_cscr_compiler.cpp
View File

@ -53,7 +53,7 @@ namespace re_cscr_compiler
utils::hook::detour EmitEmptyArray_hook; utils::hook::detour EmitEmptyArray_hook;
utils::hook::detour EmitAnimation_hook; utils::hook::detour EmitAnimation_hook;
utils::hook::detour EmitFieldVariable_hook; utils::hook::detour EmitFieldVariable_hook;
utils::hook::detour EmitFieldVariableRef_hook; utils::hook::detour EmitClearFieldVariable_hook;
utils::hook::detour EmitObject_hook; utils::hook::detour EmitObject_hook;
utils::hook::detour EmitDecTop_hook; utils::hook::detour EmitDecTop_hook;
utils::hook::detour EmitCastFieldObject_hook; utils::hook::detour EmitCastFieldObject_hook;
@ -204,7 +204,7 @@ namespace re_cscr_compiler
void* EmitEmptyArray_original; void* EmitEmptyArray_original;
void* EmitAnimation_original; void* EmitAnimation_original;
void* EmitFieldVariable_original; void* EmitFieldVariable_original;
void* EmitFieldVariableRef_original; void* EmitClearFieldVariable_original;
void* EmitObject_original; void* EmitObject_original;
void* EmitDecTop_original; void* EmitDecTop_original;
void* EmitCastFieldObject_original; void* EmitCastFieldObject_original;
@ -1216,23 +1216,23 @@ namespace re_cscr_compiler
} }
} }
void EmitFieldVariableRef_call(game::scr_block_s* block, game::scriptInstance_t inst, [[maybe_unused]] void* caller_addr, game::sval_u expr, game::sval_u field, game::sval_u sourcePos, game::sval_u rhsSourcePos) void EmitClearFieldVariable_call(game::scr_block_s* block, game::scriptInstance_t inst, [[maybe_unused]] void* caller_addr, game::sval_u expr, game::sval_u field, game::sval_u sourcePos, game::sval_u rhsSourcePos)
{ {
#ifdef RE_CSCR_COMPILER_USE_WRAPPERS #ifdef RE_CSCR_COMPILER_USE_WRAPPERS
game::EmitFieldVariableRef(block, inst, expr, field, sourcePos, rhsSourcePos, EmitFieldVariableRef_original); game::EmitClearFieldVariable(block, inst, expr, field, sourcePos, rhsSourcePos, EmitClearFieldVariable_original);
#else #else
codsrc::EmitFieldVariableRef(block, inst, expr, field, sourcePos, rhsSourcePos); codsrc::EmitClearFieldVariable(block, inst, expr, field, sourcePos, rhsSourcePos);
#endif #endif
} }
// void __usercall EmitFieldVariableRef(game::scr_block_s *block@<eax>, game::scriptInstance_t inst@<esi>, game::sval_u expr, game::sval_u field, game::sval_u sourcePos) // void __usercall EmitClearFieldVariable(game::scr_block_s *block@<eax>, game::scriptInstance_t inst@<esi>, game::sval_u expr, game::sval_u field, game::sval_u sourcePos)
NAKED void EmitFieldVariableRef_stub() NAKED void EmitClearFieldVariable_stub()
{ {
_asm _asm
{ {
push esi; push esi;
push eax; push eax;
call EmitFieldVariableRef_call; call EmitClearFieldVariable_call;
add esp, 0x8; add esp, 0x8;
ret; ret;
} }
@ -3065,7 +3065,7 @@ namespace re_cscr_compiler
EmitEmptyArray_hook.create(game::EmitEmptyArray_ADDR(), EmitEmptyArray_stub); EmitEmptyArray_hook.create(game::EmitEmptyArray_ADDR(), EmitEmptyArray_stub);
EmitAnimation_hook.create(game::EmitAnimation_ADDR(), EmitAnimation_stub); EmitAnimation_hook.create(game::EmitAnimation_ADDR(), EmitAnimation_stub);
EmitFieldVariable_hook.create(game::EmitFieldVariable_ADDR(), EmitFieldVariable_stub); EmitFieldVariable_hook.create(game::EmitFieldVariable_ADDR(), EmitFieldVariable_stub);
EmitFieldVariableRef_hook.create(game::EmitFieldVariableRef_ADDR(), EmitFieldVariableRef_stub); EmitClearFieldVariable_hook.create(game::EmitClearFieldVariable_ADDR(), EmitClearFieldVariable_stub);
EmitObject_hook.create(game::EmitObject_ADDR(), EmitObject_stub); EmitObject_hook.create(game::EmitObject_ADDR(), EmitObject_stub);
EmitDecTop_hook.create(game::EmitDecTop_ADDR(), EmitDecTop_stub); EmitDecTop_hook.create(game::EmitDecTop_ADDR(), EmitDecTop_stub);
EmitCastFieldObject_hook.create(game::EmitCastFieldObject.get(), EmitCastFieldObject_stub); EmitCastFieldObject_hook.create(game::EmitCastFieldObject.get(), EmitCastFieldObject_stub);
@ -3217,7 +3217,7 @@ namespace re_cscr_compiler
EmitEmptyArray_original = EmitEmptyArray_hook.get_original(); EmitEmptyArray_original = EmitEmptyArray_hook.get_original();
EmitAnimation_original = EmitAnimation_hook.get_original(); EmitAnimation_original = EmitAnimation_hook.get_original();
EmitFieldVariable_original = EmitFieldVariable_hook.get_original(); EmitFieldVariable_original = EmitFieldVariable_hook.get_original();
EmitFieldVariableRef_original = EmitFieldVariableRef_hook.get_original(); EmitClearFieldVariable_original = EmitClearFieldVariable_hook.get_original();
EmitObject_original = EmitObject_hook.get_original(); EmitObject_original = EmitObject_hook.get_original();
EmitDecTop_original = EmitDecTop_hook.get_original(); EmitDecTop_original = EmitDecTop_hook.get_original();
EmitCastFieldObject_original = EmitCastFieldObject_hook.get_original(); EmitCastFieldObject_original = EmitCastFieldObject_hook.get_original();

4
src/game/clientscript/cscr_compiler.hpp
View File

@ -122,8 +122,8 @@ namespace game
void EmitAnimation(scriptInstance_t inst, sval_u anim, sval_u sourcePos, void* call_addr = EmitAnimation_ADDR()); void EmitAnimation(scriptInstance_t inst, sval_u anim, sval_u sourcePos, void* call_addr = EmitAnimation_ADDR());
inline void* EmitFieldVariable_ADDR() { return CALL_ADDR(0x0, 0x6811C0); } inline void* EmitFieldVariable_ADDR() { return CALL_ADDR(0x0, 0x6811C0); }
void EmitFieldVariable(scr_block_s* block, scriptInstance_t inst, sval_u expr, sval_u field, sval_u sourcePos, void* call_addr = EmitFieldVariable_ADDR()); void EmitFieldVariable(scr_block_s* block, scriptInstance_t inst, sval_u expr, sval_u field, sval_u sourcePos, void* call_addr = EmitFieldVariable_ADDR());
inline void* EmitFieldVariableRef_ADDR() { return CALL_ADDR(0x0, 0x681200); } inline void* EmitClearFieldVariable_ADDR() { return CALL_ADDR(0x0, 0x681200); }
void EmitFieldVariableRef(scr_block_s* block, scriptInstance_t inst, sval_u expr, sval_u field, sval_u sourcePos, sval_u rhsSourcePos, void* call_addr = EmitFieldVariableRef_ADDR()); void EmitClearFieldVariable(scr_block_s* block, scriptInstance_t inst, sval_u expr, sval_u field, sval_u sourcePos, sval_u rhsSourcePos, void* call_addr = EmitClearFieldVariable_ADDR());
inline void* EmitObject_ADDR() { return CALL_ADDR(0x0, 0x681310); } inline void* EmitObject_ADDR() { return CALL_ADDR(0x0, 0x681310); }
void EmitObject(scriptInstance_t inst, sval_u expr, sval_u sourcePos, void* call_addr = EmitObject_ADDR()); void EmitObject(scriptInstance_t inst, sval_u expr, sval_u sourcePos, void* call_addr = EmitObject_ADDR());
inline void* EmitDecTop_ADDR() { return CALL_ADDR(0x0, 0x681630); } inline void* EmitDecTop_ADDR() { return CALL_ADDR(0x0, 0x681630); }

4
src/game/clientscript/cscr_compiler_w.cpp
View File

@ -489,8 +489,8 @@ namespace game
} }
} }
// void __usercall EmitFieldVariableRef(scr_block_s *block@<eax>, scriptInstance_t inst@<esi>, sval_u expr, sval_u field, sval_u sourcePos) // void __usercall EmitClearFieldVariable(scr_block_s *block@<eax>, scriptInstance_t inst@<esi>, sval_u expr, sval_u field, sval_u sourcePos)
void EmitFieldVariableRef(scr_block_s* block, scriptInstance_t inst, sval_u expr, sval_u field, sval_u sourcePos, sval_u rhsSourcePos, void* call_addr) void EmitClearFieldVariable(scr_block_s* block, scriptInstance_t inst, sval_u expr, sval_u field, sval_u sourcePos, sval_u rhsSourcePos, void* call_addr)
{ {
__asm __asm
{ {