Merge branch 'master' into Lyberta/mutator_is_enabled

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / mutators / mutator / random_items / sv_random_items.qc

diff --git a/qcsrc/common/mutators/mutator/random_items/sv_random_items.qc b/qcsrc/common/mutators/mutator/random_items/sv_random_items.qc
index 553dcf582ffccbd27d2ff23adc95e238d49bcb5d..2829e3ae2b8a70534134eefaeb6738f47123df4a 100644 (file)
--- a/qcsrc/common/mutators/mutator/random_items/sv_random_items.qc
+++ b/qcsrc/common/mutators/mutator/random_items/sv_random_items.qc
@@ -55,11 +55,11 @@ string RandomItems_GetRandomItemClassNameWithProperty(string prefix,
 
 string RandomItems_GetRandomItemClassName(string prefix)
 {
-       if (autocvar_g_instagib)
+       if (MUTATOR_IS_ENABLED(mutator_instagib))
        {
                return RandomItems_GetRandomInstagibItemClassName(prefix);
        }
-       if (expr_evaluate(autocvar_g_overkill))
+       if (MUTATOR_IS_ENABLED(ok))
        {
                return RandomItems_GetRandomOverkillItemClassName(prefix);
        }
@@ -232,23 +232,23 @@ string RandomItems_GetRandomOverkillItemClassName(string prefix)
                }
                RandomSelection_AddString(it.m_canonical_spawnfunc, cvar(cvar_name), 1);
        });
-       string cvar_name = sprintf("g_%s_overkill_weapon_hmg_probability", prefix);
+       string cvar_name = sprintf("g_%s_overkill_weapon_okhmg_probability", prefix);
        if (!(cvar_type(cvar_name) & CVAR_TYPEFLAG_EXISTS))
        {
                LOG_WARNF("Random items: cvar %s doesn't exist.", cvar_name);
        }
        else
        {
-               RandomSelection_AddString("weapon_hmg", cvar(cvar_name), 1);
+               RandomSelection_AddString("weapon_okhmg", cvar(cvar_name), 1);
        }
-       cvar_name = sprintf("g_%s_overkill_weapon_rpc_probability", prefix);
+       cvar_name = sprintf("g_%s_overkill_weapon_okrpc_probability", prefix);
        if (!(cvar_type(cvar_name) & CVAR_TYPEFLAG_EXISTS))
        {
                LOG_WARNF("Random items: cvar %s doesn't exist.", cvar_name);
        }
        else
        {
-               RandomSelection_AddString("weapon_rpc", cvar(cvar_name), 1);
+               RandomSelection_AddString("weapon_okrpc", cvar(cvar_name), 1);
        }
        return RandomSelection_chosen_string;
 }
@@ -328,7 +328,7 @@ entity RandomItems_ReplaceMapItem(entity item)
        }
        random_items_is_spawning = true;
        entity new_item;
-       if (!expr_evaluate(autocvar_g_overkill))
+       if (!MUTATOR_IS_ENABLED(ok))
        {
                new_item = Item_Create(strzone(new_classname), item.origin,
                        Item_ShouldKeepPosition(item));
@@ -374,7 +374,7 @@ void RandomItems_SpawnLootItem(vector position)
        spread.z = autocvar_g_random_loot_spread / 2;
        spread += randomvec() * autocvar_g_random_loot_spread;
        random_items_is_spawning = true;
-       if (!expr_evaluate(autocvar_g_overkill))
+       if (!MUTATOR_IS_ENABLED(ok))
        {
                Item_CreateLoot(class_name, position, spread,
                        autocvar_g_random_loot_time);