From 11558e5cdce57b4f90dd28ab1319012eac454438 Mon Sep 17 00:00:00 2001 From: Rxann <80224521+Rxann@users.noreply.github.com> Date: Tue, 25 Jun 2024 11:03:24 -0400 Subject: [PATCH] bump for rdr-classes migration --- cmake/rdr-classes.cmake | 2 +- src/game/hooks/Hooks.hpp | 24 +------------------ .../hooks/Protections/ReceiveNetMessage.cpp | 2 ++ 3 files changed, 4 insertions(+), 24 deletions(-) diff --git a/cmake/rdr-classes.cmake b/cmake/rdr-classes.cmake index 67059ff5..e8c50b46 100644 --- a/cmake/rdr-classes.cmake +++ b/cmake/rdr-classes.cmake @@ -3,7 +3,7 @@ include(FetchContent) FetchContent_Declare( rdr_classes GIT_REPOSITORY https://github.com/YimMenu/RDR-Classes.git - GIT_TAG 70091e27d2e0e515f0e34cb1983ab965421dab0e + GIT_TAG 99bae26b377a1075172caf4842889d24f8344054 GIT_PROGRESS TRUE CONFIGURE_COMMAND "" BUILD_COMMAND "" diff --git a/src/game/hooks/Hooks.hpp b/src/game/hooks/Hooks.hpp index 2d44fed8..94d44f6d 100644 --- a/src/game/hooks/Hooks.hpp +++ b/src/game/hooks/Hooks.hpp @@ -15,33 +15,11 @@ namespace rage class CMsgJoinResponse; class rlGamerInfo; class netConnectionManager; -#pragma pack(push, 8) - class InFrame - { - public: - enum class EventType - { - ConnectionClosed = 4, - FrameReceived = 5, - BandwidthExceeded = 6, - OutOfMemory = 7 - }; - - virtual ~InFrame() = default; - - virtual void Destroy() = 0; - virtual EventType GetEventType() = 0; - virtual uint32_t _0x18() = 0; - - char pad_0[0x70]; // 0x8 - uint32_t m_Length; // 0x78 - void* m_Data; // 0x80 - }; -#pragma pack(pop) class rlGamerInfo; class ServerMsg; class ServerMsgData; class ServerRPCSerializer; + class InFrame; } class CNetGamePlayer; enum class NetEventType; diff --git a/src/game/hooks/Protections/ReceiveNetMessage.cpp b/src/game/hooks/Protections/ReceiveNetMessage.cpp index 50d5fd6f..0038e31b 100644 --- a/src/game/hooks/Protections/ReceiveNetMessage.cpp +++ b/src/game/hooks/Protections/ReceiveNetMessage.cpp @@ -5,9 +5,11 @@ #include "game/rdr/Enums.hpp" #include "game/rdr/Player.hpp" +#include #include + namespace YimMenu::Features { BoolCommand _LogPackets("logpackets", "Log Packets", "Log Packets");