X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fplayer_status.cpp;h=95a1c11c07654839073b095340187d39916a7dc8;hb=6f5f82abb84b33fd400c3b82a5e2be2a6cf8ce21;hp=1e37c7cab842ae02a6adafd4eefc8f4cdd5df399;hpb=267c14b530f86b58090e6e054a0a775076729061;p=supertux.git diff --git a/src/player_status.cpp b/src/player_status.cpp index 1e37c7cab..95a1c11c0 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 +// Copyright (C) 2006 Matthias Braun // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -28,79 +29,50 @@ #include "sprite/sprite_manager.hpp" #include "math/vector.hpp" #include "main.hpp" +#include "log.hpp" -static const int START_LIVES = 4; -static const int MAX_LIVES = 99; +static const int START_COINS = 100; +static const int MAX_COINS = 99999; PlayerStatus* player_status = 0; PlayerStatus::PlayerStatus() - : coins(0), - lives(START_LIVES), + : coins(START_COINS), bonus(NO_BONUS), + max_fire_bullets(0), + max_ice_bullets(0), score_multiplier(1), 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->set_action("outline"); - key_iron->set_action("outline"); - key_bronze->set_action("outline"); - key_silver->set_action("outline"); - key_gold->set_action("outline"); + + coin_surface.reset(new Surface("images/engine/hud/coins-0.png")); + + Console::instance->registerCommand("coins", this); } PlayerStatus::~PlayerStatus() { - delete key_brass; - delete key_iron; - delete key_bronze; - delete key_silver; - delete key_gold; } void PlayerStatus::reset() { - coins = 0; - keys = 0; - lives = START_LIVES; + coins = START_COINS; bonus = NO_BONUS; score_multiplier = 1; max_score_multiplier = 1; } void -PlayerStatus::incLives() +PlayerStatus::add_coins(int count, bool play_sound) { - if(lives < MAX_LIVES) - ++lives; - sound_manager->play("sounds/lifeup.wav"); -} - -void -PlayerStatus::incCoins() -{ - coins++; - if(coins >= 100) { - incLives(); - coins = 0; + coins = std::min(coins + count, MAX_COINS); + if(play_sound) { + if(count >= 100) + sound_manager->play("sounds/lifeup.wav"); + else + sound_manager->play("sounds/coin.wav"); } - 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"); } void @@ -120,16 +92,12 @@ PlayerStatus::write(lisp::Writer& writer) writer.write_string("bonus", "iceflower"); break; default: - std::cerr << "Unknown bonus type.\n"; + 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("lives", lives); writer.write_int("coins", coins); writer.write_int("max-score-multiplier", max_score_multiplier); } @@ -138,7 +106,7 @@ void PlayerStatus::read(const lisp::Lisp& lisp) { reset(); - + std::string bonusname; if(lisp.get("bonus", bonusname)) { if(bonusname == "none") { @@ -150,85 +118,43 @@ PlayerStatus::read(const lisp::Lisp& lisp) } else if(bonusname == "iceflower") { bonus = ICE_BONUS; } else { - std::cerr << "Unknown bonus '" << bonusname << "' in savefile.\n"; + log_warning << "Unknown bonus '" << bonusname << "' in savefile" << std::endl; 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("lives", lives); + 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) { + static int displayed_coins = -1; + static int next_count = 0; + + if (displayed_coins == -1) displayed_coins = coins; + if (++next_count > 2) { + next_count = 0; + if (displayed_coins < coins) displayed_coins++; + if (displayed_coins > coins) displayed_coins--; + } + displayed_coins = std::min(std::max(displayed_coins, 0), 9999); + + std::stringstream ss; + ss << displayed_coins; + std::string coins_text = ss.str(); + context.push_transform(); context.set_translation(Vector(0, 0)); - char str[60]; - - sprintf(str, " %d", player_status->coins); - const char* coinstext = _("COINS"); - context.draw_text(white_text, coinstext, - Vector(SCREEN_WIDTH - white_text->get_text_width(coinstext) - - white_text->get_text_width(" 99") - BORDER_X, BORDER_Y), - LEFT_ALLIGN, LAYER_FOREGROUND1); - context.draw_text(gold_text, str, - Vector(SCREEN_WIDTH - gold_text->get_text_width(" 99") - BORDER_X, BORDER_Y), - LEFT_ALLIGN, LAYER_FOREGROUND1); - - if (player_status->lives >= 5) { - sprintf(str, "%dx", player_status->lives); - 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), - LAYER_FOREGROUND1); - } else { - for(int i= 0; i < player_status->lives; ++i) - context.draw_surface(tux_life, - Vector(SCREEN_WIDTH - tux_life->get_width()*4 +(tux_life->get_width()*i) - BORDER_X, - BORDER_Y + 20), - LAYER_FOREGROUND1); + Surface* coin_surf = coin_surface.get(); + if (coin_surf) { + context.draw_surface(coin_surf, Vector(SCREEN_WIDTH - BORDER_X - coin_surf->get_width() - gold_text->get_text_width(coins_text), BORDER_Y + 1), LAYER_HUD); } - - const char* livestext = _("LIVES"); - context.draw_text(white_text, livestext, - Vector(SCREEN_WIDTH - white_text->get_text_width(livestext) - - white_text->get_text_width(" 99") - BORDER_X, BORDER_Y + 20), - LEFT_ALLIGN, LAYER_FOREGROUND1); - - draw_keys(context); + context.draw_text(gold_text, coins_text, Vector(SCREEN_WIDTH - BORDER_X, BORDER_Y), RIGHT_ALLIGN, LAYER_HUD); context.pop_transform(); } @@ -237,10 +163,21 @@ 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; } +bool +PlayerStatus::consoleCommand(std::string command, std::vector arguments) +{ + if (command == "coins") { + if ((arguments.size() < 1) || (!Console::string_is(arguments[0]))) { + log_info << "Usage: coins " << std::endl; + } else { + coins = Console::string_to(arguments[0]); + } + return true; + } + return false; +}