Merge branch 'master' into terencehill/bot_ai

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

diff --git a/qcsrc/common/items/item/powerup.qh b/qcsrc/common/items/item/powerup.qh
index 3249b46a81aaaa0e4ea32c6b844744dfb34b1b1b..9de1235361787678286474044f004ddbc8e4c31c 100644 (file)
--- a/qcsrc/common/items/item/powerup.qh
+++ b/qcsrc/common/items/item/powerup.qh
@@ -24,7 +24,7 @@ SOUND(Strength, Item_Sound("powerup"));
 
 #ifdef SVQC
 float autocvar_g_balance_powerup_strength_time;
 
 #ifdef SVQC
 float autocvar_g_balance_powerup_strength_time;

-void powerup_strength_init(entity item)
+void powerup_strength_init(Pickup this, entity item)

 {
     if(!item.strength_finished)
         item.strength_finished = autocvar_g_balance_powerup_strength_time;
 {
     if(!item.strength_finished)
         item.strength_finished = autocvar_g_balance_powerup_strength_time;


@@ -60,7 +60,7 @@ SOUND(Shield, Item_Sound("powerup_shield"));
 
 #ifdef SVQC
 float autocvar_g_balance_powerup_invincible_time;
 
 #ifdef SVQC
 float autocvar_g_balance_powerup_invincible_time;

-void powerup_shield_init(entity item)
+void powerup_shield_init(Pickup this, entity item)

 {
     if(!item.invincible_finished)
         item.invincible_finished = autocvar_g_balance_powerup_invincible_time;
 {
     if(!item.invincible_finished)
         item.invincible_finished = autocvar_g_balance_powerup_invincible_time;