X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmutators%2Fmutator%2Fnades%2Fnades.qc;h=a8d9f7936f6548b36f0cd36f63c4e0afbb35fe45;hb=4435e6a342e65c52cb1fc00aea84f6018eff16ac;hp=66d9e2d2c327227c69bf508e77e70a5f1ea11b50;hpb=9d5295bb4213f6c703d43d158605efe893514ee4;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/mutators/mutator/nades/nades.qc b/qcsrc/common/mutators/mutator/nades/nades.qc index 66d9e2d2c..a8d9f7936 100644 --- a/qcsrc/common/mutators/mutator/nades/nades.qc +++ b/qcsrc/common/mutators/mutator/nades/nades.qc @@ -1152,8 +1152,8 @@ void nade_prime(entity this) } else { - ntype = ((autocvar_g_nades_client_select) ? CS(this).cvar_cl_nade_type : autocvar_g_nades_nade_type); - pntype = ((autocvar_g_nades_client_select) ? CS(this).cvar_cl_pokenade_type : autocvar_g_nades_pokenade_monster_type); + ntype = ((autocvar_g_nades_client_select) ? CS_CVAR(this).cvar_cl_nade_type : autocvar_g_nades_nade_type); + pntype = ((autocvar_g_nades_client_select) ? CS_CVAR(this).cvar_cl_pokenade_type : autocvar_g_nades_pokenade_monster_type); } spawn_held_nade(this, this, autocvar_g_nades_nade_lifetime, ntype, pntype); @@ -1306,8 +1306,8 @@ MUTATOR_HOOKFUNCTION(nades, PlayerPreThink) if(autocvar_g_nades_bonus_client_select) { - STAT(NADE_BONUS_TYPE, player) = CS(player).cvar_cl_nade_type; - player.pokenade_type = CS(player).cvar_cl_pokenade_type; + STAT(NADE_BONUS_TYPE, player) = CS_CVAR(player).cvar_cl_nade_type; + player.pokenade_type = CS_CVAR(player).cvar_cl_pokenade_type; } else { @@ -1414,7 +1414,7 @@ MUTATOR_HOOKFUNCTION(nades, PlayerSpawn) player.nade_refire = time + autocvar_g_nades_nade_refire; if(autocvar_g_nades_bonus_client_select) - STAT(NADE_BONUS_TYPE, player) = CS(player).cvar_cl_nade_type; + STAT(NADE_BONUS_TYPE, player) = CS_CVAR(player).cvar_cl_nade_type; STAT(NADE_TIMER, player) = 0;