From: FruitieX <fruitiex@gmail.com>
Date: Wed, 17 Nov 2010 21:42:08 +0000 (+0200)
Subject: allow sv_defaultplayer* and sv_defaultcharacter cvars in a pure server, don't use... 
X-Git-Tag: xonotic-v0.1.0preview~122^2~2^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4faee34e4aa9a80d92e5dc16e7a58a07dc48d207;p=xonotic%2Fxonotic-data.pk3dir.git

allow sv_defaultplayer* and sv_defaultcharacter cvars in a pure server, don't use g_fullbrightplayers in the sv_fbskin_* aliases (they look much better without that, and arguably even easier to see)
---

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 8ae553921..fd3bd114f 100644
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1126,10 +1126,10 @@ alias cl_fbskin_green "playermodel models/player/erebus.iqm; playerskin 1; color
 alias cl_fbskin_red "playermodel models/player/erebus.iqm; playerskin 1; color 4 4"
 alias cl_fbskin_orange "playermodel models/player/erebus.iqm; playerskin 1; color 14 14"
 alias cl_fbskin_off "playermodel models/player/erebus.iqm; playerskin 0"
-alias sv_fbskin_green "g_fullbrightplayers 1; sv_defaultcharacter 1; sv_defaultplayermodel models/player/erebus.iqm; sv_defaultplayerskin 1; sv_defaultplayercolors 51"
-alias sv_fbskin_red "g_fullbrightplayers 1; sv_defaultcharacter 1; sv_defaultplayermodel models/player/erebus.iqm; sv_defaultplayerskin 1; sv_defaultplayercolors 68"
-alias sv_fbskin_orange "g_fullbrightplayers 1; sv_defaultcharacter 1; sv_defaultplayermodel models/player/erebus.iqm; sv_defaultplayerskin 1; sv_defaultplayercolors 238"
-alias sv_fbskin_off "g_fullbrightplayers 0; sv_defaultcharacter 0; sv_defaultplayerskin 0; sv_defaultplayercolors \"\""
+alias sv_fbskin_green "sv_defaultcharacter 1; sv_defaultplayermodel models/player/erebus.iqm; sv_defaultplayerskin 1; sv_defaultplayercolors 51"
+alias sv_fbskin_red "sv_defaultcharacter 1; sv_defaultplayermodel models/player/erebus.iqm; sv_defaultplayerskin 1; sv_defaultplayercolors 68"
+alias sv_fbskin_orange "sv_defaultcharacter 1; sv_defaultplayermodel models/player/erebus.iqm; sv_defaultplayerskin 1; sv_defaultplayercolors 238"
+alias sv_fbskin_off "sv_defaultcharacter 0; sv_defaultplayerskin 0; sv_defaultplayercolors \"\""
 
 seta sv_servermodelsonly 1
 
diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index f381612c3..f6707b54d 100644
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -426,9 +426,6 @@ void cvar_changes_init()
 		BADCVAR("sv_adminnick");
 		BADCVAR("sv_autoscreenshot");
 		BADCVAR("sv_curl_defaulturl");
-		BADCVAR("sv_defaultcharacter");
-		BADCVAR("sv_defaultplayermodel");
-		BADCVAR("sv_defaultplayerskin");
 		BADCVAR("sv_maxidle");
 		BADCVAR("sv_maxrate");
 		BADCVAR("sv_motd");