2021-11-07 06:16:56 -05:00
|
|
|
#include "STDInclude.hpp"
|
|
|
|
|
|
|
|
namespace Components
|
|
|
|
{
|
|
|
|
Dvar::Var Movement::PlayerDuckedSpeedScale;
|
|
|
|
Dvar::Var Movement::PlayerLastStandCrawlSpeedScale;
|
|
|
|
Dvar::Var Movement::PlayerProneSpeedScale;
|
2022-01-07 06:20:43 -05:00
|
|
|
Dvar::Var Movement::PlayerSpectateSpeedScale;
|
|
|
|
Dvar::Var Movement::CGUfoScaler;
|
|
|
|
Dvar::Var Movement::CGNoclipScaler;
|
2021-11-07 06:16:56 -05:00
|
|
|
|
2022-01-07 06:20:43 -05:00
|
|
|
float Movement::PM_CmdScaleForStance(const Game::pmove_s* pm)
|
2021-11-07 06:16:56 -05:00
|
|
|
{
|
2022-01-07 06:20:43 -05:00
|
|
|
assert(pm->ps != nullptr);
|
2021-11-07 06:16:56 -05:00
|
|
|
|
2022-01-07 06:20:43 -05:00
|
|
|
const auto* playerState = pm->ps;
|
2021-11-07 06:16:56 -05:00
|
|
|
float scale;
|
|
|
|
|
|
|
|
if (playerState->viewHeightLerpTime != 0 && playerState->viewHeightLerpTarget == 0xB)
|
|
|
|
{
|
2022-01-07 06:20:43 -05:00
|
|
|
scale = pm->cmd.serverTime - playerState->viewHeightLerpTime / 400.0f;
|
2021-11-07 06:16:56 -05:00
|
|
|
|
|
|
|
if (0.0f <= scale)
|
|
|
|
{
|
2022-01-07 06:20:43 -05:00
|
|
|
if (scale > 1.0f)
|
2021-11-07 06:16:56 -05:00
|
|
|
{
|
|
|
|
scale = 1.0f;
|
|
|
|
return scale * 0.15f + (1.0f - scale) * 0.65f;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (scale != 0.0f)
|
|
|
|
{
|
|
|
|
return scale * 0.15f + (1.0f - scale) * 0.65f;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((playerState->viewHeightLerpTime != 0 && playerState->viewHeightLerpTarget == 0x28) &&
|
|
|
|
playerState->viewHeightLerpDown == 0)
|
|
|
|
{
|
2022-01-07 06:20:43 -05:00
|
|
|
scale = 400.0f / pm->cmd.serverTime - playerState->viewHeightLerpTime;
|
2021-11-07 06:16:56 -05:00
|
|
|
|
|
|
|
if (0.0f <= scale)
|
|
|
|
{
|
2022-01-07 06:20:43 -05:00
|
|
|
if (scale > 1.0f)
|
2021-11-07 06:16:56 -05:00
|
|
|
{
|
|
|
|
scale = 1.0f;
|
|
|
|
}
|
|
|
|
else if (scale != 0.0f)
|
|
|
|
{
|
|
|
|
return scale * 0.65f + (1.0f - scale) * 0.15f;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
scale = 1.0f;
|
2022-01-07 06:20:43 -05:00
|
|
|
const auto stance = Game::PM_GetEffectiveStance(playerState);
|
2021-11-07 06:16:56 -05:00
|
|
|
|
|
|
|
if (stance == Game::PM_EFF_STANCE_PRONE)
|
|
|
|
{
|
|
|
|
scale = Movement::PlayerProneSpeedScale.get<float>();
|
|
|
|
}
|
|
|
|
|
|
|
|
else if (stance == Game::PM_EFF_STANCE_DUCKED)
|
|
|
|
{
|
|
|
|
scale = Movement::PlayerDuckedSpeedScale.get<float>();
|
|
|
|
}
|
|
|
|
|
|
|
|
else if (stance == Game::PM_EFF_STANCE_LASTSTANDCRAWL)
|
|
|
|
{
|
|
|
|
scale = Movement::PlayerLastStandCrawlSpeedScale.get<float>();
|
|
|
|
}
|
|
|
|
|
|
|
|
return scale;
|
|
|
|
}
|
|
|
|
|
2022-01-07 06:20:43 -05:00
|
|
|
__declspec(naked) void Movement::PM_CmdScaleForStanceStub()
|
2021-11-07 06:16:56 -05:00
|
|
|
{
|
|
|
|
__asm
|
|
|
|
{
|
|
|
|
pushad
|
|
|
|
|
|
|
|
push edx
|
2022-01-07 06:20:43 -05:00
|
|
|
call Movement::PM_CmdScaleForStance
|
2021-11-07 06:16:56 -05:00
|
|
|
add esp, 4
|
|
|
|
|
|
|
|
popad
|
|
|
|
ret
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-01-07 06:20:43 -05:00
|
|
|
float Movement::PM_MoveScale(Game::playerState_s* ps, float forwardmove,
|
|
|
|
float rightmove, float upmove)
|
2021-11-11 08:38:51 -05:00
|
|
|
{
|
2022-01-07 06:20:43 -05:00
|
|
|
assert(ps != nullptr);
|
|
|
|
|
|
|
|
auto max = (std::fabsf(forwardmove) < std::fabsf(rightmove))
|
|
|
|
? std::fabsf(rightmove)
|
|
|
|
: std::fabsf(forwardmove);
|
|
|
|
|
|
|
|
if (std::fabsf(upmove) > max)
|
|
|
|
{
|
|
|
|
max = std::fabsf(upmove);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (max == 0.0f)
|
|
|
|
{
|
|
|
|
return 0.0f;
|
|
|
|
}
|
|
|
|
|
|
|
|
auto total = std::sqrtf(forwardmove * forwardmove
|
|
|
|
+ rightmove * rightmove + upmove * upmove);
|
|
|
|
auto scale = (ps->speed * max) / (127.0f * total);
|
|
|
|
|
|
|
|
if (ps->pm_flags & Game::PMF_WALKING || ps->leanf != 0.0f)
|
|
|
|
{
|
|
|
|
scale *= 0.4f;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ps->pm_type == Game::PM_NOCLIP)
|
|
|
|
{
|
|
|
|
return scale * Movement::CGNoclipScaler.get<float>();
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ps->pm_type == Game::PM_UFO)
|
|
|
|
{
|
|
|
|
return scale * Movement::CGUfoScaler.get<float>();
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ps->pm_type == Game::PM_SPECTATOR)
|
|
|
|
{
|
|
|
|
return scale * Movement::PlayerSpectateSpeedScale.get<float>();
|
|
|
|
}
|
|
|
|
|
|
|
|
return scale;
|
|
|
|
}
|
|
|
|
|
|
|
|
__declspec(naked) void Movement::PM_MoveScaleStub()
|
|
|
|
{
|
|
|
|
__asm
|
|
|
|
{
|
|
|
|
pushad
|
|
|
|
|
|
|
|
push [esp + 0xC + 0x20]
|
|
|
|
push [esp + 0xC + 0x20]
|
|
|
|
push [esp + 0xC + 0x20]
|
|
|
|
push esi
|
|
|
|
call Movement::PM_MoveScale
|
|
|
|
add esp, 0x10
|
|
|
|
|
|
|
|
popad
|
|
|
|
ret
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
Game::dvar_t* Movement::Dvar_RegisterLastStandSpeedScale(const char* name, float value,
|
|
|
|
float min, float max, int, const char* desc)
|
|
|
|
{
|
|
|
|
Movement::PlayerLastStandCrawlSpeedScale = Dvar::Register<float>(name, value,
|
2021-11-11 08:40:52 -05:00
|
|
|
min, max, Game::DVAR_FLAG_CHEAT | Game::DVAR_FLAG_REPLICATED, desc);
|
2021-11-11 08:38:51 -05:00
|
|
|
|
|
|
|
return Movement::PlayerLastStandCrawlSpeedScale.get<Game::dvar_t*>();
|
|
|
|
}
|
|
|
|
|
2022-01-07 06:20:43 -05:00
|
|
|
Game::dvar_t* Movement::Dvar_RegisterSpectateSpeedScale(const char* name, float value,
|
|
|
|
float min, float max, int, const char* desc)
|
|
|
|
{
|
|
|
|
Movement::PlayerSpectateSpeedScale = Dvar::Register<float>(name, value,
|
|
|
|
min, max, Game::DVAR_FLAG_CHEAT | Game::DVAR_FLAG_REPLICATED, desc);
|
|
|
|
|
|
|
|
return Movement::PlayerSpectateSpeedScale.get<Game::dvar_t*>();
|
|
|
|
}
|
|
|
|
|
2021-11-07 06:16:56 -05:00
|
|
|
Movement::Movement()
|
|
|
|
{
|
|
|
|
Dvar::OnInit([]
|
|
|
|
{
|
|
|
|
Movement::PlayerDuckedSpeedScale = Dvar::Register<float>("player_duckedSpeedScale",
|
|
|
|
0.65f, 0.0f, 5.0f, Game::DVAR_FLAG_CHEAT | Game::DVAR_FLAG_REPLICATED,
|
|
|
|
"The scale applied to the player speed when ducking");
|
|
|
|
|
|
|
|
Movement::PlayerProneSpeedScale = Dvar::Register<float>("player_proneSpeedScale",
|
|
|
|
0.15f, 0.0f, 5.0f, Game::DVAR_FLAG_CHEAT | Game::DVAR_FLAG_REPLICATED,
|
|
|
|
"The scale applied to the player speed when crawling");
|
2022-01-07 06:20:43 -05:00
|
|
|
|
|
|
|
// 3arch naming convention
|
|
|
|
Movement::CGUfoScaler = Dvar::Register<float>("cg_ufo_scaler",
|
|
|
|
6.0f, 0.001f, 1000.0f, Game::DVAR_FLAG_CHEAT | Game::DVAR_FLAG_REPLICATED,
|
|
|
|
"The speed at which ufo camera moves");
|
|
|
|
|
|
|
|
Movement::CGNoclipScaler = Dvar::Register<float>("cg_noclip_scaler",
|
|
|
|
3.0f, 0.001f, 1000.0f, Game::DVAR_FLAG_CHEAT | Game::DVAR_FLAG_REPLICATED,
|
|
|
|
"The speed at which noclip camera moves");
|
2021-11-07 06:16:56 -05:00
|
|
|
});
|
|
|
|
|
2021-11-11 08:38:51 -05:00
|
|
|
// Hook PM_CmdScaleForStance in PM_CmdScale_Walk
|
2022-01-07 06:20:43 -05:00
|
|
|
Utils::Hook(0x572F34, Movement::PM_CmdScaleForStanceStub, HOOK_CALL).install()->quick();
|
2021-11-11 08:38:51 -05:00
|
|
|
|
|
|
|
//Hook PM_CmdScaleForStance in PM_GetMaxSpeed
|
2022-01-07 06:20:43 -05:00
|
|
|
Utils::Hook(0x57395F, Movement::PM_CmdScaleForStanceStub, HOOK_CALL).install()->quick();
|
2021-11-11 08:38:51 -05:00
|
|
|
|
|
|
|
// Hook Dvar_RegisterFloat. Only thing that's changed is that the 0x80 flag is not used.
|
|
|
|
Utils::Hook(0x448B66, Movement::Dvar_RegisterLastStandSpeedScale, HOOK_CALL).install()->quick();
|
2022-01-07 06:20:43 -05:00
|
|
|
|
|
|
|
// Hook Dvar_RegisterFloat. Only thing that's changed is that the 0x80 flag is not used.
|
|
|
|
Utils::Hook(0x448990, Movement::Dvar_RegisterSpectateSpeedScale, HOOK_CALL).install()->quick();
|
|
|
|
|
|
|
|
// Hook PM_MoveScale so we can add custom speed scale for Ufo and Noclip
|
|
|
|
Utils::Hook(0x56F845, Movement::PM_MoveScaleStub, HOOK_CALL).install()->quick();
|
|
|
|
Utils::Hook(0x56FABD, Movement::PM_MoveScaleStub, HOOK_CALL).install()->quick();
|
2021-11-07 06:16:56 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
Movement::~Movement()
|
|
|
|
{
|
|
|
|
}
|
|
|
|
}
|