Merge branch 'TimePath/globalforces' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / items / item / pickup.qh

diff --git a/qcsrc/common/items/item/pickup.qh b/qcsrc/common/items/item/pickup.qh
index 684e6dde9970c5e9333a6f884c1c22030a709b3c..136c8dab6dbf73c633ab35b548134611e6c9b7a3 100644 (file)
--- a/qcsrc/common/items/item/pickup.qh
+++ b/qcsrc/common/items/item/pickup.qh
@@ -4,25 +4,25 @@
 #include <common/items/item.qh>
 CLASS(Pickup, GameItem)
 #ifndef MENUQC
-    ATTRIB(Pickup, m_model, Model, NULL)
-    ATTRIB(Pickup, m_sound, Sound, SND_ITEMPICKUP)
+    ATTRIB(Pickup, m_model, Model);
+    ATTRIB(Pickup, m_sound, Sound, SND_ITEMPICKUP);
 #endif
-    ATTRIB(Pickup, m_name, string, string_null)
+    ATTRIB(Pickup, m_name, string);
     METHOD(Pickup, show, void(Pickup this))
     {
         TC(Pickup, this);
         LOG_INFOF("%s: %s\n", etos(this), this.m_name);
     }
 #ifdef SVQC
-    ATTRIB(Pickup, m_mins, vector, '-16 -16 0')
-    ATTRIB(Pickup, m_maxs, vector, '16 16 32')
-    ATTRIB(Pickup, m_botvalue, int, 0)
-    ATTRIB(Pickup, m_itemflags, int, 0)
-    ATTRIB(Pickup, m_itemid, int, 0)
+    ATTRIB(Pickup, m_mins, vector, '-16 -16 0');
+    ATTRIB(Pickup, m_maxs, vector, '16 16 32');
+    ATTRIB(Pickup, m_botvalue, int, 0);
+    ATTRIB(Pickup, m_itemflags, int, 0);
+    ATTRIB(Pickup, m_itemid, int, 0);
     float generic_pickupevalfunc(entity player, entity item);
-    ATTRIB(Pickup, m_pickupevalfunc, float(entity player, entity item), generic_pickupevalfunc)
-    ATTRIB(Pickup, m_respawntime, float(), func_null)
-    ATTRIB(Pickup, m_respawntimejitter, float(), func_null)
+    ATTRIB(Pickup, m_pickupevalfunc, float(entity player, entity item), generic_pickupevalfunc);
+    ATTRIB(Pickup, m_respawntime, float());
+    ATTRIB(Pickup, m_respawntimejitter, float());
     float Item_GiveTo(entity item, entity player);
     METHOD(Pickup, giveTo, bool(Pickup this, entity item, entity player))
     {