diff --git a/WinQuake/vid_x.c b/WinQuake/vid_x.c index 9db548e..e44dbd0 100644 --- a/WinQuake/vid_x.c +++ b/WinQuake/vid_x.c @@ -1218,7 +1218,7 @@ void IN_Commands (void) extern vec3_t deathcam_angles; //eukara - deathcam void IN_Move (usercmd_t *cmd) { - vec3_t tangles; + vec3_t tangles; // eukara - deathcam if (!mouse_avail) return; @@ -1233,14 +1233,13 @@ void IN_Move (usercmd_t *cmd) mouse_x *= sensitivity->value; mouse_y *= sensitivity->value; -#if 1 if (deathcam_yesiamdead){ tangles[0] = deathcam_angles[0]; tangles[1] = deathcam_angles[1]; tangles[2] = deathcam_angles[2]; } else{ tangles[0] = cl.viewangles[0]; tangles[1] = cl.viewangles[1]; tangles[2] = cl.viewangles[2]; } -#endif + if ( (in_strafe.state & 1) || (lookstrafe->value && ((in_mlook.state & 1) ^ ((int)m_look->value & 1)) )) // 2001-12-16 M_LOOK cvar by Heffo/Maddes cmd->sidemove += m_side->value * mouse_x; else @@ -1251,8 +1250,8 @@ void IN_Move (usercmd_t *cmd) if ( ((in_mlook.state & 1) ^ ((int)m_look->value & 1)) && !(in_strafe.state & 1)) { // 2001-12-16 M_LOOK cvar by Heffo/Maddes tangles[PITCH] += m_pitch->value * mouse_y; if (!deathcam_yesiamdead){ - if (tangles[PITCH] > 80) - tangles[PITCH] = 80; + if (tangles[PITCH] > 80) // eukara - was cl.viewangles, not tangles + tangles[PITCH] = 80; // ditto for the next few lines if (tangles[PITCH] < -70) tangles[PITCH] = -70;} } else { @@ -1262,14 +1261,13 @@ void IN_Move (usercmd_t *cmd) cmd->forwardmove -= m_forward->value * mouse_y; } -#if 1 + if (deathcam_yesiamdead){ deathcam_angles[0] = tangles[0]; deathcam_angles[1] = tangles[1]; deathcam_angles[2] = tangles[2]; } else{ cl.viewangles[0] = tangles[0]; cl.viewangles[1] = tangles[1]; cl.viewangles[2] = tangles[2]; } -#endif mouse_x = mouse_y = 0.0; } @@ -1314,12 +1312,5 @@ void IN_ActivateMouse (void) GrabModeAsync,x_win,None,CurrentTime); } -void IN_HideMouse (void) -{ - -}; - -void IN_ShowMouse (void) -{ - -}; +void IN_HideMouse (void) {}; +void IN_ShowMouse (void) {};