From: mand1nga <saulo_gil@argentina.com>
Date: Thu, 18 Mar 2010 20:43:48 +0000 (-0300)
Subject: Added files I forgot on previous commit
X-Git-Tag: xonotic-v0.1.0preview~690
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b36b580fafd41a252bcb4440d9c7448953d07e63;p=xonotic%2Fxonotic-data.pk3dir.git

Added files I forgot on previous commit
---

diff --git a/qcsrc/menu/classes.c b/qcsrc/menu/classes.c
index 72d23f45e..1d26deec5 100644
--- 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 7f51e1594..51ed2d442 100644
--- 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 d1c891673..130f2dea0 100644
--- 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 165a84c76..e8b1d943a 100644
--- 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 55727d9e0..25ec3c09c 100755
--- 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