Forgot to update build number for 105 release

[xonotic/darkplaces.git] / in_svgalib.c

diff --git a/in_svgalib.c b/in_svgalib.c
index ea8460d752dcd34f0a5d42574a4550c9d283a89f..2527be89cb5a133f820b079668d9a9f9838926d0 100644 (file)
--- a/in_svgalib.c
+++ b/in_svgalib.c
@@ -60,8 +60,8 @@ static float  mouse_x, mouse_y;
 static float   old_mouse_x, old_mouse_y;
 static int     mx, my;
 
-static void IN_init_kb();
-static void IN_init_mouse();
+static void IN_init_kb(void);
+static void IN_init_mouse(void);
 
 cvar_t m_filter = {"m_filter","0"};
 
@@ -92,12 +92,6 @@ static void mousehandler(int buttonstate, int dx, int dy, int dz, int drx, int d
 }
 
 
-void Force_CenterView_f(void)
-{
-       cl.viewangles[PITCH] = 0;
-}
-
-
 void IN_Init(void)
 {
        if (COM_CheckParm("-nokbd")) UseKeyboard = 0;
@@ -111,7 +105,7 @@ void IN_Init(void)
        in_svgalib_inited = 1;
 }
 
-static void IN_init_kb()
+static void IN_init_kb(void)
 {
        int i;
 
@@ -231,14 +225,13 @@ static void IN_init_kb()
        keyboard_seteventhandler(keyhandler);
 }
 
-static void IN_init_mouse()
+static void IN_init_mouse(void)
 {
        int mtype;
        char *mousedev;
        int mouserate = MOUSE_DEFAULTSAMPLERATE;
 
        Cvar_RegisterVariable (&m_filter);
-       Cmd_AddCommand("force_centerview", Force_CenterView_f);
 
        mouse_buttons = 3;
 
@@ -324,16 +317,20 @@ void IN_Commands(void)
 
 void IN_Move(usercmd_t *cmd)
 {
+       int mouselook = (in_mlook.state & 1) || freelook.value;
        if (!UseMouse) return;
 
        /* Poll mouse values */
        while (mouse_update())
                ;
 
-       if (m_filter.value) {
+       if (m_filter.value)
+       {
                mouse_x = (mx + old_mouse_x) * 0.5;
                mouse_y = (my + old_mouse_y) * 0.5;
-       } else {
+       }
+       else
+       {
                mouse_x = mx;
                mouse_y = my;
        }
@@ -346,30 +343,28 @@ void IN_Move(usercmd_t *cmd)
        mouse_y *= sensitivity.value;
 
        /* Add mouse X/Y movement to cmd */
-       if ( (in_strafe.state & 1) ||
-            (lookstrafe.value && (in_mlook.state & 1) )) {
+       if ( (in_strafe.state & 1) || (lookstrafe.value && mouselook))
                cmd->sidemove += m_side.value * mouse_x;
-       } else {
+       else
                cl.viewangles[YAW] -= m_yaw.value * mouse_x;
-       }
 
-       if ((in_mlook.state & 1)) V_StopPitchDrift();
+       if (mouselook) V_StopPitchDrift();
 
        // LordHavoc: changed limits on pitch from -70 to 80, to -90 to 90
-       if ((in_mlook.state & 1) && !(in_strafe.state & 1)) {
+       if (mouselook && !(in_strafe.state & 1))
+       {
                cl.viewangles[PITCH] += m_pitch.value * mouse_y;
-               if (cl.viewangles[PITCH] > 90) {
+               if (cl.viewangles[PITCH] > 90)
                        cl.viewangles[PITCH] = 90;
-               }
-               if (cl.viewangles[PITCH] < -90) {
+               if (cl.viewangles[PITCH] < -90)
                        cl.viewangles[PITCH] = -90;
-               }
-       } else {
-               if ((in_strafe.state & 1) && noclip_anglehack) {
+       }
+       else
+       {
+               if ((in_strafe.state & 1) && noclip_anglehack)
                        cmd->upmove -= m_forward.value * mouse_y;
-               } else {
+               else
                        cmd->forwardmove -= m_forward.value * mouse_y;
-               }
        }
 }