Moved powerups to separate .sprite files

[supertux.git] / src / player_status.cpp

diff --git a/src/player_status.cpp b/src/player_status.cpp
index 50623be..bc51aee 100644 (file)
--- a/src/player_status.cpp
+++ b/src/player_status.cpp
@@ -42,11 +42,11 @@ PlayerStatus::PlayerStatus()
     max_score_multiplier(1)
 {
   reset();
-  key_brass = sprite_manager->create("key-brass");
-  key_iron = sprite_manager->create("key-iron");
-  key_bronze = sprite_manager->create("key-bronze");
-  key_silver = sprite_manager->create("key-silver");
-  key_gold = sprite_manager->create("key-gold");
+  key_brass = sprite_manager->create("images/objects/keys/key_brass.sprite");
+  key_iron = sprite_manager->create("images/objects/keys/key_iron.sprite");
+  key_bronze = sprite_manager->create("images/objects/keys/key_bronze.sprite");
+  key_silver = sprite_manager->create("images/objects/keys/key_silver.sprite");
+  key_gold = sprite_manager->create("images/objects/keys/key_gold.sprite");
   key_brass->set_action("outline");
   key_iron->set_action("outline");
   key_bronze->set_action("outline");
@@ -154,7 +154,7 @@ PlayerStatus::read(const lisp::Lisp& lisp)
       bonus = NO_BONUS;
     }
   }
-  bool val;
+  bool val = false;
   if(lisp.get("key-brass", val) && val == true)
     set_keys(KEY_BRASS);
   if(lisp.get("key-iron", val) && val == true)
@@ -209,7 +209,7 @@ PlayerStatus::draw(DrawingContext& context)
 
   if (player_status->lives >= 5) {
     sprintf(str, "%dx", player_status->lives);
-    float x = SCREEN_WIDTH - gold_text->get_text_width(str) - tux_life->w;
+    float x = SCREEN_WIDTH - gold_text->get_text_width(str) - tux_life->get_width();
     context.draw_text(gold_text, str, Vector(x - BORDER_X, BORDER_Y + 20), LEFT_ALLIGN,
                       LAYER_FOREGROUND1);
     context.draw_surface(tux_life, Vector(SCREEN_WIDTH - 16 - BORDER_X, BORDER_Y + 20),
@@ -217,7 +217,8 @@ PlayerStatus::draw(DrawingContext& context)
   } else {
     for(int i= 0; i < player_status->lives; ++i)
       context.draw_surface(tux_life, 
-          Vector(SCREEN_WIDTH - tux_life->w*4 +(tux_life->w*i) - BORDER_X, BORDER_Y + 20),
+          Vector(SCREEN_WIDTH - tux_life->get_width()*4 +(tux_life->get_width()*i) - BORDER_X,
+                 BORDER_Y + 20),
           LAYER_FOREGROUND1);
   }
 
@@ -231,3 +232,15 @@ PlayerStatus::draw(DrawingContext& context)
 
   context.pop_transform();
 }
+
+void
+PlayerStatus::operator= (const PlayerStatus& other)
+{
+  coins = other.coins;
+  lives = other.lives;
+  bonus = other.bonus;
+  score_multiplier = other.score_multiplier;
+  max_score_multiplier = other.max_score_multiplier;
+  keys = other.keys;
+}
+