teambeef
/
jkxr
mirror of https://github.com/DrBeef/JKXR.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Off-hand-use-gesture-savegame-fix

This commit is contained in:
Simon 2023-03-05 19:53:50 +00:00
parent 4127f788e8
commit 3f869386a3
3 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Projects/Android/jni/OpenJK/code/game/bg_pmove.cpp
View File

@ -9775,30 +9775,32 @@ void PM_Use( void )
pm->ps->useTime = USE_DELAY;
}
// Not added into PlayerStateBase as it affects save state
int altUseTime = 0;
void PM_AltUse( void )
{
if ( pm->ps->altUseTime > 0 )
if ( altUseTime > 0 )
{
pm->ps->altUseTime -= pml.msec;
if ( pm->ps->altUseTime < 0 )
altUseTime -= pml.msec;
if ( altUseTime < 0 )
{
pm->ps->altUseTime = 0;
altUseTime = 0;
}
}
if ( pm->ps->altUseTime > 0 ) {
if ( altUseTime > 0 ) {
return;
}
if ( ! (pm->cmd.buttons & BUTTON_ALT_USE ) )
{
pm->altUseEvent = 0;
pm->ps->altUseTime = 0;
altUseTime = 0;
return;
}
pm->altUseEvent = EV_USE;
pm->ps->altUseTime = USE_DELAY;
altUseTime = USE_DELAY;
}
extern saberMoveName_t PM_AttackForEnemyPos( qboolean allowFB, qboolean allowStabDown );

1
Projects/Android/jni/OpenJK/code/qcommon/q_shared.h
View File

@ -1668,7 +1668,6 @@ public:
//int vehicleExplodeTime; //when it will go BOOM!
int useTime; //not sent
int altUseTime; //not sent
int lastShotTime;//last time you shot your weapon
int ping; // server to game info for scoreboard
int lastOnGround; //last time you were on the ground

16
Projects/Android/jni/OpenJK/codeJK2/game/bg_pmove.cpp
View File

@ -5996,30 +5996,32 @@ void PM_Use( void )
pm->ps->useTime = USE_DELAY;
}
// Not added into PlayerStateBase as it affects save state
int altUseTime = 0;
void PM_AltUse( void )
{
if ( pm->ps->altUseTime > 0 )
if ( altUseTime > 0 )
{
pm->ps->altUseTime -= pml.msec;
if ( pm->ps->altUseTime < 0 )
altUseTime -= pml.msec;
if ( altUseTime < 0 )
{
pm->ps->altUseTime = 0;
altUseTime = 0;
}
}
if ( pm->ps->altUseTime > 0 ) {
if ( altUseTime > 0 ) {
return;
}
if ( ! (pm->cmd.buttons & BUTTON_ALT_USE ) )
{
pm->altUseEvent = 0;
pm->ps->altUseTime = 0;
altUseTime = 0;
return;
}
pm->altUseEvent = EV_USE;
pm->ps->altUseTime = USE_DELAY;
altUseTime = USE_DELAY;
}
extern int PM_AttackForEnemyPos( qboolean allowFB );