Browse Source

Don't write viewangles to engine while dead(fix of rotating corpses). Don't let any movement during intermission

wantedhl
a1batross 8 years ago
parent
commit
a52fda0b19
  1. 35
      cl_dll/input_xash3d.cpp
  2. 23
      cl_dll/view.cpp

35
cl_dll/input_xash3d.cpp

@ -54,6 +54,8 @@ float rel_pitch; @@ -54,6 +54,8 @@ float rel_pitch;
#define IMPULSE_DOWN 2
#define IMPULSE_UP 4
bool CL_IsDead();
Vector dead_viewangles(0, 0, 0);
void IN_ToggleButtons( float forwardmove, float sidemove )
{
@ -152,9 +154,17 @@ void IN_ClientLookEvent( float relyaw, float relpitch ) @@ -152,9 +154,17 @@ void IN_ClientLookEvent( float relyaw, float relpitch )
void IN_Move( float frametime, usercmd_t *cmd )
{
Vector viewangles;
gEngfuncs.GetViewAngles( viewangles );
bool fLadder = false;
if( cl_laddermode->value !=2 ) fLadder = gEngfuncs.GetLocalPlayer()->curstate.movetype == MOVETYPE_FLY;
if( gHUD.m_iIntermission )
return; // we can't move during intermission
if( cl_laddermode->value != 2 )
{
cl_entity_t *pplayer = gEngfuncs.GetLocalPlayer();
if( pplayer )
fLadder = pplayer->curstate.movetype == MOVETYPE_FLY;
}
//if(ac_forwardmove || ac_sidemove)
//gEngfuncs.Con_Printf("Move: %f %f %f %f\n", ac_forwardmove, ac_sidemove, rel_pitch, rel_yaw);
#if 0
@ -163,8 +173,14 @@ void IN_Move( float frametime, usercmd_t *cmd ) @@ -163,8 +173,14 @@ void IN_Move( float frametime, usercmd_t *cmd )
V_StopPitchDrift();
}
#endif
if( !gHUD.m_iIntermission )
if( CL_IsDead() )
{
viewangles = dead_viewangles; // HACKHACK: see below
}
else
{
gEngfuncs.GetViewAngles( viewangles );
}
if( gHUD.GetSensitivity() != 0 )
{
rel_yaw *= gHUD.GetSensitivity();
@ -175,7 +191,6 @@ void IN_Move( float frametime, usercmd_t *cmd ) @@ -175,7 +191,6 @@ void IN_Move( float frametime, usercmd_t *cmd )
rel_yaw *= sensitivity->value;
rel_pitch *= sensitivity->value;
}
viewangles[YAW] += rel_yaw;
if( fLadder )
{
@ -187,15 +202,20 @@ void IN_Move( float frametime, usercmd_t *cmd ) @@ -187,15 +202,20 @@ void IN_Move( float frametime, usercmd_t *cmd )
gHUD.m_MOTD.scroll += rel_pitch;
else
viewangles[PITCH] += rel_pitch;
if (viewangles[PITCH] > cl_pitchdown->value)
viewangles[PITCH] = cl_pitchdown->value;
if (viewangles[PITCH] < -cl_pitchup->value)
viewangles[PITCH] = -cl_pitchup->value;
// HACKHACK: change viewangles directly in viewcode,
// so viewangles when player is dead will not be changed on server
if( !CL_IsDead() )
{
gEngfuncs.SetViewAngles( viewangles );
}
float rgfl[3];
viewangles.CopyToArray( rgfl );
gEngfuncs.SetViewAngles( rgfl );
dead_viewangles = viewangles; // keep them actual
if( ac_movecount )
{
IN_ToggleButtons( ac_forwardmove / ac_movecount, ac_sidemove / ac_movecount );
@ -206,7 +226,6 @@ void IN_Move( float frametime, usercmd_t *cmd ) @@ -206,7 +226,6 @@ void IN_Move( float frametime, usercmd_t *cmd )
cmd->forwardmove *= cl_movespeedkey->value;
cmd->sidemove *= cl_movespeedkey->value;
}
}
ac_sidemove = ac_forwardmove = rel_pitch = rel_yaw = 0;

23
cl_dll/view.cpp

@ -78,6 +78,7 @@ extern cvar_t *cl_forwardspeed; @@ -78,6 +78,7 @@ extern cvar_t *cl_forwardspeed;
extern cvar_t *chase_active;
extern cvar_t *scr_ofsx, *scr_ofsy, *scr_ofsz;
extern cvar_t *cl_vsmoothing;
extern Vector dead_viewangles;
#define CAM_MODE_RELAX 1
#define CAM_MODE_FOCUS 2
@ -446,7 +447,14 @@ void V_CalcNormalRefdef ( struct ref_params_s *pparams ) @@ -446,7 +447,14 @@ void V_CalcNormalRefdef ( struct ref_params_s *pparams )
pparams->vieworg[2] += ( bob );
VectorAdd( pparams->vieworg, pparams->viewheight, pparams->vieworg );
if( pparams->health <= 0 )
{
VectorCopy( dead_viewangles, pparams->viewangles );
}
else
{
VectorCopy ( pparams->cl_viewangles, pparams->viewangles );
}
gEngfuncs.V_CalcShake();
gEngfuncs.V_ApplyShake( pparams->vieworg, pparams->viewangles, 1.0 );
@ -525,7 +533,14 @@ void V_CalcNormalRefdef ( struct ref_params_s *pparams ) @@ -525,7 +533,14 @@ void V_CalcNormalRefdef ( struct ref_params_s *pparams )
V_AddIdle ( pparams );
// offsets
if ( pparams->health <= 0 )
{
VectorCopy( dead_viewangles, angles );
}
else
{
VectorCopy( pparams->cl_viewangles, angles );
}
AngleVectors ( angles, pparams->forward, pparams->right, pparams->up );
@ -559,8 +574,14 @@ void V_CalcNormalRefdef ( struct ref_params_s *pparams ) @@ -559,8 +574,14 @@ void V_CalcNormalRefdef ( struct ref_params_s *pparams )
}
// Give gun our viewangles
if ( pparams->health <= 0 )
{
VectorCopy( dead_viewangles, view->angles );
}
else
{
VectorCopy ( pparams->cl_viewangles, view->angles );
}
// set up gun position
V_CalcGunAngle ( pparams );

Loading…
Cancel
Save