projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
disable collision detection when tux is falling down because he is dead
[supertux.git]
/
src
/
scene.h
diff --git
a/src/scene.h
b/src/scene.h
index
a4f7215
..
b8d5596
100644
(file)
--- a/
src/scene.h
+++ b/
src/scene.h
@@
-20,7
+20,7
@@
#ifndef SUPERTUX_SCENE_H
#define SUPERTUX_SCENE_H
#ifndef SUPERTUX_SCENE_H
#define SUPERTUX_SCENE_H
-#include "
textur
e.h"
+#include "
video/surfac
e.h"
#include "timer.h"
#define FRAME_RATE 10 // 100 Frames per second (10ms)
#include "timer.h"
#define FRAME_RATE 10 // 100 Frames per second (10ms)
@@
-28,17
+28,18
@@
// Player stats
struct PlayerStatus
{
// Player stats
struct PlayerStatus
{
- int score;
int distros;
int lives;
enum BonusType { NO_BONUS, GROWUP_BONUS, FLOWER_BONUS };
BonusType bonus;
int score_multiplier;
int distros;
int lives;
enum BonusType { NO_BONUS, GROWUP_BONUS, FLOWER_BONUS };
BonusType bonus;
int score_multiplier;
+ int max_score_multiplier;
PlayerStatus();
PlayerStatus();
-
void reset();
void reset();
+ void incLives();
+ void incCoins();
};
std::string bonus_to_string(PlayerStatus::BonusType b);
};
std::string bonus_to_string(PlayerStatus::BonusType b);
@@
-46,6
+47,4
@@
PlayerStatus::BonusType string_to_bonus(const std::string& str);
extern PlayerStatus player_status;
extern PlayerStatus player_status;
-extern unsigned int global_frame_counter;
-
#endif /*SUPERTUX_SCENE_H*/
#endif /*SUPERTUX_SCENE_H*/