nullworks/cathook
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1027 from nullworks/textmode_fixes

Browse Source 
Fix something i missed which still blocks textmode
This commit is contained in:
TotallyNotElite 2020-05-23 22:34:08 +02:00 committed by GitHub
commit ef59d93734
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.circleci/config.yml
View File

@ -8,3 +8,11 @@ jobs:
- run: - run:
name: "Compiling cathook" name: "Compiling cathook"
command: git submodule update --init --recursive; mkdir build; cd build; cmake -DEnableWarnings=0 ..; make -j8; cd .. command: git submodule update --init --recursive; mkdir build; cd build; cmake -DEnableWarnings=0 ..; make -j8; cd ..
textmode_build:
docker:
- image: nullworks/cathook-docker-ci-arch:latest
steps:
- checkout
- run:
name: "Compiling textmode cathook"
command: git submodule update --init --recursive; mkdir build; cd build; cmake -DCMAKE_BUILD_TYPE=Release -DVisuals_DrawType="Textmode" -DVACBypass=1 -DEnableWarnings=0 ..; make -j8; cd ..

4
include/hooks/HookedMethods.hpp
View File

@ -66,6 +66,8 @@ DECLARE_HOOKED_METHOD(ServerCmdKeyValues, void, IVEngineClient013 *, KeyValues *
// vgui::IPanel // vgui::IPanel
DECLARE_HOOKED_METHOD(PaintTraverse, void, vgui::IPanel *, unsigned int, bool, bool); DECLARE_HOOKED_METHOD(PaintTraverse, void, vgui::IPanel *, unsigned int, bool, bool);
#endif #endif
// IUniformRandomStream
DECLARE_HOOKED_METHOD(RandomInt, int, IUniformRandomStream *, int, int);
#if ENABLE_VISUALS #if ENABLE_VISUALS
// CHudChat // CHudChat
DECLARE_HOOKED_METHOD(StartMessageMode, int, CHudBaseChat *, int); DECLARE_HOOKED_METHOD(StartMessageMode, int, CHudBaseChat *, int);
@ -81,8 +83,6 @@ DECLARE_HOOKED_METHOD(SDL_PollEvent, int, SDL_Event *);
#if ENABLE_CLIP #if ENABLE_CLIP
DECLARE_HOOKED_METHOD(SDL_SetClipboardText, int, const char *); DECLARE_HOOKED_METHOD(SDL_SetClipboardText, int, const char *);
#endif #endif
// IUniformRandomStream
DECLARE_HOOKED_METHOD(RandomInt, int, IUniformRandomStream *, int, int);
#endif #endif
#if ENABLE_VISUALS || ENABLE_TEXTMODE #if ENABLE_VISUALS || ENABLE_TEXTMODE
DECLARE_HOOKED_METHOD(DrawModelExecute, void, IVModelRender *, const DrawModelState_t &, const ModelRenderInfo_t &, matrix3x4_t *); DECLARE_HOOKED_METHOD(DrawModelExecute, void, IVModelRender *, const DrawModelState_t &, const ModelRenderInfo_t &, matrix3x4_t *);

4
src/core/interfaces.cpp
View File

@ -161,9 +161,9 @@ void CreateInterfaces()
g_IMaterialSystem = BruteforceInterface<IMaterialSystemFixed>("VMaterialSystem", sharedobj::materialsystem()); g_IMaterialSystem = BruteforceInterface<IMaterialSystemFixed>("VMaterialSystem", sharedobj::materialsystem());
g_IMDLCache = BruteforceInterface<IMDLCache>("MDLCache", sharedobj::datacache()); g_IMDLCache = BruteforceInterface<IMDLCache>("MDLCache", sharedobj::datacache());
g_IPanel = BruteforceInterface<vgui::IPanel>("VGUI_Panel", sharedobj::vgui2()); g_IPanel = BruteforceInterface<vgui::IPanel>("VGUI_Panel", sharedobj::vgui2());
g_pUniformStream = **(IUniformRandomStream ***) (gSignatures.GetVstdSignature("A3 ? ? ? ? C3 89 F6") + 0x1);
#if ENABLE_VISUALS #if ENABLE_VISUALS
g_pUniformStream = **(IUniformRandomStream ***) (gSignatures.GetVstdSignature("A3 ? ? ? ? C3 89 F6") + 0x1);
g_IVDebugOverlay = BruteforceInterface<IVDebugOverlay>("VDebugOverlay", sharedobj::engine()); g_IVDebugOverlay = BruteforceInterface<IVDebugOverlay>("VDebugOverlay", sharedobj::engine());
g_ISurface = BruteforceInterface<vgui::ISurface>("VGUI_Surface", sharedobj::vguimatsurface()); g_ISurface = BruteforceInterface<vgui::ISurface>("VGUI_Surface", sharedobj::vguimatsurface());
g_IStudioRender = BruteforceInterface<IStudioRender>("VStudioRender", sharedobj::studiorender()); g_IStudioRender = BruteforceInterface<IStudioRender>("VStudioRender", sharedobj::studiorender());

1
src/hooks/CMakeLists.txt
View File

@ -11,6 +11,7 @@ set(files "${CMAKE_CURRENT_LIST_DIR}/CanPacket.cpp"
"${CMAKE_CURRENT_LIST_DIR}/others.cpp" "${CMAKE_CURRENT_LIST_DIR}/others.cpp"
"${CMAKE_CURRENT_LIST_DIR}/Paint.cpp" "${CMAKE_CURRENT_LIST_DIR}/Paint.cpp"
"${CMAKE_CURRENT_LIST_DIR}/PreDataUpdate.cpp" "${CMAKE_CURRENT_LIST_DIR}/PreDataUpdate.cpp"
"${CMAKE_CURRENT_LIST_DIR}/RandomInt.cpp"
"${CMAKE_CURRENT_LIST_DIR}/RunCommand.cpp" "${CMAKE_CURRENT_LIST_DIR}/RunCommand.cpp"
"${CMAKE_CURRENT_LIST_DIR}/SendNetMsg.cpp" "${CMAKE_CURRENT_LIST_DIR}/SendNetMsg.cpp"
"${CMAKE_CURRENT_LIST_DIR}/Shutdown.cpp" "${CMAKE_CURRENT_LIST_DIR}/Shutdown.cpp"

0
src/hooks/visual/RandomInt.cpp → src/hooks/RandomInt.cpp
View File

1
src/hooks/visual/CMakeLists.txt
View File

@ -4,7 +4,6 @@ set(files "${CMAKE_CURRENT_LIST_DIR}/BeginFrame.cpp"
"${CMAKE_CURRENT_LIST_DIR}/FrameStageNotify.cpp" "${CMAKE_CURRENT_LIST_DIR}/FrameStageNotify.cpp"
"${CMAKE_CURRENT_LIST_DIR}/OverrideView.cpp" "${CMAKE_CURRENT_LIST_DIR}/OverrideView.cpp"
"${CMAKE_CURRENT_LIST_DIR}/PaintTraverse.cpp" "${CMAKE_CURRENT_LIST_DIR}/PaintTraverse.cpp"
"${CMAKE_CURRENT_LIST_DIR}/RandomInt.cpp"
"${CMAKE_CURRENT_LIST_DIR}/SDL_GL_SwapWindow.cpp" "${CMAKE_CURRENT_LIST_DIR}/SDL_GL_SwapWindow.cpp"
"${CMAKE_CURRENT_LIST_DIR}/SDL_PollEvent.cpp" "${CMAKE_CURRENT_LIST_DIR}/SDL_PollEvent.cpp"
"${CMAKE_CURRENT_LIST_DIR}/IN_KeyEvent.cpp") "${CMAKE_CURRENT_LIST_DIR}/IN_KeyEvent.cpp")