The Vore Town button may go now

[voretournament/voretournament.git] / data / qcsrc / menu / voret / dialog_multiplayer_create.c

diff --git a/data/qcsrc/menu/voret/dialog_multiplayer_create.c b/data/qcsrc/menu/voret/dialog_multiplayer_create.c
index 35104ffa90d7bc1efb732db751430b2da7146196..219ac78611009e8c0ccd6dc5701f45d4c748132b 100644 (file)
--- a/data/qcsrc/menu/voret/dialog_multiplayer_create.c
+++ b/data/qcsrc/menu/voret/dialog_multiplayer_create.c
@@ -66,7 +66,7 @@ void fillVoretServerCreateTab(entity me)
        me.TR(me);\r
                me.TD(me, 1, 0.5, me.playerNameLabel = makeVoretTextLabel(0, "Other:"));\r
                        me.playerNameLabelAlpha = me.playerNameLabel.alpha;\r
-               n = 1;\r
+               n = 1.1;\r
                me.TD(me, 1, me.columns / n, e = makeVoretGametypeButton(1, "g_rpg", "Role Play"));\r
                        if(e.checked) e0 = NULL;\r
                if(e0)\r
@@ -80,8 +80,8 @@ void fillVoretServerCreateTab(entity me)
                me.TD(me, 1, 3, e = makeVoretTextLabel(0, "Map list:"));\r
                        makeCallback(e, me.mapListBox, me.mapListBox.refilterCallback);\r
        me.TR(me);\r
-               me.TD(me, me.rows - 7, 3, me.mapListBox);\r
-       me.gotoRC(me, me.rows - 3, 0);\r
+               me.TD(me, me.rows - 6, 3, me.mapListBox);\r
+       me.gotoRC(me, me.rows - 2, 0);\r
                me.TDempty(me, 0.5);\r
                me.TD(me, 1, 1, e = makeVoretButton("All", '0 0 0'));\r
                        e.onClick = MapList_All;\r
@@ -91,7 +91,7 @@ void fillVoretServerCreateTab(entity me)
                        e.onClickEntity = me.mapListBox;\r
                me.TDempty(me, 0.5);\r
 \r
-       me.gotoRC(me, 3, 3.5); me.setFirstColumn(me, me.currentColumn);\r
+       me.gotoRC(me, 4, 3.5); me.setFirstColumn(me, me.currentColumn);\r
                me.TD(me, 1, 3, e = makeVoretTextLabel(0, "Match settings:"));\r
        me.TR(me);\r
                me.sliderTimelimit = makeVoretSlider(1.0, 60.0, 0.5, "timelimit_override");\r
@@ -144,22 +144,6 @@ void fillVoretServerCreateTab(entity me)
                me.TD(me, 1, 0.7, e = makeVoretInputBox(1, "bot_suffix"));\r
                        setDependent(e, "bot_number", 0, -1);\r
        me.TR(me);\r
-       me.TR(me);\r
-               me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Map voting:"));\r
-               me.TD(me, 1, 2, e = makeVoretTextSlider("g_maplist_votable"));\r
-                       e.addValue(e, "No voting", "0");\r
-                       e.addValue(e, "2 choices", "2");\r
-                       e.addValue(e, "3 choices", "3");\r
-                       e.addValue(e, "4 choices", "4");\r
-                       e.addValue(e, "5 choices", "5");\r
-                       e.addValue(e, "6 choices", "6");\r
-                       e.addValue(e, "7 choices", "7");\r
-                       e.addValue(e, "8 choices", "8");\r
-                       e.addValue(e, "9 choices", "9");\r
-                       e.configureVoretTextSliderValues(e);\r
-       me.TR(me);\r
-               me.TD(me, 1, 3, e = makeVoretCheckBoxEx(0.5, 0, "sv_vote_simple_majority_factor", "Simple majority wins vcall"));\r
-       me.TR(me);\r
        me.TR(me);\r
                me.TDempty(me, 0.5);\r
                me.TD(me, 1, 2, e = makeVoretButton("Advanced settings...", '0 0 0'));\r
@@ -177,8 +161,7 @@ void fillVoretServerCreateTab(entity me)
                        e0.allowCut = 1;\r
 \r
        me.gotoRC(me, me.rows - 1, 0);\r
-               me.TD(me, 1, 2, e = makeVoretCommandButton("Vore Town", '1 0 0', "map voretown", 0));\r
-               me.TD(me, 1, me.columns - 2, e = makeVoretButton("Start Match!", '0 0 0'));\r
+               me.TD(me, 1, me.columns, e = makeVoretButton("Start Match!", '0 0 0'));\r
                        e.onClick = MapList_LoadMap;\r
                        e.onClickEntity = me.mapListBox;\r
                        me.mapListBox.startButton = e;\r
@@ -221,6 +204,7 @@ void gameTypeChangeNotifyVoretServerCreateTab(entity me)
                case MAPINFO_TYPE_ASSAULT:    GameType_ConfigureSliders(e, l, l2, "Point limit:",    50,  500, 10, "");                         break;\r
                case MAPINFO_TYPE_ONSLAUGHT:  GameType_ConfigureSliders(e, l, l2, "Point limit:",    50,  500, 10, "");                         break;\r
                case MAPINFO_TYPE_CTS:        GameType_ConfigureSliders(e, l, l2, "Point limit:",    50,  500, 10, "");                         break;\r
+               case MAPINFO_TYPE_RPG:        GameType_ConfigureSliders(e, l, l2, "Point limit:",    50,  500, 10, "");                         break;\r
                default:                      GameType_ConfigureSliders(e, l, l2, "Frag limit:",      5,  100,  5, "fraglimit_override");       break;\r
        }\r
        me.mapListBox.refilter(me.mapListBox);\r