projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed a few things from svn:ignore that are no longer needed to to switch to Cmake
[supertux.git]
/
src
/
player_status.hpp
diff --git
a/src/player_status.hpp
b/src/player_status.hpp
index
1559725
..
85ac059
100644
(file)
--- a/
src/player_status.hpp
+++ b/
src/player_status.hpp
@@
-20,13
+20,12
@@
#ifndef SUPERTUX_PLAYERSTATUS_H
#define SUPERTUX_PLAYERSTATUS_H
#ifndef SUPERTUX_PLAYERSTATUS_H
#define SUPERTUX_PLAYERSTATUS_H
-#include <assert.h>
#include <memory>
#include <memory>
-#include "lisp/lisp.hpp"
-#include "timer.hpp"
#include "serializable.hpp"
#include "serializable.hpp"
-#include "sprite/sprite.hpp"
-#include "console.hpp"
+
+namespace lisp{ class Writer; }
+namespace lisp{ class Lisp; }
+class Surface;
static const float BORDER_X = 10;
static const float BORDER_Y = 10;
static const float BORDER_X = 10;
static const float BORDER_Y = 10;
@@
-40,7
+39,7
@@
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
, public ConsoleCommandReceiver
+class PlayerStatus : public Serializable
{
public:
PlayerStatus();
{
public:
PlayerStatus();
@@
-53,8
+52,6
@@
public:
void draw(DrawingContext& context);
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;
BonusType bonus;
int max_fire_bullets; /**< maximum number of fire bullets in play */
int coins;
BonusType bonus;
int max_fire_bullets; /**< maximum number of fire bullets in play */
@@
-69,7
+66,7
@@
private:
// don't use this
PlayerStatus(const PlayerStatus& other);
// don't use this
PlayerStatus(const PlayerStatus& other);
- std::auto_ptr<S
prite> tux_lif
e;
+ std::auto_ptr<S
urface> coin_surfac
e;
};
// global player state
};
// global player state