projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Scripting scheduler is now paused while pause menu is shown
[supertux.git]
/
src
/
game_session.cpp
diff --git
a/src/game_session.cpp
b/src/game_session.cpp
index
2b539ee
..
b9b7510
100644
(file)
--- a/
src/game_session.cpp
+++ b/
src/game_session.cpp
@@
-20,20
+20,21
@@
#include <fstream>
#include <sstream>
#include <fstream>
#include <sstream>
-#include <
cassert
>
-#include <
cstdio
>
-#include <
cstdlib
>
-#include <
cmat
h>
-#include <
cstring
>
-#include <
cerrno
>
+#include <
assert.h
>
+#include <
stdio.h
>
+#include <
stdlib.h
>
+#include <
math.
h>
+#include <
string.h
>
+#include <
errno.h
>
#include <unistd.h>
#include <unistd.h>
-#include <
ctime
>
+#include <
time.h
>
#include <stdexcept>
#include <SDL.h>
#include "game_session.hpp"
#include "log.hpp"
#include <stdexcept>
#include <SDL.h>
#include "game_session.hpp"
#include "log.hpp"
+#include "console.hpp"
#include "worldmap/worldmap.hpp"
#include "mainloop.hpp"
#include "audio/sound_manager.hpp"
#include "worldmap/worldmap.hpp"
#include "mainloop.hpp"
#include "audio/sound_manager.hpp"
@@
-72,6
+73,7
@@
#include "object/endsequence_walkleft.hpp"
#include "object/endsequence_fireworks.hpp"
#include "direction.hpp"
#include "object/endsequence_walkleft.hpp"
#include "object/endsequence_fireworks.hpp"
#include "direction.hpp"
+#include "scripting/time_scheduler.hpp"
// the engine will be run with a logical framerate of 64fps.
// We chose 64fps here because it is a power of 2, so 1/64 gives an "even"
// the engine will be run with a logical framerate of 64fps.
// We chose 64fps here because it is a power of 2, so 1/64 gives an "even"
@@
-96,10
+98,11
@@
GameSession::GameSession(const std::string& levelfile_, Statistics* statistics)
currentsector = NULL;
game_pause = false;
currentsector = NULL;
game_pause = false;
+ Scripting::TimeScheduler::instance->set_pause(game_pause);
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,9
+114,10
@@
GameSession::GameSession(const std::string& levelfile_, Statistics* statistics)
}
void
}
void
-GameSession::restart_level(
bool fromBeginning
)
+GameSession::restart_level()
{
game_pause = false;
{
game_pause = false;
+ Scripting::TimeScheduler::instance->set_pause(game_pause);
end_sequence = 0;
main_controller->reset();
end_sequence = 0;
main_controller->reset();
@@
-126,9
+130,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) {
@@
-146,6
+149,7
@@
GameSession::restart_level(bool fromBeginning)
//levelintro();
//levelintro();
+ sound_manager->stop_music();
currentsector->play_music(LEVEL_MUSIC);
if(capture_file != "") {
currentsector->play_music(LEVEL_MUSIC);
if(capture_file != "") {
@@
-164,6
+168,11
@@
GameSession::~GameSession()
delete playback_demo_stream;
delete demo_controller;
delete playback_demo_stream;
delete demo_controller;
+ if (game_pause) {
+ game_pause = false;
+ Scripting::TimeScheduler::instance->set_pause(game_pause);
+ }
+
current_ = NULL;
}
current_ = NULL;
}
@@
-296,9
+305,11
@@
GameSession::toggle_pause()
Menu::set_current(game_menu.get());
game_menu->set_active_item(MNID_CONTINUE);
game_pause = true;
Menu::set_current(game_menu.get());
game_menu->set_active_item(MNID_CONTINUE);
game_pause = true;
+ Scripting::TimeScheduler::instance->set_pause(game_pause);
} else {
Menu::set_current(NULL);
game_pause = false;
} else {
Menu::set_current(NULL);
game_pause = false;
+ Scripting::TimeScheduler::instance->set_pause(game_pause);
}
}
}
}
@@
-338,6
+349,7
@@
GameSession::process_events()
// end of pause mode?
if(!Menu::current() && game_pause) {
game_pause = false;
// end of pause mode?
if(!Menu::current() && game_pause) {
game_pause = false;
+ Scripting::TimeScheduler::instance->set_pause(game_pause);
}
// playback a demo?
}
// playback a demo?
@@
-382,18
+394,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();
}
}
}
}
@@
-442,6
+444,11
@@
GameSession::setup()
Menu::set_current(NULL);
current_ = this;
Menu::set_current(NULL);
current_ = this;
+ if(currentsector != Sector::current()) {
+ currentsector->activate(currentsector->player->get_pos());
+ }
+ currentsector->play_music(LEVEL_MUSIC);
+
// Eat unneeded events
SDL_Event event;
while(SDL_PollEvent(&event))
// Eat unneeded events
SDL_Event event;
while(SDL_PollEvent(&event))
@@
-597,7
+604,7
@@
GameSession::start_sequence(const std::string& sequencename)
if (sequencename == "endsequence") {
// Determine walking direction for Tux
if (sequencename == "endsequence") {
// Determine walking direction for Tux
- float xst = 1.f, xend = 2.f;
+
/*
float xst = 1.f, xend = 2.f;
for(std::vector<GameObject*>::iterator i = currentsector->gameobjects.begin(); i != currentsector->gameobjects.end(); i++) {
SequenceTrigger* st = dynamic_cast<SequenceTrigger*>(*i);
if(!st)
for(std::vector<GameObject*>::iterator i = currentsector->gameobjects.begin(); i != currentsector->gameobjects.end(); i++) {
SequenceTrigger* st = dynamic_cast<SequenceTrigger*>(*i);
if(!st)
@@
-612,6
+619,11
@@
GameSession::start_sequence(const std::string& sequencename)
end_sequence = new EndSequenceWalkLeft();
} else {
end_sequence = new EndSequenceWalkRight();
end_sequence = new EndSequenceWalkLeft();
} else {
end_sequence = new EndSequenceWalkRight();
+ }*/
+ if (currentsector->get_players()[0]->physic.get_velocity_x() < 0) {
+ end_sequence = new EndSequenceWalkLeft();
+ } else {
+ end_sequence = new EndSequenceWalkRight();
}
}
else if (sequencename == "fireworks") end_sequence = new EndSequenceFireworks();
}
}
else if (sequencename == "fireworks") end_sequence = new EndSequenceFireworks();