Merge branch 'master' into Mario/gametypes

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

diff --git a/qcsrc/server/items.qc b/qcsrc/server/items.qc
index 04b0ba41d596e05d1c40addc88b06a3e8c2640c2..ab53a10fc3770f421d8779ecf163f3742652a900 100644 (file)
--- a/qcsrc/server/items.qc
+++ b/qcsrc/server/items.qc
@@ -5,9 +5,9 @@
 /// game items.
 /// \copyright GNU GPLv2 or any later version.
 
-#include "g_subs.qh"
-#include "mutators/events.qh"
+#include <server/mutators/_mod.qh>
 #include <common/weapons/all.qh>
+#include <common/mapobjects/subs.qh>
 
 .bool m_isloot; ///< Holds whether item is loot.
 /// \brief Holds whether strength, shield or superweapon timers expire while
@@ -105,7 +105,7 @@ bool Item_InitializeLoot(entity item, string class_name, vector position,
 
 bool Item_IsLoot(entity item)
 {
-       return item.m_isloot;
+       return item.m_isloot || item.classname == "droppedweapon";
 }
 
 void Item_SetLoot(entity item, bool loot)