allow sv_defaultplayer* and sv_defaultcharacter cvars in a pure server, don't use...

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 8ae553921f5dac6a1c1ffb2dc66b7c6fdd663712..fd3bd114fc2377c20629f50f32269e4240012137 100644 (file)
--- 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 f381612c3f7843a427fa43724cc16e7919b0edec..f6707b54dd6dde9a87137be9136efaedfde3a637 100644 (file)
--- 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");