X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fplayer_status.cpp;h=f39ded0e8ca31f756b911f2b57f15b2c82365480;hb=d84d73b701cc7fa2bd74f3490b9be1bf8b6f705a;hp=109b772c25c6511fd012059c8ba1026ebac85d6a;hpb=5d1290054358cb4560f54bcd6840121a69360bf9;p=supertux.git

diff --git a/src/player_status.cpp b/src/player_status.cpp
index 109b772c2..f39ded0e8 100644
--- a/src/player_status.cpp
+++ b/src/player_status.cpp
@@ -1,7 +1,8 @@
 //  $Id$
 //
-//  SuperTux -  A Jump'n Run
+//  SuperTux
 //  Copyright (C) 2003 Tobias Glaesser <tobi.web@gmx.de>
+//  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -38,20 +39,12 @@ PlayerStatus* player_status = 0;
 PlayerStatus::PlayerStatus()
   : coins(START_COINS),
     bonus(NO_BONUS),
+    max_fire_bullets(0),
+    max_ice_bullets(0),
     score_multiplier(1),
     max_score_multiplier(1)
 {
   reset();
-  key_brass.reset(sprite_manager->create("images/objects/keys/key_brass.sprite"));
-  key_iron.reset(sprite_manager->create("images/objects/keys/key_iron.sprite"));
-  key_bronze.reset(sprite_manager->create("images/objects/keys/key_bronze.sprite"));
-  key_silver.reset(sprite_manager->create("images/objects/keys/key_silver.sprite"));
-  key_gold.reset(sprite_manager->create("images/objects/keys/key_gold.sprite"));
-  key_brass->set_action("outline");
-  key_iron->set_action("outline");
-  key_bronze->set_action("outline");
-  key_silver->set_action("outline");
-  key_gold->set_action("outline");
   
   tux_life.reset(sprite_manager->create("images/creatures/tux_small/tux-life.sprite"));
 
@@ -65,31 +58,21 @@ PlayerStatus::~PlayerStatus()
 void PlayerStatus::reset()
 {
   coins = START_COINS;
-  keys = 0;
   bonus = NO_BONUS;
   score_multiplier = 1;
   max_score_multiplier = 1;
 }
 
 void
-PlayerStatus::add_coins(int count)
+PlayerStatus::add_coins(int count, bool play_sound)
 {
   coins = std::min(coins + count, MAX_COINS);
-  if(count > 100)
-    sound_manager->play("sounds/lifeup.wav");
-  else
-    sound_manager->play("sounds/coin.wav");
-}
-
-void
-PlayerStatus::set_keys(int new_key)
-{
-  keys |= new_key;
-  key_brass->set_action(keys & KEY_BRASS ? "display" : "outline");
-  key_iron->set_action(keys & KEY_IRON ? "display" : "outline");
-  key_bronze->set_action(keys & KEY_BRONZE ? "display" : "outline");
-  key_silver->set_action(keys & KEY_SILVER ? "display" : "outline");
-  key_gold->set_action(keys & KEY_GOLD ? "display" : "outline");
+  if(play_sound) {
+    if(count >= 100)
+      sound_manager->play("sounds/lifeup.wav");
+    else
+      sound_manager->play("sounds/coin.wav");
+  }
 }
 
 void
@@ -112,12 +95,9 @@ PlayerStatus::write(lisp::Writer& writer)
       log_warning << "Unknown bonus type." << std::endl;
       writer.write_string("bonus", "none");
   }
-  writer.write_bool("key-brass", keys & KEY_BRASS);
-  writer.write_bool("key-iron", keys & KEY_IRON);
-  writer.write_bool("key-bronze", keys & KEY_BRONZE);
-  writer.write_bool("key-silver", keys & KEY_SILVER);
-  writer.write_bool("key-gold", keys & KEY_GOLD);
-
+  writer.write_int("fireflowers", max_fire_bullets);
+  writer.write_int("iceflowers", max_ice_bullets);
+  
   writer.write_int("coins", coins);
   writer.write_int("max-score-multiplier", max_score_multiplier);
 }
@@ -142,41 +122,14 @@ PlayerStatus::read(const lisp::Lisp& lisp)
       bonus = NO_BONUS;
     }
   }
-  bool val = false;
-  if(lisp.get("key-brass", val) && val == true)
-    set_keys(KEY_BRASS);
-  if(lisp.get("key-iron", val) && val == true)
-    set_keys(KEY_IRON);
-  if(lisp.get("key-bronze", val) && val == true)
-    set_keys(KEY_BRONZE);
-  if(lisp.get("key-silver", val) && val == true)
-    set_keys(KEY_SILVER);
-  if(lisp.get("key-gold", val) && val == true)
-    set_keys(KEY_GOLD);
+  lisp.get("fireflowers", max_fire_bullets);
+  lisp.get("iceflowers", max_ice_bullets);
 
   lisp.get("coins", coins);
   lisp.get("max-score-multiplier", max_score_multiplier);
 }
 
 void
-PlayerStatus::draw_keys(DrawingContext& context)
-{
-  const float SPACING = 10;
-  float x,y; 
-  x = BORDER_X; y = BORDER_Y;
-  key_brass->draw(context, Vector(x, y), LAYER_FOREGROUND1);
-  x += key_brass->get_width() + SPACING;
-  key_iron->draw(context, Vector(x, y), LAYER_FOREGROUND1);
-  x += key_iron->get_width() + SPACING;
-  key_bronze->draw(context, Vector(x, y), LAYER_FOREGROUND1);
-  x += key_bronze->get_width() + SPACING;
-  key_silver->draw(context, Vector(x, y), LAYER_FOREGROUND1);
-  x += key_silver->get_width() + SPACING;
-  key_gold->draw(context, Vector(x, y), LAYER_FOREGROUND1);
-  x += key_gold->get_width() + SPACING;
-}
-
-void
 PlayerStatus::draw(DrawingContext& context)
 {
   context.push_transform();
@@ -185,13 +138,11 @@ PlayerStatus::draw(DrawingContext& context)
   char str[60];
  
   int displayCoins = std::max(player_status->coins, 0);
-  sprintf(str, "%d", displayCoins);
+  snprintf(str, sizeof(str), "%d", displayCoins);
   const char* coinstext = _("COINS");
   context.draw_text(white_text, coinstext, Vector(SCREEN_WIDTH - white_text->get_text_width(coinstext) - gold_text->get_text_width(" 99999") - BORDER_X, BORDER_Y), LEFT_ALLIGN, LAYER_FOREGROUND1);
   context.draw_text(gold_text, str, Vector(SCREEN_WIDTH - BORDER_X, BORDER_Y), RIGHT_ALLIGN, LAYER_FOREGROUND1);
 
-  draw_keys(context);  
-
   context.pop_transform();
 }
 
@@ -202,7 +153,6 @@ PlayerStatus::operator= (const PlayerStatus& other)
   bonus = other.bonus;
   score_multiplier = other.score_multiplier;
   max_score_multiplier = other.max_score_multiplier;
-  keys = other.keys;
 }
 
 bool