Added files I forgot on previous commit

diff --git a/qcsrc/menu/classes.c b/qcsrc/menu/classes.c
index 72d23f45e38de991f56a8bab3a9e26123d0066f1..1d26deec5907e78639e1286e536fdf4a6cd0f26d 100644 (file)
--- a/qcsrc/menu/classes.c
+++ b/qcsrc/menu/classes.c
@@ -27,7 +27,6 @@
 #include "xonotic/bigbutton.c"
 #include "xonotic/commandbutton.c"
 #include "xonotic/bigcommandbutton.c"
-#include "xonotic/modbutton.c"
 #include "xonotic/dialog_teamselect.c"
 #include "xonotic/dialog_settings.c"
 #include "xonotic/dialog_settings_video.c"

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_create.c b/qcsrc/menu/xonotic/dialog_multiplayer_create.c
index 7f51e15942cb62e30e077cfe70338f547f7a17a1..51ed2d442bf81d16f58b41b7e66f77f47c88a959 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_create.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_create.c
@@ -171,8 +171,7 @@ void fillXonoticServerCreateTab(entity me)
                        e0.allowCut = 1;
 
        me.gotoRC(me, me.rows - 1, 0);
-               me.TD(me, 1, 2, e = makeXonoticModButton("Multiplayer_Create"));
-               me.TD(me, 1, me.columns - 2, e = makeXonoticButton("Start Multiplayer!", '0 0 0'));
+               me.TD(me, 1, me.columns, e = makeXonoticButton("Start Multiplayer!", '0 0 0'));
                        e.onClick = MapList_LoadMap;
                        e.onClickEntity = me.mapListBox;
                        me.mapListBox.startButton = e;

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_join.c b/qcsrc/menu/xonotic/dialog_multiplayer_join.c
index d1c891673956050e30c7e1c6885b62114b79d625..130f2dea0e66905a1d5426c174d062c67f0eb49f 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_join.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_join.c
@@ -67,8 +67,7 @@ void fillXonoticServerListTab(entity me)
                        e.onClickEntity = slist;
                        slist.infoButton = e;
        me.TR(me);
-               me.TD(me, 1, 2, e = makeXonoticModButton("Multiplayer_Join"));
-               me.TD(me, 1, me.columns - 2, e = makeXonoticButton("Join!", '0 0 0'));
+               me.TD(me, 1, me.columns, e = makeXonoticButton("Join!", '0 0 0'));
                        e.onClick = ServerList_Connect_Click;
                        e.onClickEntity = slist;
                        slist.connectButton = e;

diff --git a/qcsrc/menu/xonotic/dialog_singleplayer.c b/qcsrc/menu/xonotic/dialog_singleplayer.c
index 165a84c7671bdeda9171840d47fec99bfe4c57a7..e8b1d943a79d949a29ea68a311f3d128c8d732d7 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_singleplayer.c
+++ b/qcsrc/menu/xonotic/dialog_singleplayer.c
@@ -77,8 +77,7 @@ void fillXonoticSingleplayerDialog(entity me)
                        me.campaignBox.campaignGo(me.campaignBox, 0);
 
        me.gotoRC(me, me.rows - 1, 0);
-               me.TD(me, 1, 2, e = makeXonoticModButton("Singleplayer"));
-               me.TD(me, 1, me.columns - 2 , e = makeXonoticButton("Start Singleplayer!", '0 0 0'));
+               me.TD(me, 1, me.columns, e = makeXonoticButton("Start Singleplayer!", '0 0 0'));
                        e.onClick = CampaignList_LoadMap;
                        e.onClickEntity = me.campaignBox;
 }

diff --git a/update-cvarcount.sh b/update-cvarcount.sh
index 55727d9e008885150322e39ff2d5eed32f5b858e..25ec3c09c7635e83c2f78d3080061d7635b584a5 100755 (executable)
--- a/update-cvarcount.sh
+++ b/update-cvarcount.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-balance_cfgs="balanceHavoc.cfg balance25.cfg balanceSamual.cfg balanceNexrun.cfg"
+balance_cfgs="balance25.cfg balanceSamual.cfg balanceNexrun.cfg"
 
 countw=`awk '/^seta? g_/ { print $2; }' balance.cfg       | sort -u | tr -d '\r' | md5sum | cut -c 1-32`
 for b in $balance_cfgs; do