X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fplayer_status.cpp;h=432640cbfb219193c23d3dfd4c29ac6210529326;hb=4f011ba68aed4c9775cdfb69f19c5daf66101dcb;hp=57acb9348798955a2245508b1ab3a0d91c004494;hpb=6afe39823a25f6bf06f715205c1f51ddbe6cefae;p=supertux.git diff --git a/src/player_status.cpp b/src/player_status.cpp index 57acb9348..432640cbf 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 @@ -25,48 +26,73 @@ #include "gettext.hpp" #include "video/drawing_context.hpp" #include "audio/sound_manager.hpp" +#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; +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.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")); + + Console::instance->registerCommand("coins", this); +} + +PlayerStatus::~PlayerStatus() +{ } void PlayerStatus::reset() { - coins = 0; - lives = START_LIVES; + coins = START_COINS; + keys = 0; bonus = NO_BONUS; score_multiplier = 1; max_score_multiplier = 1; } void -PlayerStatus::incLives() +PlayerStatus::add_coins(int count) { - if(lives < MAX_LIVES) - ++lives; - sound_manager->play("sounds/lifeup.wav"); + 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::incCoins() +PlayerStatus::set_keys(int new_key) { - coins++; - if(coins >= 100) { - incLives(); - coins = 0; - } - sound_manager->play("sounds/coin.wav"); + 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 @@ -86,11 +112,18 @@ 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_int("fireflowers", max_fire_bullets); + writer.write_int("iceflowers", max_ice_bullets); + + 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("lives", lives); writer.write_int("coins", coins); writer.write_int("max-score-multiplier", max_score_multiplier); } @@ -111,53 +144,87 @@ 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; } } + lisp.get("fireflowers", max_fire_bullets); + lisp.get("iceflowers", max_ice_bullets); + + 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("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(); context.set_translation(Vector(0, 0)); char str[60]; - - sprintf(str, " %d", player_status.coins); + + int displayCoins = std::max(player_status->coins, 0); + sprintf(str, "%d", displayCoins); 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"), 0), - LEFT_ALLIGN, LAYER_FOREGROUND1); - context.draw_text(gold_text, str, - Vector(SCREEN_WIDTH - gold_text->get_text_width(" 99"), 0), - 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->w; - context.draw_text(gold_text, str, Vector(x, 20), LEFT_ALLIGN, - LAYER_FOREGROUND1); - context.draw_surface(tux_life, Vector(SCREEN_WIDTH - 16, 20), - LAYER_FOREGROUND1); - } 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), 20), - LAYER_FOREGROUND1); - } + 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); - 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"), 20), - LEFT_ALLIGN, LAYER_FOREGROUND1); + draw_keys(context); context.pop_transform(); } + +void +PlayerStatus::operator= (const PlayerStatus& other) +{ + coins = other.coins; + 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; +} +