projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reverted bigger parts of tuxdev patch:
[supertux.git]
/
src
/
player_status.hpp
diff --git
a/src/player_status.hpp
b/src/player_status.hpp
index
4ad7a68
..
bf5cc27
100644
(file)
--- a/
src/player_status.hpp
+++ b/
src/player_status.hpp
@@
-1,7
+1,8
@@
// $Id$
//
// $Id$
//
-// SuperTux
- A Jump'n Run
+// SuperTux
// Copyright (C) 2003 Tobias Glaesser <tobi.web@gmx.de>
// 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
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
@@
-19,41
+20,60
@@
#ifndef SUPERTUX_PLAYERSTATUS_H
#define SUPERTUX_PLAYERSTATUS_H
#ifndef SUPERTUX_PLAYERSTATUS_H
#define SUPERTUX_PLAYERSTATUS_H
+#include <assert.h>
+#include <memory>
#include "lisp/lisp.hpp"
#include "timer.hpp"
#include "serializable.hpp"
#include "lisp/lisp.hpp"
#include "timer.hpp"
#include "serializable.hpp"
+#include "sprite/sprite.hpp"
+#include "console.hpp"
+#include "video/surface.hpp"
+
+static const float BORDER_X = 10;
+static const float BORDER_Y = 10;
enum BonusType {
NO_BONUS, GROWUP_BONUS, FIRE_BONUS, ICE_BONUS
};
class DrawingContext;
enum BonusType {
NO_BONUS, GROWUP_BONUS, FIRE_BONUS, ICE_BONUS
};
class DrawingContext;
-/**
+/**
* This class memorizes player status between different game sessions (for
* example when switching maps in the worldmap)
*/
* This class memorizes player status between different game sessions (for
* example when switching maps in the worldmap)
*/
-class PlayerStatus : public Serializable
+class PlayerStatus : public Serializable
, public ConsoleCommandReceiver
{
public:
PlayerStatus();
{
public:
PlayerStatus();
- void reset();
- void
incLives
();
- void
incCoins(
);
+ ~PlayerStatus();
+ void
reset
();
+ void
add_coins(int count, bool play_sound = true
);
void write(lisp::Writer& writer);
void read(const lisp::Lisp& lisp);
void draw(DrawingContext& context);
void write(lisp::Writer& writer);
void read(const lisp::Lisp& lisp);
void draw(DrawingContext& context);
+ bool consoleCommand(std::string command, std::vector<std::string> arguments); /**< callback from Console; return false if command was unknown, true otherwise */
+
int coins;
int coins;
- int lives;
BonusType bonus;
BonusType bonus;
+ int max_fire_bullets; /**< maximum number of fire bullets in play */
+ int max_ice_bullets; /**< maximum number of ice bullets in play */
int score_multiplier;
int max_score_multiplier;
int score_multiplier;
int max_score_multiplier;
+
+ void operator= (const PlayerStatus& other);
+
+private:
+ // don't use this
+ PlayerStatus(const PlayerStatus& other);
+
+ std::auto_ptr<Surface> coin_surface;
};
// global player state
};
// global player state
-extern PlayerStatus player_status;
+extern PlayerStatus
*
player_status;
#endif
#endif