From 08820dca32319b0766f206a0945ed083ff37b7eb Mon Sep 17 00:00:00 2001 From: explorer Date: Fri, 25 Oct 2024 08:12:24 +0300 Subject: [PATCH] game update, cwitch::getglowcolor --- Copy_Command.hpp | 10 +++++----- Entry_Point.cpp | 4 +++- Extended_Interface.hpp | 2 +- Paint.hpp | 6 +++--- Perform_Trace.hpp | 4 ++-- Read_Packets.hpp | 2 +- Send_Move.hpp | 2 +- 7 files changed, 16 insertions(+), 14 deletions(-) diff --git a/Copy_Command.hpp b/Copy_Command.hpp index b4e706e..907fef1 100644 --- a/Copy_Command.hpp +++ b/Copy_Command.hpp @@ -192,16 +192,16 @@ void __thiscall Redirected_Copy_Command(void* Unknown_Parameter, Command_Structu Extended_Command->Sequence_Shift += Sequence_Shift; - __int32 Command_Number = Command->Command_Number - 1; + __int32 Command_Number = Command->Command_Number; Traverse_Command_Batch_Label: { + Command_Number -= 1; + if (Command_Number >= *(__int32*)((unsigned __int32)Local_Player + 20)) { Extended_Commands[Command_Number % 150].Sequence_Shift = Extended_Command->Sequence_Shift; - Command_Number -= 1; - goto Traverse_Command_Batch_Label; } } @@ -263,11 +263,11 @@ void __thiscall Redirected_Copy_Command(void* Unknown_Parameter, Command_Structu if (Can_Attack_Type((unsigned __int32)Client_Module + 2541696)(Local_Player) == 1) { - void* Weapon = *(__int16*)((unsigned __int32)Local_Player + 7866) == 0 ? *(void**)((unsigned __int32)Client_Module + 7644532 + (((*(unsigned __int32*)((unsigned __int32)Local_Player + 4228) & 4095) - 4097) << 4)) : nullptr; + void* Weapon = *(__int8*)((unsigned __int32)Local_Player + 7867) == 0 ? *(void**)((unsigned __int32)Client_Module + 7644532 + (((*(unsigned __int32*)((unsigned __int32)Local_Player + 4228) & 4095) - 4097) << 4)) : nullptr; if (Weapon == nullptr) { - Block_Buttons = 0; + Block_Buttons = 2048; } else { diff --git a/Entry_Point.cpp b/Entry_Point.cpp index ff4901a..f6770fb 100755 --- a/Entry_Point.cpp +++ b/Entry_Point.cpp @@ -295,12 +295,14 @@ __int32 __stdcall DllMain(HMODULE This_Module, unsigned __int32 Call_Reason, voi _putws(L"[ + ] Paint"); { - Redirection_Manager::Redirect_Function(Original_Write_Texture_Caller, 0, (void*)((unsigned __int32)GetModuleHandleW(L"vguimatsurface.dll") + 100560), 1, (void*)Redirected_Write_Texture); + Redirection_Manager::Redirect_Function(Original_Write_Texture_Caller, 0, (void*)((unsigned __int32)GetModuleHandleW(L"vguimatsurface.dll") + 100592), 1, (void*)Redirected_Write_Texture); Redirection_Manager::Redirect_Function(1, (void*)((unsigned __int32)Client_Module + 2913504), (void*)Redirected_Paint); Redirection_Manager::Redirect_Function(Original_Get_Glow_Color_Caller, 1, (void*)((unsigned __int32)Client_Module + 2455600), 1, (void*)Redirected_Get_Glow_Color); + Byte_Manager::Set_Bytes(1, (void*)((unsigned __int32)Client_Module + 3244715), 1, 49); + Redirection_Manager::Redirect_Function(1, (void*)((unsigned __int32)Client_Module + 2301184), (void*)Redirected_Draw_Crosshair); Byte_Manager::Set_Bytes(1, (void*)((unsigned __int32)Client_Module + 2930985), 1, 235); diff --git a/Extended_Interface.hpp b/Extended_Interface.hpp index d0f6341..352a604 100755 --- a/Extended_Interface.hpp +++ b/Extended_Interface.hpp @@ -41,7 +41,7 @@ void Implement_Extended_Interface() { using Create_Console_Variable_Type = void(__thiscall*)(Interface_Structure* Interface, char* Name, char* Value, void* Unknown_Parameter_1, void* Unknown_Parameter_2, void* Handler); - Create_Console_Variable_Type((unsigned __int32)Engine_Module + 2636656)(Interface, Name, Value, nullptr, nullptr, Handler); + Create_Console_Variable_Type((unsigned __int32)Engine_Module + 2636368)(Interface, Name, Value, nullptr, nullptr, Handler); *(__int32*)((unsigned __int32)Interface + 20) &= ~10; diff --git a/Paint.hpp b/Paint.hpp index cd07354..dc0eaf9 100755 --- a/Paint.hpp +++ b/Paint.hpp @@ -304,7 +304,7 @@ void __thiscall Redirected_Paint(void* Panel) Write_Character = Text[0]; - Draw_Text_Type((unsigned __int32)Engine_Module + 2219056)(Font, 0, 0, 0, 0, 0, 0, Text); + Draw_Text_Type((unsigned __int32)Engine_Module + 2218736)(Font, 0, 0, 0, 0, 0, 0, Text); if (Character != L'~') { @@ -362,11 +362,11 @@ void __thiscall Redirected_Paint(void* Panel) if (Ghost == 0) { - Draw_Text_Type((unsigned __int32)Engine_Module + 2219056)(Font, Bounds[1] + 7 + Offset_X - Character_Bounds[0], Bounds[2] + Offset_Y, Paint_Data->Color[0], Paint_Data->Color[1], Paint_Data->Color[2], 255, Text); + Draw_Text_Type((unsigned __int32)Engine_Module + 2218736)(Font, Bounds[1] + 7 + Offset_X - Character_Bounds[0], Bounds[2] + Offset_Y, Paint_Data->Color[0], Paint_Data->Color[1], Paint_Data->Color[2], 255, Text); } else { - Draw_Text_Type((unsigned __int32)Engine_Module + 2219056)(Font, Bounds[1] + 7 + Offset_X - Character_Bounds[0], Bounds[2] + Offset_Y, 128, 128, 128, 255, Text); + Draw_Text_Type((unsigned __int32)Engine_Module + 2218736)(Font, Bounds[1] + 7 + Offset_X - Character_Bounds[0], Bounds[2] + Offset_Y, 128, 128, 128, 255, Text); } Write_Character = 0; diff --git a/Perform_Trace.hpp b/Perform_Trace.hpp index 1be6572..6383b8b 100755 --- a/Perform_Trace.hpp +++ b/Perform_Trace.hpp @@ -13,14 +13,14 @@ float Vector_Normalize(float* Vector) { using Vector_Normalize_Type = float(__thiscall*)(float* Vector); - return Vector_Normalize_Type((unsigned __int32)Client_Module + 3536176)(Vector); + return Vector_Normalize_Type((unsigned __int32)Client_Module + 3536192)(Vector); }; void Angle_Vectors(float* Angles, float* Forward, float* Right, float* Up) { using Angle_Vectors_Type = void(__cdecl*)(float* Angles, float* Forward, float* Right, float* Up); - Angle_Vectors_Type((unsigned __int32)Client_Module + 3539376)(Angles, Forward, Right, Up); + Angle_Vectors_Type((unsigned __int32)Client_Module + 3539392)(Angles, Forward, Right, Up); }; void __thiscall Perform_Trace(void* Stack) diff --git a/Read_Packets.hpp b/Read_Packets.hpp index 722d645..81f33a4 100755 --- a/Read_Packets.hpp +++ b/Read_Packets.hpp @@ -9,5 +9,5 @@ void Redirected_Read_Packets(__int8 Final) (decltype(&Redirected_Read_Packets)(Original_Read_Packets_Caller))(Final); } - Parsed_Packets = __builtin_return_address(0) != (void*)((unsigned __int32)Engine_Module + 1631551); + Parsed_Packets = __builtin_return_address(0) != (void*)((unsigned __int32)Engine_Module + 1631183); } \ No newline at end of file diff --git a/Send_Move.hpp b/Send_Move.hpp index b1e99a6..68c0922 100644 --- a/Send_Move.hpp +++ b/Send_Move.hpp @@ -8,7 +8,7 @@ void Redirected_Send_Move() { Byte_Manager::Set_Bytes(0, Message, sizeof(Message), 0); - *(void**)Message = (void*)((unsigned __int32)Engine_Module + 3501348); + *(void**)Message = (void*)((unsigned __int32)Engine_Module + 3501364); *(void**)((unsigned __int32)Message + 132) = Data;