Merge branch 'master' into TimePath/universal_weapons

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / defs.qh

diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh
index 46fba8347a8d788ea2ab6c84fa0449c79c9b448c..a165f9d440042c6aca7aee62cb388e3e2433a8a4 100644 (file)
--- a/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@ -147,7 +147,9 @@ const float MAX_DAMAGEEXTRARADIUS = 16;
 .float pauserothealth_finished;
 .float pauserotarmor_finished;
 .float pauserotfuel_finished;
+// string overrides entity
 .string item_pickupsound;
+.entity item_pickupsound_ent;
 
 // definitions for weaponsystem
 // more WEAPONTODO: move these to their proper files
@@ -162,7 +164,7 @@ const float MAX_DAMAGEEXTRARADIUS = 16;
 
 // WEAPONTODO
 .float autoswitch;
-//float WEP_ACTION(float wpn, float wrequest);
+//float _WEP_ACTION(float wpn, float wrequest);
 float client_hasweapon(entity cl, float wpn, float andammo, float complain);
 void w_clear();
 void w_ready();
@@ -513,19 +515,6 @@ const float ACTIVE_TOGGLE  = 3;
 .void (float act_state) setactive;
 .entity realowner;
 
-enum {
-       item_armor_large_time,
-       item_health_mega_time,
-       item_invisible_time,
-       item_speed_time,
-       item_extralife_time,
-       item_strength_time,
-       item_shield_time,
-       item_fuelregen_time,
-       item_jetpack_time,
-       item_superweapons_time
-};
-
 //float serverflags;
 
 .float team_forced; // can be a team number to force a team, or 0 for default action, or -1 for forced spectator