From: Martin Taibr <taibr.martin@gmail.com>
Date: Sat, 22 Jul 2017 21:06:58 +0000 (+0200)
Subject: move hack for overkill models into cfgs, it won't reset them when reloading balance
X-Git-Tag: xonotic-v0.8.5~2430^2~42
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ba95a8ca07fb6e6989fbe1f66bc3e20c32e014f3;p=xonotic%2Fxonotic-data.pk3dir.git

move hack for overkill models into cfgs, it won't reset them when reloading balance
---

diff --git a/defaultOverkill.cfg b/defaultOverkill.cfg
index 634943c58..d4936b033 100644
--- a/defaultOverkill.cfg
+++ b/defaultOverkill.cfg
@@ -8,6 +8,13 @@ exec physicsOverkill.cfg
 
 // general gameplay
 set g_overkill 1
+
+// hack - eventually, we should be able to choose overkill models in menu like for vanilla
+sv_defaultcharacter 1
+sv_defaultplayermodel "models/ok_player/okrobot1.dpm models/ok_player/okrobot2.dpm models/ok_player/okrobot3.dpm models/ok_player/okrobot4.dpm models/ok_player/okmale1.dpm models/ok_player/okmale2.dpm models/ok_player/okmale3.dpm models/ok_player/okmale4.dpm"
+sv_defaultplayermodel_red "models/ok_player/okrobot1.dpm models/ok_player/okrobot2.dpm models/ok_player/okrobot3.dpm models/ok_player/okrobot4.dpm"
+sv_defaultplayermodel_blue "models/ok_player/okmale1.dpm models/ok_player/okmale2.dpm models/ok_player/okmale3.dpm models/ok_player/okmale4.dpm"
+
 set g_respawn_ghosts 0
 
 set g_nades 1
diff --git a/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc b/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
index 82df487c5..6a7e4b266 100644
--- a/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
+++ b/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
@@ -304,19 +304,8 @@ MUTATOR_HOOKFUNCTION(ok, SetModname)
 	return true;
 }
 
-void ok_SetCvars()
-{
-	// hack to force overkill playermodels
-	cvar_settemp("sv_defaultcharacter", "1");
-	cvar_settemp("sv_defaultplayermodel", "models/ok_player/okrobot1.dpm models/ok_player/okrobot2.dpm models/ok_player/okrobot3.dpm models/ok_player/okrobot4.dpm models/ok_player/okmale1.dpm models/ok_player/okmale2.dpm models/ok_player/okmale3.dpm models/ok_player/okmale4.dpm");
-	cvar_settemp("sv_defaultplayermodel_red", "models/ok_player/okrobot1.dpm models/ok_player/okrobot2.dpm models/ok_player/okrobot3.dpm models/ok_player/okrobot4.dpm");
-	cvar_settemp("sv_defaultplayermodel_blue", "models/ok_player/okmale1.dpm models/ok_player/okmale2.dpm models/ok_player/okmale3.dpm models/ok_player/okmale4.dpm");
-}
-
 void ok_Initialize()
 {
-	ok_SetCvars();
-
 	precache_all_playermodels("models/ok_player/*.dpm");
 
 	WEP_RPC.spawnflags &= ~WEP_FLAG_MUTATORBLOCKED;