projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed game crashing when leaving the worldmap
[supertux.git]
/
src
/
game_session.hpp
diff --git
a/src/game_session.hpp
b/src/game_session.hpp
index
87d0b3e
..
edae3a6
100644
(file)
--- a/
src/game_session.hpp
+++ b/
src/game_session.hpp
@@
-21,11
+21,9
@@
#include <string>
#include <SDL.h>
#include <string>
#include <SDL.h>
+#include <squirrel.h>
#include "screen.hpp"
#include "screen.hpp"
-#include "timer.hpp"
-#include "statistics.hpp"
#include "math/vector.hpp"
#include "math/vector.hpp"
-#include "console.hpp"
#include "video/surface.hpp"
#include "object/endsequence.hpp"
#include "video/surface.hpp"
#include "object/endsequence.hpp"
@@
-37,8
+35,7
@@
class CodeController;
class Menu;
/**
class Menu;
/**
- * The GameSession class controlls the controll flow of the Game (the part
- * where you actually play a level)
+ * Screen that runs a Level, where Players run and jump through Sectors.
*/
class GameSession : public Screen
{
*/
class GameSession : public Screen
{
@@
-65,12
+62,10
@@
public:
void set_reset_point(const std::string& sectorname, const Vector& pos);
std::string get_reset_point_sectorname()
{ return reset_sector; }
void set_reset_point(const std::string& sectorname, const Vector& pos);
std::string get_reset_point_sectorname()
{ return reset_sector; }
-
+
Vector get_reset_point_pos()
{ return reset_pos; }
Vector get_reset_point_pos()
{ return reset_pos; }
- void display_info_box(const std::string& text);
-
Sector* get_current_sector()
{ return currentsector; }
Sector* get_current_sector()
{ return currentsector; }
@@
-85,10
+80,20
@@
public:
* resources for the current level/world
*/
std::string get_working_directory();
* resources for the current level/world
*/
std::string get_working_directory();
- void restart_level(
bool fromBeginning = true
);
+ void restart_level();
void toggle_pause();
void toggle_pause();
+ /**
+ * Enters or leaves level editor mode
+ */
+ void set_editmode(bool edit_mode = true);
+
+ /**
+ * Forces all Players to enter ghost mode
+ */
+ void force_ghost_mode();
+
private:
void check_end_conditions();
void process_events();
private:
void check_end_conditions();
void process_events();
@@
-116,7
+121,8
@@
private:
EndSequence* end_sequence;
EndSequence* end_sequence;
- bool game_pause;
+ bool game_pause;
+ float speed_before_pause;
std::string levelfile;
std::string levelfile;
@@
-140,6
+146,8
@@
private:
std::auto_ptr<Menu> game_menu;
float play_time; /**< total time in seconds that this session ran interactively */
std::auto_ptr<Menu> game_menu;
float play_time; /**< total time in seconds that this session ran interactively */
+
+ bool edit_mode; /**< true if GameSession runs in level editor mode */
};
#endif /*SUPERTUX_GAMELOOP_H*/
};
#endif /*SUPERTUX_GAMELOOP_H*/