Merge branch 'master' into Mario/snake

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / items / item / powerup.qc

diff --git a/qcsrc/common/items/item/powerup.qc b/qcsrc/common/items/item/powerup.qc
index 86e3a7d66b88a2782ce4273f09fa73ef80c7db22..f411d748a8d5eaeb891ec8eace2d2dd76725695e 100644 (file)
--- a/qcsrc/common/items/item/powerup.qc
+++ b/qcsrc/common/items/item/powerup.qc
@@ -1,39 +1,40 @@
 #include "powerup.qh"
 #include "../../../server/t_items.qh"
 
-#define WITH(it) this.m_##it;
-#define CONFIGURE(...) MAP(WITH, __VA_ARGS__)
-#define DEFINE(id)                                                          \
-    REGISTER_ITEM(id, Ammo, LAMBDA(                                         \
-        IF(SV, CONFIGURE                                                    \
-        ,   botvalue            =   100000                                  \
-        ,   itemflags           =   FL_POWERUP                              \
-        ,   respawntime         =         GET(g_pickup_respawntime_powerup) \
-        ,   respawntimejitter   =   GET(g_pickup_respawntimejitter_powerup) \
-        )                                                                   \
-    ))
+#ifndef SVQC
+.int m_itemid;
+#endif
 
-DEFINE(Strength) {
-    APPLY(CONFIGURE
-    ,   model               =   "models/items/g_strength.md3"
-    ,   sound               =   "misc/powerup.wav"
-    ,   name                =   "Strength Powerup"
-    )
-    IF(SV, CONFIGURE
-    ,   itemid              =   IT_STRENGTH
-    )
-}
-DEFINE(Shield) {
-    APPLY(CONFIGURE
-    ,   model               =   "models/items/g_invincible.md3"
-    ,   sound               =   "misc/powerup_shield.wav"
-    ,   name                =   "Shield"
-    )
-    IF(SV, CONFIGURE
-    ,   itemid              =   IT_INVINCIBLE
-    )
+#ifndef MENUQC
+MODEL(Strength_ITEM, Item_Model("g_strength.md3"));
+#endif
+
+REGISTER_ITEM(Strength, Powerup) {
+#ifndef MENUQC
+    this.m_model            =   MDL_Strength_ITEM;
+#endif
+    this.m_sound            =   "misc/powerup.wav";
+    this.m_name             =   "Strength Powerup";
+    this.m_icon             =   "strength";
+    this.m_color            =   '0 0 1';
+    this.m_waypoint         =   _("Strength");
+    this.m_waypointblink    =   2;
+    this.m_itemid           =   IT_STRENGTH;
 }
 
-#undef WITH
-#undef CONFIGURE
-#undef DEFINE
+#ifndef MENUQC
+MODEL(Shield_ITEM, Item_Model("g_invincible.md3"));
+#endif
+
+REGISTER_ITEM(Shield, Powerup) {
+#ifndef MENUQC
+    this.m_model            =   MDL_Shield_ITEM;
+#endif
+    this.m_sound            =   "misc/powerup_shield.wav";
+    this.m_name             =   "Shield";
+    this.m_icon             =   "shield";
+    this.m_color            =   '1 0 1';
+    this.m_waypoint         =   _("Shield");
+    this.m_waypointblink    =   2;
+    this.m_itemid           =   IT_INVINCIBLE;
+}