Merge branch 'master' into Mario/mutator_minstagib

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / t_items.qc

diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc
index b7c3c56eb93fc9a9aef32d82adc04b00c02a2114..3471ce1b046fd54dc00a8b12dad110e22115360c 100644 (file)
--- a/qcsrc/server/t_items.qc
+++ b/qcsrc/server/t_items.qc
@@ -277,8 +277,6 @@ float have_pickup_item(void)
                        return TRUE;
                if(autocvar_g_powerups == 0)
                        return FALSE;
                        return TRUE;
                if(autocvar_g_powerups == 0)
                        return FALSE;

-               if(g_lms)
-                       return FALSE;

                if(g_ca)
                        return FALSE;
                if(g_arena)
                if(g_ca)
                        return FALSE;
                if(g_arena)


@@ -290,8 +288,6 @@ float have_pickup_item(void)
                        return TRUE;
                if(autocvar_g_pickup_items == 0)
                        return FALSE;
                        return TRUE;
                if(autocvar_g_pickup_items == 0)
                        return FALSE;

-               if(g_lms)
-                       return FALSE;

                if(g_ca)
                        return FALSE;
                if(g_weaponarena)
                if(g_ca)
                        return FALSE;
                if(g_weaponarena)


@@ -624,12 +620,12 @@ float Item_GiveTo(entity item, entity player)
                WEPSET_COPY_AE(it, item);
                WEPSET_ANDNOT_AE(it, player);
 
                WEPSET_COPY_AE(it, item);
                WEPSET_ANDNOT_AE(it, player);
 

-               if (!WEPSET_EMPTY_A(it) || (item.spawnshieldtime && self.pickup_anyway))
+               if (!WEPSET_EMPTY_A(it) || (item.spawnshieldtime && item.pickup_anyway))

                {
                {

-               pickedup = TRUE;
-               for(i = WEP_FIRST; i <= WEP_LAST; ++i)
+                       pickedup = TRUE;
+                       for(i = WEP_FIRST; i <= WEP_LAST; ++i)

                        if(WEPSET_CONTAINS_AW(it, i))
                        if(WEPSET_CONTAINS_AW(it, i))

-                       W_GiveWeapon(player, i);
+                               W_GiveWeapon(player, i);

                }
        }
 
                }
        }