#include "math/random_generator.hpp"
#include "object/camera.hpp"
#include "object/player.hpp"
-#include "physfs/physfs_stream.hpp"
+#include "physfs/ifile_stream.hpp"
#include "supertux/fadeout.hpp"
#include "supertux/game_session.hpp"
#include "supertux/gameconfig.hpp"
-#include "supertux/main.hpp"
-#include "supertux/mainloop.hpp"
+#include "supertux/globals.hpp"
+#include "supertux/screen_manager.hpp"
#include "supertux/sector.hpp"
#include "supertux/shrinkfade.hpp"
#include "supertux/textscroller.hpp"
#include "scripting/squirrel_util.hpp"
#include "scripting/time_scheduler.hpp"
-extern float g_game_speed;
-
-namespace Scripting {
+namespace scripting {
SQInteger display(HSQUIRRELVM vm)
{
void wait_for_screenswitch(HSQUIRRELVM vm)
{
- g_main_loop->waiting_threads.add(vm);
+ g_screen_manager->waiting_threads.add(vm);
}
void exit_screen()
{
- g_main_loop->exit_screen();
+ g_screen_manager->exit_screen();
}
void fadeout_screen(float seconds)
{
- g_main_loop->set_screen_fade(new FadeOut(seconds));
+ g_screen_manager->set_screen_fade(new FadeOut(seconds));
}
void shrink_screen(float dest_x, float dest_y, float seconds)
{
- g_main_loop->set_screen_fade(new ShrinkFade(Vector(dest_x, dest_y), seconds));
+ g_screen_manager->set_screen_fade(new ShrinkFade(Vector(dest_x, dest_y), seconds));
}
void abort_screenfade()
{
- g_main_loop->set_screen_fade(NULL);
+ g_screen_manager->set_screen_fade(NULL);
}
std::string translate(const std::string& text)
{
- return dictionary_manager.get_dictionary().translate(text);
+ return dictionary_manager->get_dictionary().translate(text);
}
void display_text_file(const std::string& filename)
{
- g_main_loop->push_screen(new TextScroller(filename));
+ g_screen_manager->push_screen(new TextScroller(filename));
}
void load_worldmap(const std::string& filename)
{
- using namespace WorldMapNS;
+ using namespace worldmap;
- g_main_loop->push_screen(new WorldMap(filename));
-}
+ if(World::current() == NULL)
+ throw std::runtime_error("Can't start WorldMap without active world.");
-void load_level(const std::string& filename)
-{
- g_main_loop->push_screen(new GameSession(filename));
+ g_screen_manager->push_screen(new WorldMap(filename, World::current()->get_player_status()));
}
-static SQInteger squirrel_read_char(SQUserPointer file)
+void load_level(const std::string& filename)
{
- std::istream* in = reinterpret_cast<std::istream*> (file);
- char c = in->get();
- if(in->eof())
- return 0;
+ if(GameSession::current() == NULL)
+ throw std::runtime_error("Can't start level without active level.");
- return c;
+ g_screen_manager->push_screen(new GameSession(filename, GameSession::current()->get_player_status()));
}
void import(HSQUIRRELVM vm, const std::string& filename)
void debug_worldmap_ghost(bool enable)
{
- using namespace WorldMapNS;
+ using namespace worldmap;
if(WorldMap::current() == NULL)
throw std::runtime_error("Can't change ghost mode without active WorldMap");
void save_state()
{
- using namespace WorldMapNS;
+ using namespace worldmap;
if(World::current() == NULL || WorldMap::current() == NULL)
throw std::runtime_error("Can't save state without active World");
void update_worldmap()
{
- using namespace WorldMapNS;
+ using namespace worldmap;
if(WorldMap::current() == NULL)
throw std::runtime_error("Can't update Worldmap: none active");
void grease()
{
if (!validate_sector_player()) return;
- ::Player* tux = Sector::current()->player; // Scripting::Player != ::Player
+ ::Player* tux = Sector::current()->player; // scripting::Player != ::Player
tux->get_physic().set_velocity_x(tux->get_physic().get_velocity_x()*3);
}
void quit()
{
- g_main_loop->quit();
+ g_screen_manager->quit();
}
int rand()