Squashed some bugs :)

reaction/ta_ui/ta_ui.plg

@@ -6,32 +6,6 @@
 --------------------Configuration: ui - Win32 Release TA--------------------
 </h3>
 <h3>Command Lines</h3>
-Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP2C1.tmp" with contents
-[
-/nologo /G6 /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "UI_EXPORTS" /Fp"Release_TA/ta_ui.pch" /YX /Fo"Release_TA/" /Fd"Release_TA/" /FD /c 
-"C:\Games\Quake3\rq3source\reaction\ta_ui\ui_shared.c"
-]
-Creating command line "cl.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP2C1.tmp" 
-Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP2C2.tmp" with contents
-[
-/nologo /base:"0x40000000" /dll /incremental:no /pdb:"Release_TA/uix86.pdb" /map:"Release_TA/uix86.map" /machine:I386 /def:".\ui.def" /out:"../Release/uix86.dll" /implib:"Release_TA/uix86.lib" 
-.\Release_TA\bg_misc.obj
-.\Release_TA\q_math.obj
-.\Release_TA\q_shared.obj
-.\Release_TA\ui_atoms.obj
-.\Release_TA\ui_gameinfo.obj
-.\Release_TA\ui_main.obj
-.\Release_TA\ui_players.obj
-.\Release_TA\ui_shared.obj
-.\Release_TA\ui_syscalls.obj
-.\Release_TA\ui_util.obj
-]
-Creating command line "link.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP2C2.tmp"
-<h3>Output Window</h3>
-Compiling...
-ui_shared.c
-Linking...
-   Creating library Release_TA/uix86.lib and object Release_TA/uix86.exp
 
 
 

reaction/ta_ui/ui_main.c

@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.28  2002/06/05 19:17:07  makro
+// Squashed some bugs :)
+//
 // Revision 1.27  2002/06/04 21:19:10  makro
 // Added leading zero's in the "last refresh time" text
 //
@@ -1311,7 +1314,14 @@ static void UI_DrawTeamMember(rectDef_t *rect, float scale, vec4_t color, qboole
 			text = UI_GetBotNameByNumber(value);
 		//}
 	}
-  Text_Paint(rect->x, rect->y, scale, color, text, 0, 0, textStyle);
+	//Makro - changed
+	//Text_Paint(rect->x, rect->y, scale, color, text, 0, 0, textStyle);
+	if (ui_actualNetGameType.integer >= GT_TEAM) {
+		Text_Paint(rect->x, rect->y, scale, color, va("%i. %s", num, text), 0, 0, textStyle);
+	} else {
+		Text_Paint(rect->x, rect->y, scale, color, va("%i. %s", blue ? (num+5) : num, text), 0, 0, textStyle);
+	}
+
 }
 
 static void UI_DrawEffects(rectDef_t *rect, float scale, vec4_t color) {
@@ -1923,7 +1933,13 @@ static int UI_OwnerDrawWidth(int ownerDraw, float scale) {
 				}
 				text = uiInfo.aliasList[value].name;
 			}
+			//Makro - changed
+			//s = va("%i. %s", ownerDraw-UI_BLUETEAM1 + 1, text);
+			if (ui_actualNetGameType.integer >= GT_TEAM) {
 				s = va("%i. %s", ownerDraw-UI_BLUETEAM1 + 1, text);
+			} else {
+				s = va("%i. %s", ownerDraw-UI_BLUETEAM1 + 6, text);
+			}
       break;
     case UI_REDTEAM1:
 		case UI_REDTEAM2:

reaction/ta_ui/ui_shared.c

@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.18  2002/06/05 19:17:07  makro
+// Squashed some bugs :)
+//
 // Revision 1.17  2002/06/04 11:37:23  makro
 // Items that fade out are hidden automatically now
 //
@@ -1428,8 +1431,14 @@ void Script_SetFocus(itemDef_t *item, char **args) {
 	if (String_Parse(args, &name)) {
 		focusItem = Menu_FindItemByName(item->parent, name);
 		if (focusItem && !(focusItem->window.flags & WINDOW_DECORATION) && !(focusItem->window.flags & WINDOW_HASFOCUS)) {
+			//Makro - added
+			menuDef_t	*menu = (menuDef_t*) item->parent;
 			Menu_ClearFocus(item->parent);
 			focusItem->window.flags |= WINDOW_HASFOCUS;
+
+			//Makro - cursorItem was not set
+			menu->cursorItem = focusItem - menu->items[0];
+			
 			if (focusItem->onFocus) {
 				Item_RunScript(focusItem, focusItem->onFocus);
 			}