Cvar sys_usenoclockbutbenchmark for the dedicated server. Replaces the regular clock...

[xonotic/darkplaces.git] / mvm_cmds.c

diff --git a/mvm_cmds.c b/mvm_cmds.c
index 34a0a22c007c50bc6137fb2e387b366f90bdfd91..91bb20074002c7417c3b87d8914a4dbcebe1dfb6 100644 (file)
--- a/mvm_cmds.c
+++ b/mvm_cmds.c
@@ -790,7 +790,9 @@ static void VM_M_getmousepos(void)
 {
        VM_SAFEPARMCOUNT(0,VM_M_getmousepos);
 
-       if (in_client_mouse)
+       if (key_consoleactive || (key_dest != key_menu && key_dest != key_menu_grabbed))
+               VectorSet(PRVM_G_VECTOR(OFS_RETURN), 0, 0, 0);
+       else if (in_client_mouse)
                VectorSet(PRVM_G_VECTOR(OFS_RETURN), in_windowmouse_x * vid_conwidth.integer / vid.width, in_windowmouse_y * vid_conheight.integer / vid.height, 0);
        else
                VectorSet(PRVM_G_VECTOR(OFS_RETURN), in_mouse_x * vid_conwidth.integer / vid.width, in_mouse_y * vid_conheight.integer / vid.height, 0);