small tweaks

This commit is contained in:
Simon 2022-02-23 23:56:59 +00:00
parent 4a93b7c591
commit 993eada4ee
3 changed files with 10 additions and 7 deletions

View file

@ -83,7 +83,7 @@ void CG_AdjustFrom640( float *x, float *y, float *w, float *h ) {
}
*x += (cg.refdef.width - (640 * screenXScale)) / 2.0f + xoffset;
*y += (cg.refdef.height - (480 * screenYScale)) / 2.0f + trap_Cvar_VariableValue( "vr_hudYOffset" );
*y += (cg.refdef.height - (480 * screenYScale)) / 2.0f - trap_Cvar_VariableValue( "vr_hudYOffset" );
}
}

View file

@ -605,7 +605,7 @@ void CG_EntityEvent( centity_t *cent, vec3_t position ) {
// smooth landing z changes
cg.landChange = -8;
cg.landTime = cg.time;
trap_HapticEvent("jump_landing", 0, 0, 20, 0, 0);
trap_HapticEvent("jump_landing", 0, 0, 40, 0, 0);
}
break;
case EV_FALL_MEDIUM:
@ -763,7 +763,7 @@ void CG_EntityEvent( centity_t *cent, vec3_t position ) {
if ( item->giType == IT_POWERUP || item->giType == IT_TEAM) {
trap_S_StartSound (NULL, es->number, CHAN_AUTO, cgs.media.n_healthSound );
if ( clientNum == cg.predictedPlayerState.clientNum ) {
trap_HapticEvent("pickup_weapon", 0, 0, 40, 0, 0);
trap_HapticEvent("pickup_weapon", 0, 0, 80, 0, 0);
}
} else if (item->giType == IT_PERSISTANT_POWERUP) {
#ifdef MISSIONPACK
@ -783,12 +783,12 @@ void CG_EntityEvent( centity_t *cent, vec3_t position ) {
}
#endif
if ( clientNum == cg.predictedPlayerState.clientNum ) {
trap_HapticEvent("pickup_weapon", 0, 0, 30, 0, 0);
trap_HapticEvent("pickup_weapon", 0, 0, 50, 0, 0);
}
} else {
trap_S_StartSound (NULL, es->number, CHAN_AUTO, trap_S_RegisterSound( item->pickup_sound, qfalse ) );
if ( clientNum == cg.predictedPlayerState.clientNum ) {
trap_HapticEvent("RTCWQuest:pickup_item", 0, 0, 20, 0, 0);
trap_HapticEvent("RTCWQuest:pickup_item", 0, 0, 100, 0, 0);
}
}

View file

@ -2348,10 +2348,13 @@ void CG_Player( centity_t *cent ) {
return;
}
// get the player model information
qboolean firstPersonBody = (!cg.renderingThirdPerson) &&
//Are we drawing the first person body
qboolean firstPersonBody = ( cent->currentState.number == cg.snap->ps.clientNum) &&
(!cg.renderingThirdPerson) &&
(cg_firstPersonBodyScale.value > 0.0f) &&
( cgs.gametype != GT_SINGLE_PLAYER );
// get the player model information
renderfx = 0;
if ( cent->currentState.number == cg.snap->ps.clientNum) {
if (!cg.renderingThirdPerson) {