r4119 - trunk/data/qcsrc/menu/nexuiz

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-08-12 03:55:55 -0400 (Tue, 12 Aug 2008)
New Revision: 4119

Modified:
   trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create.c
   trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mapinfo.c
Log:
add Race game type to the menu


Modified: trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create.c	2008-08-12 06:42:50 UTC (rev 4118)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create.c	2008-08-12 07:55:55 UTC (rev 4119)
@@ -31,7 +31,7 @@
 	float n;
 
 	me.TR(me);
-		n = 9 + 1 * !!cvar("developer");
+		n = 10 + 1 * !!cvar("developer");
 		// NOTE: not using ?: due to fteqcc bug
 		// this actually means: cvar("developer") ? 10 : 9
 		me.TD(me, 2, me.columns / n, e = makeNexuizGametypeButton(1, "g_dm", "DM"));
@@ -57,6 +57,8 @@
 		}
 		me.TD(me, 2, me.columns / n, e = makeNexuizGametypeButton(1, "g_onslaught", "Onslaught"));
 			if(e.checked) e0 = NULL;
+		me.TD(me, 2, me.columns / n, e = makeNexuizGametypeButton(1, "g_race", "Race"));
+			if(e.checked) e0 = NULL;
 		if(e0)
 		{
 			//print("NO CHECK\n");

Modified: trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mapinfo.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mapinfo.c	2008-08-12 06:42:50 UTC (rev 4118)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mapinfo.c	2008-08-12 07:55:55 UTC (rev 4119)
@@ -24,6 +24,7 @@
 	ATTRIB(NexuizMapInfoDialog, typeCTFLabel, entity, NULL)
 	ATTRIB(NexuizMapInfoDialog, typeAssaultLabel, entity, NULL)
 	ATTRIB(NexuizMapInfoDialog, typeOnslaughtLabel, entity, NULL)
+	ATTRIB(NexuizMapInfoDialog, typeRaceLabel, entity, NULL)
 
 	ATTRIB(NexuizMapInfoDialog, currentMapIndex, float, 0)
 	ATTRIB(NexuizMapInfoDialog, currentMapBSPName, string, string_null)
@@ -73,10 +74,9 @@
 	me.typeRuneLabel.disabled = !(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_RUNEMATCH);
 	me.typeKeyHuntLabel.disabled = !(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_KEYHUNT);
 	me.typeCTFLabel.disabled = !(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_CTF);
-	if(me.typeAssaultLabel)
-		me.typeAssaultLabel.disabled = !(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_ASSAULT);
-	if(me.typeOnslaughtLabel)
-		me.typeOnslaughtLabel.disabled = !(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_ONSLAUGHT);
+	me.typeAssaultLabel.disabled = !(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_ASSAULT);
+	me.typeOnslaughtLabel.disabled = !(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_ONSLAUGHT);
+	me.typeRaceLabel.disabled = !(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_RACE);
 
 	MapInfo_ClearTemps();
 }
@@ -127,13 +127,12 @@
 		me.TD(me, 1, w/4, e = makeNexuizTextLabel(0, "CTF"));
 			me.typeCTFLabel = e;
 	me.TR(me);
-		if(cvar("developer"))
-		{
-			me.TD(me, 1, w/4, e = makeNexuizTextLabel(0, "Assault"));
-				me.typeAssaultLabel = e;
-		}
+		me.TD(me, 1, w/4, e = makeNexuizTextLabel(0, "Assault"));
+			me.typeAssaultLabel = e;
 		me.TD(me, 1, w/4, e = makeNexuizTextLabel(0, "Onslaught"));
 			me.typeOnslaughtLabel = e;
+		me.TD(me, 1, w/4, e = makeNexuizTextLabel(0, "Race"));
+			me.typeRaceLabel = e;
 
 	me.gotoRC(me, me.rows - 2, 0);
 		me.TD(me, 1, me.columns, e = makeNexuizTextLabel(0.5, ""));