Fixing a few cppcheck warnings

[supertux.git] / src / supertux / player_status.cpp

diff --git a/src/supertux/player_status.cpp b/src/supertux/player_status.cpp
index b1e5090..2c95b8f 100644 (file)
--- a/src/supertux/player_status.cpp
+++ b/src/supertux/player_status.cpp
@@ -40,6 +40,8 @@ PlayerStatus::PlayerStatus() :
   bonus(NO_BONUS),
   max_fire_bullets(0),
   max_ice_bullets(0),
+  max_air_time(0),
+  max_earth_time(0),
   displayed_coins(DISPLAYED_COINS_UNSET),
   displayed_coins_frame(0),
   coin_surface()
@@ -47,8 +49,8 @@ PlayerStatus::PlayerStatus() :
   reset();
 
   coin_surface = Surface::create("images/engine/hud/coins-0.png");
-  sound_manager->preload("sounds/coin.wav");
-  sound_manager->preload("sounds/lifeup.wav");
+  SoundManager::current()->preload("sounds/coin.wav");
+  SoundManager::current()->preload("sounds/lifeup.wav");
 }
 
 PlayerStatus::~PlayerStatus()
@@ -65,15 +67,17 @@ void PlayerStatus::reset()
 void
 PlayerStatus::add_coins(int count, bool play_sound)
 {
-  static float sound_played_time = 0;
   coins = std::min(coins + count, MAX_COINS);
-  if(play_sound) {
-    if(count >= 100)
-      sound_manager->play("sounds/lifeup.wav");
-    else if (real_time > sound_played_time + 0.010) {
-      sound_manager->play("sounds/coin.wav");
-      sound_played_time = real_time;
-    }
+
+  if(!play_sound)
+    return;
+
+  static float sound_played_time = 0;
+  if(count >= 100)
+    SoundManager::current()->play("sounds/lifeup.wav");
+  else if (real_time > sound_played_time + 0.010) {
+    SoundManager::current()->play("sounds/coin.wav");
+    sound_played_time = real_time;
   }
 }
 
@@ -93,12 +97,20 @@ PlayerStatus::write(lisp::Writer& writer)
     case ICE_BONUS:
       writer.write("bonus", "iceflower");
       break;
+    case AIR_BONUS:
+      writer.write("bonus", "airflower");
+      break;
+    case EARTH_BONUS:
+      writer.write("bonus", "earthflower");
+      break;
     default:
       log_warning << "Unknown bonus type." << std::endl;
       writer.write("bonus", "none");
   }
   writer.write("fireflowers", max_fire_bullets);
   writer.write("iceflowers", max_ice_bullets);
+  writer.write("airflowers", max_air_time);
+  writer.write("earthflowers", max_earth_time);
 
   writer.write("coins", coins);
 }
@@ -118,6 +130,10 @@ PlayerStatus::read(const Reader& lisp)
       bonus = FIRE_BONUS;
     } else if(bonusname == "iceflower") {
       bonus = ICE_BONUS;
+    } else if(bonusname == "airflower") {
+      bonus = AIR_BONUS;
+    } else if(bonusname == "earthflower") {
+      bonus = EARTH_BONUS;
     } else {
       log_warning << "Unknown bonus '" << bonusname << "' in savefile" << std::endl;
       bonus = NO_BONUS;
@@ -125,6 +141,8 @@ PlayerStatus::read(const Reader& lisp)
   }
   lisp.get("fireflowers", max_fire_bullets);
   lisp.get("iceflowers", max_ice_bullets);
+  lisp.get("airflowers", max_air_time);
+  lisp.get("earthflowers", max_earth_time);
 
   lisp.get("coins", coins);
 }
@@ -132,6 +150,7 @@ PlayerStatus::read(const Reader& lisp)
 void
 PlayerStatus::draw(DrawingContext& context)
 {
+  int player_id = 0;
 
   if ((displayed_coins == DISPLAYED_COINS_UNSET) ||
       (fabsf(displayed_coins - coins) > 100)) {
@@ -154,12 +173,18 @@ PlayerStatus::draw(DrawingContext& context)
 
   if (coin_surface)
   {
-    context.draw_surface(coin_surface, 
-                         Vector(SCREEN_WIDTH - BORDER_X - coin_surface->get_width() - Resources::fixed_font->get_text_width(coins_text), 
-                                BORDER_Y + 1),
+    context.draw_surface(coin_surface,
+                         Vector(SCREEN_WIDTH - BORDER_X - coin_surface->get_width() - Resources::fixed_font->get_text_width(coins_text),
+                                BORDER_Y + 1 + (Resources::fixed_font->get_text_height(coins_text) + 5) * player_id),
                          LAYER_HUD);
   }
-  context.draw_text(Resources::fixed_font, coins_text, Vector(SCREEN_WIDTH - BORDER_X, BORDER_Y), ALIGN_RIGHT, LAYER_HUD, PlayerStatus::text_color);
+  context.draw_text(Resources::fixed_font,
+                    coins_text,
+                    Vector(SCREEN_WIDTH - BORDER_X - Resources::fixed_font->get_text_width(coins_text),
+                           BORDER_Y + (Resources::fixed_font->get_text_height(coins_text) + 5) * player_id),
+                    ALIGN_LEFT,
+                    LAYER_HUD,
+                    PlayerStatus::text_color);
 
   context.pop_transform();
 }