MM UI. Changed join menu from team 1/2 to black/silver

reaction/uifiles/ingame.txt

@@ -6,11 +6,14 @@
 	loadMenu { "ui/ingame_vote.menu" }
 	loadMenu { "ui/ingame_tkok.menu" }
 	loadMenu { "ui/ingame_about.menu" }
+
 	loadMenu { "ui/ingame_join.menu" }
 	loadMenu { "ui/ingame_join_dm.menu" }
+
 	loadMenu { "ui/ingame_system.menu" }
 	loadMenu { "ui/ingame_controls.menu" }
 	loadMenu { "ui/ingame_options.menu" }
+
 	loadMenu { "ui/ingame_player.menu" }
 	loadMenu { "ui/ingame_weapon.menu" }
 	loadMenu { "ui/ingame_item.menu" }
@@ -18,7 +21,12 @@
 	loadMenu { "ui/ingame_addbot.menu" }
 	loadMenu { "ui/ingame_callvote.menu" }
 	loadMenu { "ui/ingame_leave.menu" }
+
 	loadMenu { "ui/ingame_matchmode.menu" }
+	loadMenu { "ui/ingame_matchmode_captain.menu" }
+	loadMenu { "ui/ingame_matchmode_referee.menu" }
+	loadMenu { "ui/ingame_matchmode_settings.menu" }
+
 	loadMenu { "ui/ingame_presets.menu" }
 	loadMenu { "ui/ingame_presets_edit.menu" }
 

reaction/uifiles/ingame_join.menu

