From: Samual <samual@xonotic.org>
Date: Sun, 15 Jan 2012 18:21:34 +0000 (-0500)
Subject: Stuff and things
X-Git-Tag: xonotic-v0.6.0~162
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=48b0d6b9087f1703f7c364ba6a1abdc865df9e33;p=xonotic%2Fxonotic-data.pk3dir.git

Stuff and things
---

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
index 54e70d119..fe5739b35 100644
--- a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
@@ -187,12 +187,7 @@ void XonoticPlayerSettingsTab_fill(entity me)
 }
 void HUDSetup_Join_Click(entity me, entity btn)
 {
-	if not(gamestatus & (GAME_CONNECTED | GAME_ISSERVER))
-	{
-		localcmd("map hudsetup/hudsetup", "\n");
-	}
-	else
-		localcmd("togglemenu 0\n");
+	localcmd("togglemenu 0\n");
 	localcmd("_hud_configure 1", "\n");
 }
 #endif
diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_weapons.c b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_weapons.c
index b55527cf0..8edb1e074 100644
--- a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_weapons.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_weapons.c
@@ -67,7 +67,7 @@ void XonoticWeaponsDialog_fill(entity me)
 		me.TDempty(me, 0.2);
 		me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Scale")));
 		setDependent(e, "r_drawviewmodel", 1, 1);
-		me.TD(me, 1, 2, e = makeXonoticSlider(-1, 1, 0.2, "cl_viewmodel_scale"));
+		me.TD(me, 1, 2, e = makeXonoticSlider(0.1, 2, 0.1, "cl_viewmodel_scale"));
 		setDependent(e, "r_drawviewmodel", 1, 1);
 			
 	me.gotoRC(me, me.rows - 1, 0);