Resolve conflicts 2: Merge branch 'master' 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 ea2beb584df8f7902ad236d0822029da6e94c24b..7635df6b64eab1510011481e35042e1cbcb8f460 100644 (file)
--- a/qcsrc/common/mutators/mutator/buffs/sv_buffs.qh
+++ b/qcsrc/common/mutators/mutator/buffs/sv_buffs.qh
@@ -66,9 +66,9 @@ float autocvar_g_buffs_luck_damagemultiplier = 3;
 .float buff_effect_delay;
 
 // buff definitions
-.float buff_active;
+.bool buff_active;
 .float buff_activetime;
-.float buff_activetime_updated;
+.bool buff_activetime_updated;
 .entity buff_waypoint;
 .entity oldbuffs; // for updating effects
 .float buff_shield; // delay for players to keep them from spamming buff pickups