projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Klaus Denker's patch to remove in-between tile lines, issue 0000020.
[supertux.git]
/
src
/
game_session.cpp
diff --git
a/src/game_session.cpp
b/src/game_session.cpp
index
2b539ee
..
852d8f0
100644
(file)
--- a/
src/game_session.cpp
+++ b/
src/game_session.cpp
@@
-99,7
+99,7
@@
GameSession::GameSession(const std::string& levelfile_, Statistics* statistics)
statistics_backdrop.reset(new Surface("images/engine/menu/score-backdrop.png"));
statistics_backdrop.reset(new Surface("images/engine/menu/score-backdrop.png"));
- restart_level(
true
);
+ restart_level();
game_menu.reset(new Menu());
game_menu->add_label(_("Pause"));
game_menu.reset(new Menu());
game_menu->add_label(_("Pause"));
@@
-111,7
+111,7
@@
GameSession::GameSession(const std::string& levelfile_, Statistics* statistics)
}
void
}
void
-GameSession::restart_level(
bool fromBeginning
)
+GameSession::restart_level()
{
game_pause = false;
end_sequence = 0;
{
game_pause = false;
end_sequence = 0;
@@
-126,9
+126,8
@@
GameSession::restart_level(bool fromBeginning)
level->stats.total_badguys = level->get_total_badguys();
level->stats.total_secrets = level->get_total_count<SecretAreaTrigger>();
level->stats.reset();
level->stats.total_badguys = level->get_total_badguys();
level->stats.total_secrets = level->get_total_count<SecretAreaTrigger>();
level->stats.reset();
- if
(!fromBeginning && (reset_sector != ""))
level->stats.declare_invalid();
+ if
(reset_sector != "")
level->stats.declare_invalid();
- if (fromBeginning) reset_sector="";
if(reset_sector != "") {
currentsector = level->get_sector(reset_sector);
if(!currentsector) {
if(reset_sector != "") {
currentsector = level->get_sector(reset_sector);
if(!currentsector) {
@@
-382,18
+381,8
@@
GameSession::check_end_conditions()
/* End of level? */
if(end_sequence && end_sequence->is_done()) {
finish(true);
/* End of level? */
if(end_sequence && end_sequence->is_done()) {
finish(true);
- return;
} else if (!end_sequence && tux->is_dead()) {
} else if (!end_sequence && tux->is_dead()) {
- if (player_status->coins < 0) {
- // No more coins: restart level from beginning
- player_status->coins = 0;
- restart_level(true);
- } else {
- // Still has coins: restart level from last reset point
- restart_level(false);
- }
-
- return;
+ restart_level();
}
}
}
}