- moved loadshared() to the right point

[supertux.git] / src / special.cpp

diff --git a/src/special.cpp b/src/special.cpp
index ff1db13..59c6d6e 100644 (file)
--- a/src/special.cpp
+++ b/src/special.cpp
@@ -53,7 +53,7 @@ Bullet::init(float x, float y, float xm, int dir)
 }
 
 void
-Bullet::action()
+Bullet::action(double frame_ratio)
 {
   base.x = base.x + base.xm * frame_ratio;
   base.y = base.y + base.ym * frame_ratio;
@@ -128,7 +128,7 @@ Upgrade::init(float x_, float y_, int dir_, int kind_)
 }
 
 void
-Upgrade::action()
+Upgrade::action(double frame_ratio)
 {
   if (base.height < 32)
     {
@@ -261,19 +261,16 @@ Upgrade::collision(void* p_c_object, int c_object)
               pplayer->base.y += 32;
               pplayer->duck = true;
             }
-          timer_start(&super_bkgd_timer, 350);
         }
       else if (kind == UPGRADE_COFFEE)
         {
           play_sound(sounds[SND_COFFEE], SOUND_CENTER_SPEAKER);
           pplayer->got_coffee = true;
-          timer_start(&super_bkgd_timer, 250);
         }
       else if (kind == UPGRADE_HERRING)
         {
           play_sound(sounds[SND_HERRING], SOUND_CENTER_SPEAKER);
-          timer_start(&pplayer->invincible_timer,TUX_INVINCIBLE_TIME);
-          timer_start(&super_bkgd_timer, 250);
+          pplayer->invincible_timer.start(TUX_INVINCIBLE_TIME);
           /* play the herring song ^^ */
           if (get_current_music() != HURRYUP_MUSIC)
             {