Merge branch 'master' into terencehill/spectatee_status_update

[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 f10a97e54ff8770b2660ecad293f5cc70d0a67b0..7c7405b75bb4e34dcad03f2260454c637f19ef48 100644 (file)
--- a/qcsrc/common/items/item/powerup.qc
+++ b/qcsrc/common/items/item/powerup.qc
@@ -1,40 +1 @@
 #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) \
-        )                                                                   \
-        UNWORDS(__VA_ARGS__)                                          \
-    ))
-
-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
-    )
-)
-
-#undef WITH
-#undef CONFIGURE
-#undef DEFINE