From fec4a86574b983b2937c0ccf0e7e0dbd1cfe5dbd Mon Sep 17 00:00:00 2001 From: div0 Date: Tue, 12 Aug 2008 07:55:55 +0000 Subject: [PATCH] add Race game type to the menu git-svn-id: svn://svn.icculus.org/nexuiz/trunk@4119 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- .../menu/nexuiz/dialog_multiplayer_create.c | 4 +++- .../nexuiz/dialog_multiplayer_create_mapinfo.c | 17 ++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/data/qcsrc/menu/nexuiz/dialog_multiplayer_create.c b/data/qcsrc/menu/nexuiz/dialog_multiplayer_create.c index c9fe23e93..1c658e24b 100644 --- a/data/qcsrc/menu/nexuiz/dialog_multiplayer_create.c +++ b/data/qcsrc/menu/nexuiz/dialog_multiplayer_create.c @@ -31,7 +31,7 @@ void fillNexuizServerCreateTab(entity me) 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 @@ void fillNexuizServerCreateTab(entity me) } 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"); diff --git a/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mapinfo.c b/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mapinfo.c index 18c3bbcb1..12aa9ddd5 100644 --- a/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mapinfo.c +++ b/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mapinfo.c @@ -24,6 +24,7 @@ CLASS(NexuizMapInfoDialog) EXTENDS(NexuizDialog) 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 @@ void loadMapInfoNexuizMapInfoDialog(entity me, float i, entity mlb) 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 @@ void fillNexuizMapInfoDialog(entity me) 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, "")); -- 2.39.2