[nexuiz-commits] r8452 - trunk/data/qcsrc/menu

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-12-24 03:10:25 -0500 (Thu, 24 Dec 2009)
New Revision: 8452

Modified:
   trunk/data/qcsrc/menu/menu.qc
Log:
fix relative mouse coordinate handling


Modified: trunk/data/qcsrc/menu/menu.qc
===================================================================
--- trunk/data/qcsrc/menu/menu.qc	2009-12-23 20:33:50 UTC (rev 8451)
+++ trunk/data/qcsrc/menu/menu.qc	2009-12-24 08:10:25 UTC (rev 8452)
@@ -678,14 +678,16 @@
 	{
 		if(frametime > 0)
 		{
-			vector dMouse;
+			vector dMouse, minpos, maxpos;
 			dMouse = getmousepos() * (frametime / realFrametime); // for capturevideo
 			if(dMouse != '0 0 0')
 			{
+				minpos = globalToBox('0 0 0', draw_shift, draw_scale);
+				maxpos = globalToBox(eX * (realconwidth - 1) + eY * (realconheight - 1), draw_shift, draw_scale);
 				dMouse = globalToBoxSize(dMouse, draw_scale);
 				menuMousePos += dMouse * cvar("menu_mouse_speed");
-				menuMousePos_x = bound(0, menuMousePos_x, 1);
-				menuMousePos_y = bound(0, menuMousePos_y, 1);
+				menuMousePos_x = bound(minpos_x, menuMousePos_x, maxpos_x);
+				menuMousePos_y = bound(minpos_y, menuMousePos_y, maxpos_y);
 				if(mouseButtonsPressed)
 					main.mouseDrag(main, menuMousePos);
 				else