teambeef/ioq3quest
0
0
Fork 0
mirror of https://github.com/DrBeef/ioq3quest.git synced 2024-11-23 04:12:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #56 from petr666/feature/various-fixes

Browse source 
Remove fake 6DoF position realign from weapon change
This commit is contained in:
Simon 2022-04-09 14:05:46 +01:00 committed by GitHub
commit bef1e32a2c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
android/app/src/main/cpp/code/cgame/cg_event.c
View file

@ -837,7 +837,6 @@ void CG_EntityEvent( centity_t *cent, vec3_t position ) {
DEBUGNAME("EV_CHANGE_WEAPON"); DEBUGNAME("EV_CHANGE_WEAPON");
trap_S_StartSound (NULL, es->number, CHAN_AUTO, cgs.media.selectSound ); trap_S_StartSound (NULL, es->number, CHAN_AUTO, cgs.media.selectSound );
if ( clientNum == cg.predictedPlayerState.clientNum ) { if ( clientNum == cg.predictedPlayerState.clientNum ) {
vr->realign = 3; // auto trigger weapon re-align in 4 frames
int position = vr->weapon_stabilised ? 4 : (vr->right_handed ? 1 : 2); int position = vr->weapon_stabilised ? 4 : (vr->right_handed ? 1 : 2);
trap_HapticEvent("weapon_switch", 0, 0, 100, 0, 0); trap_HapticEvent("weapon_switch", 0, 0, 100, 0, 0);
} }
@ -922,7 +921,7 @@ void CG_EntityEvent( centity_t *cent, vec3_t position ) {
trap_S_StartSound (NULL, es->number, CHAN_AUTO, cgs.media.teleInSound ); trap_S_StartSound (NULL, es->number, CHAN_AUTO, cgs.media.teleInSound );
CG_SpawnEffect( position); CG_SpawnEffect( position);
if (clientNum == cg.predictedPlayerState.clientNum) { if (clientNum == cg.predictedPlayerState.clientNum) {
vr->realign = 3; // auto trigger weapon re-align in 4 frames vr->realign = 3; // Initiate position reset for fake 6DoF
trap_HapticEvent("spark", 0, 0, 80, 0, 0); trap_HapticEvent("spark", 0, 0, 80, 0, 0);
} }
break; break;