@@ -55,7 +55,7 @@
 
     itemdef {
 	name team
-	text "1. Team 1:"
+	text "1. Silver Team:"
 	shortcutKey "1"
 	type ITEM_TYPE_BUTTON
 	style WINDOW_STYLE_EMPTY
@@ -91,7 +91,7 @@
 
     itemdef {
 	name team
-	text "2. Team 2:"
+	text "2. Black Team:"
 	shortcutKey "2"
 	type ITEM_TYPE_BUTTON
 	style WINDOW_STYLE_EMPTY

reaction/uifiles/ingame_matchmode.menu

@@ -7,7 +7,7 @@
 	visible 0
 	fullscreen 0
 	outOfBoundsClick			// this closes the window if it gets a click out of the rectangle
-	rect 296 64 216 264
+	rect 296 64 140 140
 	disableColor  .5 .5 .5 1
 	focusColor 1 .75 0 1			// Menu focus color for text and items
 	style 1
@@ -17,7 +17,7 @@
 //Window
 
     itemdef {
-	rect 0 0 216 264
+	rect 0 0 140 140
 	style WINDOW_STYLE_FILLED
 	backcolor Ig_Window_Color
 	visible 1
@@ -28,7 +28,7 @@
     }
 
     itemdef {
-	rect 97 1 120 24
+	rect 21 1 120 24
 	style WINDOW_STYLE_SHADER
 	background "ui/assets/rq3-ingame-title"
 	visible 1
@@ -36,7 +36,7 @@
     }
 
     itemdef {
-	rect 97 1 120 24
+	rect 21 1 120 24
 	style WINDOW_STYLE_EMPTY
 	forecolor Ig_Window_TitleColor
 	textstyle ITEM_TEXTSTYLE_NORMAL
@@ -44,7 +44,7 @@
 	textalign ITEM_ALIGN_LEFT
 	textalignx 24
 	textaligny 16
-	text "MM settings"
+	text "Matchmode"
 	visible 1
 	decoration
     }
@@ -53,193 +53,56 @@
 
     // SETTINGS //
 
-    // Time limit
+    // Sub
     itemdef {
 	style WINDOW_STYLE_EMPTY
-	type ITEM_TYPE_NUMERICFIELD
+	type ITEM_TYPE_BUTTON
-	text "Time Limit:"
+	text "S. Sub"
-	cvar "ui_RQ3_timelimit"
+	shortcutKey "S"
-	maxchars 4
 	textstyle ITEM_TEXTSTYLE_SHADOWED
 	rect 20 48 192 20
-	textalign ITEM_ALIGN_RIGHT
+	textalign ITEM_ALIGN_LEFT
-	textalignx 112
+	textalignx 4
 	textaligny 14
 	textscale .225
 	forecolor 1 1 1 1
 	visible 1
-	action { play "sound/misc/menu1.wav" }
+	action { play "sound/misc/menu1.wav" ; exec "sub" ; uiScript closeingame }
     }
 
-    // Round limit
+    // Captain
     itemdef {
 	style WINDOW_STYLE_EMPTY
-	type ITEM_TYPE_NUMERICFIELD
+	type ITEM_TYPE_BUTTON
-	text "Round Limit:"
+	text "C. Captain"
-	cvar "ui_RQ3_roundlimit"
+	shortcutKey "C"
-	maxchars 4
 	textstyle ITEM_TEXTSTYLE_SHADOWED
 	rect 20 68 192 20
-	textalign ITEM_ALIGN_RIGHT
+	textalign ITEM_ALIGN_LEFT
-	textalignx 112
+	textalignx 4
 	textaligny 14
 	textscale .225
 	forecolor 1 1 1 1
 	visible 1
-	action { play "sound/misc/menu1.wav" }
+	action { play "sound/misc/menu1.wav" ; close ingame_matchmode ; open ingame_matchmode_captain }
     }
 
-    // Round time limit
+    // Referee
     itemdef {
 	style WINDOW_STYLE_EMPTY
-	type ITEM_TYPE_NUMERICFIELD
+	type ITEM_TYPE_BUTTON
-	text "Round Time Limit:"
+	text "R. Referee"
-	cvar "ui_RQ3_roundtimelimit"
+	shortcutKey "R"
-	maxchars 4
 	textstyle ITEM_TEXTSTYLE_SHADOWED
 	rect 20 88 192 20
-	textalign ITEM_ALIGN_RIGHT
+	textalign ITEM_ALIGN_LEFT
-	textalignx 112
+	textalignx 4
 	textaligny 14
 	textscale .225
 	forecolor 1 1 1 1
 	visible 1
-	action { play "sound/misc/menu1.wav" }
+	action { play "sound/misc/menu1.wav" ; close ingame_matchmode ; open ingame_matchmode_referee }
     }
 
-    // Frag limit
-    itemdef {
-	style WINDOW_STYLE_EMPTY
-	type ITEM_TYPE_NUMERICFIELD
-	text "Frag Limit:"
-	cvar "ui_RQ3_fraglimit"
-	maxchars 4
-	textstyle ITEM_TEXTSTYLE_SHADOWED
-	rect 20 108 192 20
-	textalign ITEM_ALIGN_RIGHT
-	textalignx 112
-	textaligny 14
-	textscale .225
-	forecolor 1 1 1 1
-	visible 1
-	action { play "sound/misc/menu1.wav" }
-    }
-
-    // Max players
-    itemdef {
-	style WINDOW_STYLE_EMPTY
-	type ITEM_TYPE_NUMERICFIELD
-	text "Max Players:"
-	cvar "ui_RQ3_maxplayers"
-	maxchars 4
-	textstyle ITEM_TEXTSTYLE_SHADOWED
-	rect 20 128 192 20
-	textalign ITEM_ALIGN_RIGHT
-	textalignx 112
-	textaligny 14
-	textscale .225
-	forecolor 1 1 1 1
-	visible 1
-	action { play "sound/misc/menu1.wav" }
-    }
-
-    // Force team talk
-    itemdef {
-	style WINDOW_STYLE_EMPTY
-	type ITEM_TYPE_MULTI
-	text "Force Team Talk:"
-	cvar "ui_RQ3_forceteamtalk"
-	cvarFloatList { "Off" 0 "Match only" 1 "Always" 2 }
-	textstyle ITEM_TEXTSTYLE_SHADOWED
-	rect 20 148 192 20
-	textalign ITEM_ALIGN_RIGHT
-	textalignx 112
-	textaligny 14
-	textscale .225
-	forecolor 1 1 1 1
-	visible 1
-	action { play "sound/misc/menu1.wav" }
-    }
-
-    // Limit chase cam
-    itemdef {
-	style WINDOW_STYLE_EMPTY
-	type ITEM_TYPE_MULTI
-	text "Limit Chase Cam:"
-	cvar "ui_RQ3_limchasecam"
-	cvarFloatList { "No" 0 "Team only" 1 "Eyes only" 2 }
-	textstyle ITEM_TEXTSTYLE_SHADOWED
-	rect 20 168 192 20
-	textalign ITEM_ALIGN_RIGHT
-	textalignx 112
-	textaligny 14
-	textscale .225
-	forecolor 1 1 1 1
-	visible 1
-	action { play "sound/misc/menu1.wav" }
-    }
-
-    // Tgren
-    itemdef {
-	style WINDOW_STYLE_EMPTY
-	type ITEM_TYPE_NUMERICFIELD
-	text "Bandolier Grenades:"
-	cvar "ui_RQ3_tgren"
-	maxchars 4
-	textstyle ITEM_TEXTSTYLE_SHADOWED
-	rect 20 188 192 20
-	textalign ITEM_ALIGN_RIGHT
-	textalignx 112
-	textaligny 14
-	textscale .225
-	forecolor 1 1 1 1
-	visible 1
-	action { play "sound/misc/menu1.wav" }
-    }
-
-    // Friendly fire
-    itemdef {
-	style WINDOW_STYLE_EMPTY
-	type ITEM_TYPE_MULTI
-	text "Friendly Fire:"
-	cvar "ui_RQ3_friendlyFire"
-	cvarFloatList { "On" 1 "Knockback" 2 "Off" 0 }
-	textstyle ITEM_TEXTSTYLE_SHADOWED
-	rect 20 208 192 20
-	textalign ITEM_ALIGN_RIGHT
-	textalignx 112
-	textaligny 14
-	textscale .225
-	forecolor 1 1 1 1
-	visible 1
-	action { play "sound/misc/menu1.wav" }
-    }
-
-
-    // OK //
-
-    itemdef {
-	name ok
-	rect 136 232 64 20
-	style WINDOW_STYLE_FILLED
-	type ITEM_TYPE_BUTTON
-	textstyle ITEM_TEXTSTYLE_NORMAL
-	textscale .225
-	textalign ITEM_ALIGN_CENTER
-	textalignx 32
-	textaligny 14
-	text "Ok"
-	shortcutKey "O"
-	border 1
-	bordersize 1
-	backcolor Ig_Sub_Color1
-	forecolor Ig_Sub_TextColor
-	bordercolor Ig_Sub_BorderColor1
-	visible 1
-	action { play "sound/misc/menu1.wav" ; uiScript "sendMMsettings" ; uiScript closeingame }
-	//action { exec "screenshotJPEG" }
-	onFocus { setcolor backcolor Ig_Sub_Color2 ; setcolor bordercolor Ig_Sub_BorderColor2 }
-	leaveFocus { setcolor backcolor Ig_Sub_Color1 ; setcolor bordercolor Ig_Sub_BorderColor1 }
-    }
 }
 }

reaction/uifiles/menudef.h

@@ -68,6 +68,8 @@
 #define FEEDER_CINEMATICS					0x0f			// cinematics
 //Makro - improved in-game server info screen
 #define FEEDER_INGAME_SERVERINFO			0x10
+//Makro - for the captains' ingame menu
+#define FEEDER_MMHEADS						0x11
 
 // display flags
 #define CG_SHOW_BLUE_TEAM_HAS_REDFLAG     	0x00000001