Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

API: CSPlayer new members (physics related) #851

Merged
merged 7 commits into from
Sep 5, 2023
Merged

API: CSPlayer new members (physics related) #851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
79aa244
CSPlayer new members
dystopm Jul 17, 2023
3d49516
Force return value to be real
dystopm Jul 17, 2023
6c9f451
Forgot syntax
dystopm Jul 17, 2023
4fe644b
Update pm_shared.cpp
s1lentq Jul 18, 2023
a81c8d8
API refactory in pm_shared.cpp
dystopm Jul 18, 2023
eba02ff
Trim space
s1lentq Sep 5, 2023
466a372
Merge branch 'master' into csplayer-members
dystopm Sep 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 60 additions & 15 deletions regamedll/pm_shared/pm_shared.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ char pm_grgchTextureType[MAX_TEXTURES];
playermove_t *pmove = nullptr;
BOOL g_onladder = FALSE;

#ifdef REGAMEDLL_API
static CCSPlayer *pmoveplayer = nullptr;
#endif

#ifdef CLIENT_DLL
int iJumpSpectator;
float vJumpOrigin[3];
Expand Down Expand Up @@ -1907,9 +1911,16 @@ void EXT_FUNC __API_HOOK(PM_Duck)()
return;
}

pmove->cmd.forwardmove *= PLAYER_DUCKING_MULTIPLIER;
pmove->cmd.sidemove *= PLAYER_DUCKING_MULTIPLIER;
pmove->cmd.upmove *= PLAYER_DUCKING_MULTIPLIER;
real_t mult = PLAYER_DUCKING_MULTIPLIER;

#ifdef REGAMEDLL_API
if (pmoveplayer->m_flDuckSpeedMultiplier > 0.0)
mult = pmoveplayer->m_flDuckSpeedMultiplier;
#endif

pmove->cmd.forwardmove *= mult;
pmove->cmd.sidemove *= mult;
pmove->cmd.upmove *= mult;

if (pmove->cmd.buttons & IN_DUCK)
{
Expand Down Expand Up @@ -2023,7 +2034,16 @@ void EXT_FUNC __API_HOOK(PM_LadderMove)(physent_t *pLadder)

if (pmove->flags & FL_DUCKING)
{
flSpeed *= PLAYER_DUCKING_MULTIPLIER;
#ifdef REGAMEDLL_API
if (pmoveplayer->m_flDuckSpeedMultiplier > 0.0)
{
flSpeed *= pmoveplayer->m_flDuckSpeedMultiplier;
}
else
#endif
{
flSpeed *= PLAYER_DUCKING_MULTIPLIER;
}
}

if (pmove->cmd.buttons & IN_BACK)
Expand Down Expand Up @@ -2354,6 +2374,20 @@ void PM_PreventMegaBunnyJumping()
VectorScale(pmove->velocity, fraction, pmove->velocity);
}

inline real_t PM_JumpHeight(bool longjump)
{
#ifdef REGAMEDLL_API
if (longjump)
{
if(pmoveplayer->m_flLongJumpHeight > 0.0)
return pmoveplayer->m_flLongJumpHeight;
}
else if (pmoveplayer->m_flJumpHeight > 0.0)
return pmoveplayer->m_flJumpHeight;
#endif
return Q_sqrt(2.0 * 800.0f * (longjump ? 56.0f : 45.0f));
}

LINK_HOOK_VOID_CHAIN2(PM_Jump)

void EXT_FUNC __API_HOOK(PM_Jump)()
Expand Down Expand Up @@ -2432,16 +2466,12 @@ void EXT_FUNC __API_HOOK(PM_Jump)()
return;
}

#ifdef REGAMEDLL_API
const CCSPlayer* player = UTIL_PlayerByIndex(pmove->player_index + 1)->CSPlayer();
#endif

// don't pogo stick
if (pmove->oldbuttons & IN_JUMP
#ifdef REGAMEDLL_ADD
&& sv_autobunnyhopping.value <= 0.0
#ifdef REGAMEDLL_API
&& !player->m_bAutoBunnyHopping
&& !pmoveplayer->m_bAutoBunnyHopping
#endif
#endif
)
Expand All @@ -2462,7 +2492,7 @@ void EXT_FUNC __API_HOOK(PM_Jump)()
#ifdef REGAMEDLL_ADD
if (sv_enablebunnyhopping.value <= 0.0
#ifdef REGAMEDLL_API
&& !player->m_bMegaBunnyJumping
&& !pmoveplayer->m_bMegaBunnyJumping
#endif
)
#endif
Expand Down Expand Up @@ -2492,23 +2522,34 @@ void EXT_FUNC __API_HOOK(PM_Jump)()
{
pmove->punchangle[0] = -5.0f;

for (int i = 0; i < 2; i++)
#ifdef REGAMEDLL_API
if (pmoveplayer->m_flLongJumpForce > 0.0)
{
pmove->velocity[i] = pmove->forward[i] * PLAYER_LONGJUMP_SPEED * 1.6f;
fvel = pmoveplayer->m_flLongJumpForce;
}
else
#endif
{
fvel = PLAYER_LONGJUMP_SPEED * 1.6f;
}

for (int i = 0; i < 2; i++)
{
pmove->velocity[i] = pmove->forward[i] * fvel;
}

pmove->velocity[2] = Q_sqrt(2 * 800 * 56.0f);
pmove->velocity[2] = PM_JumpHeight(true);
}
else
{
pmove->velocity[2] = Q_sqrt(2 * 800 * 45.0f);
pmove->velocity[2] = PM_JumpHeight(false);
}
}
else
#endif
{
// NOTE: don't do it in .f (float)
pmove->velocity[2] = Q_sqrt(2.0 * 800.0f * 45.0f);
pmove->velocity[2] = PM_JumpHeight(false);
}

if (pmove->fuser2 > 0.0f)
Expand Down Expand Up @@ -3234,6 +3275,10 @@ void EXT_FUNC __API_HOOK(PM_Move)(struct playermove_s *ppmove, int server)
assert(pm_shared_initialized);

pmove = ppmove;

#ifdef REGAMEDLL_API
pmoveplayer = UTIL_PlayerByIndex(pmove->player_index + 1)->CSPlayer();
#endif

PM_PlayerMove((server != 0) ? TRUE : FALSE);

Expand Down
10 changes: 9 additions & 1 deletion regamedll/public/regamedll/API/CSPlayer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,11 @@ class CCSPlayer: public CCSMonster {
m_bAutoBunnyHopping(false),
m_bMegaBunnyJumping(false),
m_bPlantC4Anywhere(false),
m_bSpawnProtectionEffects(false)
m_bSpawnProtectionEffects(false),
m_flJumpHeight(0),
m_flLongJumpHeight(0),
m_flLongJumpForce(0),
m_flDuckSpeedMultiplier(0)
{
m_szModel[0] = '\0';
}
Expand Down Expand Up @@ -136,6 +140,10 @@ class CCSPlayer: public CCSMonster {
bool m_bMegaBunnyJumping;
bool m_bPlantC4Anywhere;
bool m_bSpawnProtectionEffects;
double m_flJumpHeight;
double m_flLongJumpHeight;
double m_flLongJumpForce;
double m_flDuckSpeedMultiplier;
};

// Inlines
Expand Down