Add parameter for removing loot in unlimited ammo mode

diff --git a/mutators.cfg b/mutators.cfg
index c4737519abcb6659d9f5f4b839afa75206a043d4..2bc34462ae7048480fe6e00dfbe07bfd6c3a3e2d 100644 (file)
--- a/mutators.cfg
+++ b/mutators.cfg
@@ -524,4 +524,5 @@ exec randomitems-xonotic.cfg
 // ================
 //  unlimited ammo
 // ================
-set g_unlimitedammo 0 "Enable unlimited ammo for game"
\ No newline at end of file
+set g_unlimitedammo 0 "Enable unlimited ammo for game"
+set g_unlimitedammo_remove_loot 0 "Remove dropping loot from players after they dies when unlimited ammo mode is on"
\ No newline at end of file

diff --git a/qcsrc/common/mutators/mutator/unlimitedammo/sv_unlimitedammo.qc b/qcsrc/common/mutators/mutator/unlimitedammo/sv_unlimitedammo.qc
index c77f720ea9e96f46836b8c8489aae029a031011f..fd0a47a57fd7d30e26a0ea23ffcde8abefcf1717 100644 (file)
--- a/qcsrc/common/mutators/mutator/unlimitedammo/sv_unlimitedammo.qc
+++ b/qcsrc/common/mutators/mutator/unlimitedammo/sv_unlimitedammo.qc
@@ -1,12 +1,17 @@
 #include "sv_unlimitedammo.qh"
 
-bool autocvar_g_unlimitedammo;
+bool autocvar_g_unlimitedammo_remove_loot;
 
 REGISTER_MUTATOR(unlimitedammo, cvar("g_unlimitedammo"));
-
 MUTATOR_HOOKFUNCTION(unlimitedammo, SetStartItems)
 {
-       if (autocvar_g_unlimitedammo) {
-               start_items |= IT_UNLIMITED_AMMO;
+       start_items |= IT_UNLIMITED_AMMO;
+}
+
+MUTATOR_HOOKFUNCTION(unlimitedammo, FilterItem)
+{
+       entity item = M_ARGV(0, entity);
+       if (Item_IsLoot(item) && autocvar_g_unlimitedammo_remove_loot) {
+               remove(item);
        }
 }
\ No newline at end of file