Resolve conflicts 1: Merge commit 'c58baab5' into bones_was_here/q3compat

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / mutators / mutator / buffs / sv_buffs.qh

diff --git a/qcsrc/common/mutators/mutator/buffs/sv_buffs.qh b/qcsrc/common/mutators/mutator/buffs/sv_buffs.qh
index d198898bdceba58b6dcfad23da3b0ced6a1590e4..4eb536b609d00ea4d316ed84ec0fdb6fd8649f4a 100644 (file)
--- a/qcsrc/common/mutators/mutator/buffs/sv_buffs.qh
+++ b/qcsrc/common/mutators/mutator/buffs/sv_buffs.qh
@@ -80,7 +80,7 @@ float autocvar_g_buffs_luck_damagemultiplier = 3;
 .float buff_activetime;
 .bool buff_activetime_updated;
 .entity buff_waypoint;
-.int oldbuffs; // for updating effects
+.entity oldbuffs; // for updating effects
 .float buff_shield; // delay for players to keep them from spamming buff pickups
 .entity buff_model; // controls effects (TODO: make csqc)
 
@@ -91,3 +91,7 @@ const vector BUFF_MAX = ('16 16 60');
 .float cvar_cl_buffs_autoreplace;
 
 float buff_Available(entity buff);
+
+void buff_RemoveAll(entity actor, int removal_type);
+
+entity buff_FirstFromFlags(entity actor);