diff --git a/Copy_Command.hpp b/Copy_Command.hpp index 177e18e..252d546 100644 --- a/Copy_Command.hpp +++ b/Copy_Command.hpp @@ -80,6 +80,8 @@ void __thiscall Redirected_Copy_Command(void* Unknown_Parameter, Command_Structu if (*(__int8*)((unsigned __int32)Local_Player + 327) == 0) { + Command->Buttons |= 4194304 * (Command->Command_Number % 2); + float Move_Angles[3] = { Command->Angles[0], @@ -300,8 +302,6 @@ void __thiscall Redirected_Copy_Command(void* Unknown_Parameter, Command_Structu if ((*(float*)((unsigned __int32)Local_Player + 4604) + 800.f * Global_Variables->Interval_Per_Tick >= 560.f) + *(__int8*)((unsigned __int32)Local_Player + 8068) + *(__int8*)((unsigned __int32)Local_Player + 9708) != 0) { Sequence_Shift(2); - - Command->Buttons |= 4194304; } else { @@ -538,10 +538,10 @@ void __thiscall Redirected_Copy_Command(void* Unknown_Parameter, Command_Structu using Select_Sequence_Type = __int32(__thiscall*)(void* Entity, __int32 Activity); - using Get_Deploy_Activity_Type = __int32(__thiscall**)(void* Weapon); - using Translate_Activity_Type = __int32(__thiscall**)(void* Weapon, __int32 Activity); + using Get_Deploy_Activity_Type = __int32(__thiscall**)(void* Weapon); + Holstering = (min(*(float*)((unsigned __int32)Local_Player + 3872), *(float*)((unsigned __int32)Weapon + 2412)) + Get_Sequence_Duration_Type((unsigned __int32)Client_Module + 180400)(Weapon, Get_Studio_Header(Weapon), Select_Sequence_Type((unsigned __int32)Client_Module + 202896)(Weapon, (*Translate_Activity_Type(*(unsigned __int32*)Weapon + 1692))(Weapon, (*Get_Deploy_Activity_Type(*(unsigned __int32*)Weapon + 1600))(Weapon)))) > Global_Variables->Current_Time) * (Can_Attack ^ 1); } else diff --git a/Perform_Trace.hpp b/Perform_Trace.hpp index 727954c..737907b 100755 --- a/Perform_Trace.hpp +++ b/Perform_Trace.hpp @@ -290,7 +290,7 @@ void __thiscall Perform_Trace(void* Stack) { if (__builtin_strstr(Get_Sequence_Name(Entity), "limb") != nullptr) { - Damage = std::clamp(Damage, 0.f, *(__int32*)((unsigned __int32)Entity + 236) - 1.f); + Damage = min(Damage, *(__int32*)((unsigned __int32)Entity + 236) - 1.f); } } }