[quake3-commits] r2047 - in trunk/code: client q3_ui ui

[DONOTREPLY at icculus.org]

Author: thilo
Date: 2011-06-21 07:36:25 -0400 (Tue, 21 Jun 2011)
New Revision: 2047

Modified:
   trunk/code/client/cl_scrn.c
   trunk/code/q3_ui/ui_atoms.c
   trunk/code/ui/ui_shared.c
Log:
- Bug 5034 - q3_ui: fill whole screen and allow cursor to move to edge in widescreen, by Zack Middleton
  Check if uivm is loaded before using it

  Patch adds a check for uivm before using it, fixes running dedicated server
  using client binary.

  Missing uivm check pointed out by Ensiform.

- Bug 5049 - TA UI forces overstrike mode on when focusing an edit box, by Ensiform
- Bug 5052 - Missing podium timer initialization, by Eugene C.


Modified: trunk/code/client/cl_scrn.c
===================================================================
--- trunk/code/client/cl_scrn.c	2011-06-21 11:29:31 UTC (rev 2046)
+++ trunk/code/client/cl_scrn.c	2011-06-21 11:36:25 UTC (rev 2047)
@@ -484,7 +484,7 @@
 
 	re.BeginFrame( stereoFrame );
 
-	uiFullscreen = VM_Call( uivm, UI_IS_FULLSCREEN );
+	uiFullscreen = (uivm && VM_Call( uivm, UI_IS_FULLSCREEN ));
 
 	// wide aspect ratio screens need to have the sides cleared
 	// unless they are displaying game renderings

Modified: trunk/code/q3_ui/ui_atoms.c
===================================================================
--- trunk/code/q3_ui/ui_atoms.c	2011-06-21 11:29:31 UTC (rev 2046)
+++ trunk/code/q3_ui/ui_atoms.c	2011-06-21 11:36:25 UTC (rev 2047)
@@ -995,6 +995,9 @@
 qboolean UI_ConsoleCommand( int realTime ) {
 	char	*cmd;
 
+	uis.frametime = realTime - uis.realtime;
+	uis.realtime = realTime;
+
 	cmd = UI_Argv( 0 );
 
 	// ensure minimum menu data is available

Modified: trunk/code/ui/ui_shared.c
===================================================================
--- trunk/code/ui/ui_shared.c	2011-06-21 11:29:31 UTC (rev 2046)
+++ trunk/code/ui/ui_shared.c	2011-06-21 11:36:25 UTC (rev 2047)
@@ -2701,7 +2701,6 @@
 						item->cursorPos = 0;
 						g_editingField = qtrue;
 						g_editItem = item;
-						DC->setOverstrikeMode(qtrue);
 					}
 				} else {
 					if (Rect_ContainsPoint(&item->window.rect, DC->cursorx, DC->cursory)) {
@@ -2739,7 +2738,6 @@
 					item->cursorPos = 0;
 					g_editingField = qtrue;
 					g_editItem = item;
-					DC->setOverstrikeMode(qtrue);
 				} else {
 						Item_Action(item);
 				}