Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Python patcher compatibility #100

Merged
merged 14 commits into from
Nov 12, 2024
Merged

Python patcher compatibility #100

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
46e507c
move include dir on same level as section
4z0t Nov 11, 2024
0391d77
remove section.ld
4z0t Nov 11, 2024
4b90359
ignore generated files
4z0t Nov 11, 2024
89c97c0
fix include of workflow
4z0t Nov 11, 2024
75f22a2
fix relative includes
4z0t Nov 11, 2024
bee7eb0
call ctors on startup
4z0t Nov 11, 2024
839e977
fix other stuff for python patcher
4z0t Nov 11, 2024
acd3ed3
Delete config.txt
4z0t Nov 11, 2024
8f05561
Add the ability to bind the side mouse buttons (#96)
RutreD Nov 10, 2024
3bdd1c0
fix include in recent changes
4z0t Nov 11, 2024
a82f9d8
Merge branch 'master' into PythonPatcherCompatibility
4z0t Nov 11, 2024
db45857
Merge branch 'master' into PythonPatcherCompatibility
4z0t Nov 11, 2024
b2b10a0
proper types
4z0t Nov 12, 2024
1f28750
remove unsused funcitonality
4z0t Nov 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,8 @@ section.cpp
*.til
*.nam

.vscode
.vscode

section.ld
section/main.cpp
section/main.cxx
5 changes: 0 additions & 5 deletions config.txt
View file
Open in desktop

This file was deleted.

7 changes: 1 addition & 6 deletions hooks/HFAExtLoad.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
#include "../define.h"
asm(
".section h0; .set h0,0xA8EF63;"
"JMP "QU(FAExtLoad)";"

#ifdef STARTUP
".section h1; .set h1,0x45A926;"
"push eax;"
"call "QU(STARTUP)";"
"call "QU(InitCtors)";"
"pop eax;"
"ret 8;"
#endif
);
10 changes: 5 additions & 5 deletions hooks/LuaFuncRegs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "../define.h"
asm(
".section h0; .set h0,0xC0FA60;"
".int "QU(LuaFuncsReg)";"
);
// #include "../define.h"
4z0t marked this conversation as resolved.
Show resolved Hide resolved
// asm(
// ".section h0; .set h0,0xC0FA60;"
// ".int "QU(LuaFuncsReg)";"
// );
2 changes: 1 addition & 1 deletion section/include/CObject.h → include/CObject.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ Result<CScriptClass> GetCScriptObject(lua_State *l, int index)
{
using CScriptType = typename CScriptClass::Type;
using TResult = Result<CScriptClass>;
void **obj = GetCObject(l, index);
void **obj = reinterpret_cast<void**>(GetCObject(l, index));
if (obj == nullptr)
{
return TResult::Fail(s_ExpectedAGameObject);
Expand Down
Loading
Loading