#include "roles.qh"
+#include <server/defs.qh>
+#include <server/miscfunctions.qh>
+#include <server/items.qh>
#include "havocbot.qh"
#include "../cvars.qh"
continue;
// Check if the item can be picked up safely
- if(it.classname == "droppedweapon")
+ if(Item_IsLoot(it))
{
if(!IS_ONGROUND(it))
continue;
traceline(o, o + '0 0 -1500', true, NULL);
- if(Mod_Q1BSP_SuperContentsFromNativeContents(pointcontents(trace_endpos + '0 0 1')) & DPCONTENTS_LIQUIDSMASK)
+ if(IN_LAVA(trace_endpos + '0 0 1'))
continue;
+
// this tracebox_hits_trigger_hurt call isn't needed:
// dropped weapons are removed as soon as they fall on a trigger_hurt
// and can't be rated while they are in the air
}
else
{
- // Ignore items under water
- // TODO: can't .waterlevel be used here?
- if(Mod_Q1BSP_SuperContentsFromNativeContents(pointcontents(it.origin + ((it.mins + it.maxs) * 0.5))) & DPCONTENTS_LIQUIDSMASK)
+ if(IN_LAVA(it.origin + (it.mins + it.maxs) * 0.5))
continue;
}