From ba95a8ca07fb6e6989fbe1f66bc3e20c32e014f3 Mon Sep 17 00:00:00 2001 From: Martin Taibr Date: Sat, 22 Jul 2017 23:06:58 +0200 Subject: [PATCH] move hack for overkill models into cfgs, it won't reset them when reloading balance --- defaultOverkill.cfg | 7 +++++++ qcsrc/common/mutators/mutator/overkill/sv_overkill.qc | 11 ----------- 2 files changed, 7 insertions(+), 11 deletions(-) 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; -- 2.39.2