#include "supertux/world.hpp"
#include "util/gettext.hpp"
#include "video/renderer.hpp"
+#include "video/video_system.hpp"
#include "worldmap/tux.hpp"
+#include "worldmap/worldmap.hpp"
#include "scripting/squirrel_util.hpp"
#include "scripting/time_scheduler.hpp"
SQInteger display(HSQUIRRELVM vm)
{
- Console::output << squirrel2string(vm, -1) << std::endl;
+ ConsoleBuffer::output << squirrel2string(vm, -1) << std::endl;
return 0;
}
void wait_for_screenswitch(HSQUIRRELVM vm)
{
- g_screen_manager->m_waiting_threads.add(vm);
+ ScreenManager::current()->m_waiting_threads.add(vm);
}
void exit_screen()
{
- g_screen_manager->pop_screen();
+ ScreenManager::current()->pop_screen();
}
void fadeout_screen(float seconds)
{
- g_screen_manager->set_screen_fade(std::unique_ptr<ScreenFade>(new FadeOut(seconds)));
+ ScreenManager::current()->set_screen_fade(std::unique_ptr<ScreenFade>(new FadeOut(seconds)));
}
void shrink_screen(float dest_x, float dest_y, float seconds)
{
- g_screen_manager->set_screen_fade(std::unique_ptr<ScreenFade>(new ShrinkFade(Vector(dest_x, dest_y), seconds)));
+ ScreenManager::current()->set_screen_fade(std::unique_ptr<ScreenFade>(new ShrinkFade(Vector(dest_x, dest_y), seconds)));
}
void abort_screenfade()
{
- g_screen_manager->set_screen_fade(std::unique_ptr<ScreenFade>());
+ ScreenManager::current()->set_screen_fade(std::unique_ptr<ScreenFade>());
}
std::string translate(const std::string& text)
{
- return dictionary_manager->get_dictionary().translate(text);
+ return g_dictionary_manager->get_dictionary().translate(text);
}
void display_text_file(const std::string& filename)
{
- g_screen_manager->push_screen(std::unique_ptr<Screen>(new TextScroller(filename)));
+ ScreenManager::current()->push_screen(std::unique_ptr<Screen>(new TextScroller(filename)));
}
void load_worldmap(const std::string& filename)
{
using namespace worldmap;
- if(World::current() == NULL)
- throw std::runtime_error("Can't start WorldMap without active world.");
-
- g_screen_manager->push_screen(std::unique_ptr<Screen>(new WorldMap(filename, World::current()->get_player_status())));
+ if (!WorldMap::current())
+ {
+ throw std::runtime_error("Can't start Worldmap without active WorldMap");
+ }
+ else
+ {
+ ScreenManager::current()->push_screen(std::unique_ptr<Screen>(new WorldMap(filename, WorldMap::current()->get_savegame())));
+ }
}
void load_level(const std::string& filename)
{
- if(GameSession::current() == NULL)
+ if (!GameSession::current())
+ {
throw std::runtime_error("Can't start level without active level.");
-
- g_screen_manager->push_screen(std::unique_ptr<Screen>(new GameSession(filename, GameSession::current()->get_player_status())));
+ }
+ else
+ {
+ ScreenManager::current()->push_screen(std::unique_ptr<Screen>(new GameSession(filename, GameSession::current()->get_savegame())));
+ }
}
void import(HSQUIRRELVM vm, const std::string& filename)
void save_state()
{
- using namespace worldmap;
-
- if(World::current() == NULL || WorldMap::current() == NULL)
- throw std::runtime_error("Can't save state without active World");
+ using worldmap::WorldMap;
- WorldMap::current()->save_state();
- World::current()->save_state();
-}
-
-void update_worldmap()
-{
- using namespace worldmap;
-
- if(WorldMap::current() == NULL)
- throw std::runtime_error("Can't update Worldmap: none active");
-
- WorldMap::current()->load_state();
+ if (!WorldMap::current())
+ {
+ throw std::runtime_error("Can't save state without active Worldmap");
+ }
+ else
+ {
+ WorldMap::current()->save_state();
+ }
}
// not added to header, function to only be used by others
void play_music(const std::string& filename)
{
- sound_manager->play_music(filename);
+ SoundManager::current()->play_music(filename);
}
void play_sound(const std::string& filename)
{
- sound_manager->play(filename);
+ SoundManager::current()->play(filename);
}
void grease()
void set_gamma(float gamma)
{
- Renderer::instance()->set_gamma(gamma);
+ VideoSystem::current()->get_renderer().set_gamma(gamma);
}
void quit()
{
- g_screen_manager->quit();
+ ScreenManager::current()->quit();
}
int rand()