LMS: if normal items are enabled don't convert megahealth to extralife

diff --git a/qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc b/qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc
index 692d987aa2d5a45427f0aefe3d963678f75b082f..82899e42172e685ebcf4a8f15aaf5e2ec5da656d 100644 (file)
--- a/qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc
+++ b/qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc
@@ -643,14 +643,14 @@ MUTATOR_HOOKFUNCTION(lms, ForbidPlayerScore_Clear)
 
 MUTATOR_HOOKFUNCTION(lms, FilterItemDefinition)
 {
-       if (autocvar_g_lms_items)
+       if (autocvar_g_lms_items || autocvar_g_pickup_items > 0)
                return false;
 
        entity def = M_ARGV(0, entity);
-
        if (autocvar_g_powerups && autocvar_g_lms_extra_lives && (def == ITEM_ExtraLife || def == ITEM_HealthMega))
                return false;
-       return (autocvar_g_pickup_items <= 0); // only allow items if explicitly enabled
+
+       return true;
 }
 
 void lms_replace_with_extralife(entity this)
@@ -665,7 +665,7 @@ MUTATOR_HOOKFUNCTION(lms, FilterItem)
 {
        entity item = M_ARGV(0, entity);
        entity def = item.itemdef;
-       if(def == ITEM_HealthMega)
+       if(def == ITEM_HealthMega && !(autocvar_g_lms_items || autocvar_g_pickup_items > 0))
        {
                if(autocvar_g_powerups && autocvar_g_lms_extra_lives)
                        lms_replace_with_extralife(item);