teambeef/jkxr
0
0
Fork 0
mirror of https://github.com/DrBeef/JKXR.git synced 2024-11-21 19:51:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Allow player to recall saber to their hand with a gesture when it is dropped

Browse source
This commit is contained in:
Simon 2023-12-09 10:36:59 +00:00
parent 98bc53c9a3
commit 0c6d44f655
2 changed files with 62 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
Projects/Android/jni/OpenJK/code/cgame/cg_players.cpp
View file

@ -7010,8 +7010,37 @@ void CG_Player( centity_t *cent ) {
vr->velocitytriggered = (!cg.renderingThirdPerson && vr->velocitytriggered = (!cg.renderingThirdPerson &&
(cg.snap->ps.weapon == WP_SABER || cg.snap->ps.weapon == WP_MELEE || cg.snap->ps.weapon == WP_STUN_BATON)); (cg.snap->ps.weapon == WP_SABER || cg.snap->ps.weapon == WP_MELEE || cg.snap->ps.weapon == WP_STUN_BATON));
cvar_t *vr_motion_enable_saber = gi.cvar("vr_motion_enable_saber", "0", CVAR_ARCHIVE); cvar_t *vr_motion_enable_saber = gi.cvar("vr_motion_enable_saber", "0", CVAR_ARCHIVE);
vr->velocitytriggeractive = (cg.snap->ps.weapon == WP_SABER && (g_entities[0].client->ps.SaberActive() || vr_motion_enable_saber->integer)) ||
cg.snap->ps.weapon == WP_MELEE || cg.snap->ps.weapon == WP_STUN_BATON; switch (cg.snap->ps.weapon)
{
case WP_SABER:
{
gentity_t *saberent = &g_entities[cent->gent->client->ps.saberEntityNum];
if (g_entities[0].client->ps.SaberActive() || vr_motion_enable_saber->integer)
{
vr->velocitytriggeractive = true;
}
//Should we allow player to pull saber back with motion?
else if (cent->gent->client->ps.saberInFlight &&
saberent->s.pos.trType != TR_LINEAR)
{
vr->velocitytriggeractive = true;
}
else
{
vr->velocitytriggeractive = false;
}
break;
}
case WP_MELEE:
case WP_STUN_BATON:
vr->velocitytriggeractive = true;
break;
default:
vr->velocitytriggeractive = false;
break;
}
} }
G_RagDoll(cent->gent, cent->lerpAngles); G_RagDoll(cent->gent, cent->lerpAngles);

33
Projects/Android/jni/OpenJK/codeJK2/cgame/cg_players.cpp
View file

@ -4914,8 +4914,37 @@ void CG_Player(centity_t *cent ) {
vr->velocitytriggered = (!cg.renderingThirdPerson && vr->velocitytriggered = (!cg.renderingThirdPerson &&
(cg.snap->ps.weapon == WP_SABER || cg.snap->ps.weapon == WP_MELEE || cg.snap->ps.weapon == WP_STUN_BATON)); (cg.snap->ps.weapon == WP_SABER || cg.snap->ps.weapon == WP_MELEE || cg.snap->ps.weapon == WP_STUN_BATON));
cvar_t *vr_motion_enable_saber = gi.cvar("vr_motion_enable_saber", "0", CVAR_ARCHIVE); cvar_t *vr_motion_enable_saber = gi.cvar("vr_motion_enable_saber", "0", CVAR_ARCHIVE);
vr->velocitytriggeractive = ((cg.snap->ps.weapon == WP_SABER && (cent->gent->client->ps.saberActive || vr_motion_enable_saber->integer)) ||
cg.snap->ps.weapon == WP_MELEE || cg.snap->ps.weapon == WP_STUN_BATON); switch (cg.snap->ps.weapon)
{
case WP_SABER:
{
gentity_t *saberent = &g_entities[cent->gent->client->ps.saberEntityNum];
if (cent->gent->client->ps.saberActive || vr_motion_enable_saber->integer)
{
vr->velocitytriggeractive = true;
}
//Should we allow player to pull saber back with motion?
else if (cent->gent->client->ps.saberInFlight &&
saberent->s.pos.trType != TR_LINEAR)
{
vr->velocitytriggeractive = true;
}
else
{
vr->velocitytriggeractive = false;
}
break;
}
case WP_MELEE:
case WP_STUN_BATON:
vr->velocitytriggeractive = true;
break;
default:
vr->velocitytriggeractive = false;
break;
}
} }
//Get the player's light level for stealth calculations //Get the player's light level for stealth calculations