Merge branch 'samual/keepaway' into fruitiex/freezetag_vs_keepaway

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / xonotic / dialog_multiplayer_create_mapinfo.c

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c b/qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c
index 05ed89887d3ce94f165028a286896b37addb89e3..f3f620d7318bad17a6b00edc8ae5cac4e20f8c0f 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c
@@ -28,6 +28,8 @@ CLASS(XonoticMapInfoDialog) EXTENDS(XonoticDialog)
        ATTRIB(XonoticMapInfoDialog, typeRaceLabel, entity, NULL)
        ATTRIB(XonoticMapInfoDialog, typeCTSLabel, entity, NULL)
        ATTRIB(XonoticMapInfoDialog, typeNexballLabel, entity, NULL)
+       ATTRIB(XonoticMapInfoDialog, typeFreezetagLabel, entity, NULL)
+       ATTRIB(XonoticMapInfoDialog, typeKeepawayLabel, entity, NULL)
 
        ATTRIB(XonoticMapInfoDialog, currentMapIndex, float, 0)
        ATTRIB(XonoticMapInfoDialog, currentMapBSPName, string, string_null)
@@ -83,6 +85,8 @@ void XonoticMapInfoDialog_loadMapInfo(entity me, float i, entity mlb)
        me.typeRaceLabel.disabled = !(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_RACE);
        me.typeCTSLabel.disabled = !(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_CTS);
        me.typeNexballLabel.disabled = !(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_NEXBALL);
+       me.typeFreezetagLabel.disabled = !(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_FREEZETAG);
+       me.typeKeepawayLabel.disabled = !(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_KEEPAWAY);
 
        MapInfo_ClearTemps();
 }
@@ -124,12 +128,10 @@ void XonoticMapInfoDialog_fill(entity me)
                        me.typeLMSLabel = e;
                me.TD(me, 1, wgt, e = makeXonoticTextLabel(0, "Arena"));
                        me.typeArenaLabel = e;
-               me.TD(me, 1, wgt, e = makeXonoticTextLabel(0, "Rune"));
-                       me.typeRuneLabel = e;
-       me.TR(me);
-               me.TDempty(me, 0.2);
                me.TD(me, 1, wgt, e = makeXonoticTextLabel(0, "Domination"));
                        me.typeDominationLabel = e;
+       me.TR(me);
+               me.TDempty(me, 0.2);
                me.TD(me, 1, wgt, e = makeXonoticTextLabel(0, "Key Hunt"));
                        me.typeKeyHuntLabel = e;
                me.TD(me, 1, wgt, e = makeXonoticTextLabel(0, "CTF"));
@@ -138,16 +140,20 @@ void XonoticMapInfoDialog_fill(entity me)
                        me.typeCALabel = e;
                me.TD(me, 1, wgt, e = makeXonoticTextLabel(0, "Assault"));
                        me.typeAssaultLabel = e;
-       me.TR(me);
-               me.TDempty(me, 0.2);
                me.TD(me, 1, wgt, e = makeXonoticTextLabel(0, "Onslaught"));
                        me.typeOnslaughtLabel = e;
+       me.TR(me);
+               me.TDempty(me, 0.2);
                me.TD(me, 1, wgt, e = makeXonoticTextLabel(0, "Race"));
                        me.typeRaceLabel = e;
                me.TD(me, 1, wgt, e = makeXonoticTextLabel(0, "CTS"));
                        me.typeCTSLabel = e;
                me.TD(me, 1, wgt, e = makeXonoticTextLabel(0, "Nexball"));
                        me.typeNexballLabel = e;
+               me.TD(me, 1, wgt, e = makeXonoticTextLabel(0, "Freezetag"));
+                       me.typeFreezetagLabel = e;
+               me.TD(me, 1, wgt, e = makeXonoticTextLabel(0, "Keepaway"));
+                       me.typeKeepawayLabel = e;
 
        me.gotoRC(me, me.rows - 2, 0);
                me.TD(me, 1, me.columns, e = makeXonoticTextLabel(0.5, ""));
@@ -163,6 +169,5 @@ void XonoticMapInfoDialog_fill(entity me)
                me.TD(me, 1, me.columns - 5.5, me.startButton = e = makeXonoticButton("Play", '0 0 0'));
                        me.startButton.onClick = MapList_LoadMap;
                        me.startButton.onClickEntity = NULL; // filled later
-               me.TDempty(me, 0.5);
 }
 #endif