#include "math/random_generator.hpp"
#include "object/camera.hpp"
#include "object/player.hpp"
-#include "physfs/ifile_stream.hpp"
+#include "physfs/buffered_ifile_stream.hpp"
#include "supertux/fadeout.hpp"
#include "supertux/game_session.hpp"
#include "supertux/gameconfig.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)
}
else
{
- g_screen_manager->push_screen(std::unique_ptr<Screen>(new WorldMap(filename, WorldMap::current()->get_savegame())));
+ ScreenManager::current()->push_screen(std::unique_ptr<Screen>(new WorldMap(filename, WorldMap::current()->get_savegame())));
}
}
}
else
{
- g_screen_manager->push_screen(std::unique_ptr<Screen>(new GameSession(filename, GameSession::current()->get_savegame())));
+ ScreenManager::current()->push_screen(std::unique_ptr<Screen>(new GameSession(filename, GameSession::current()->get_savegame())));
}
}
void import(HSQUIRRELVM vm, const std::string& filename)
{
- IFileStream in(filename);
+ BufferedIFileStream* stream = new BufferedIFileStream(filename);
+ IFileStream* in = stream->get_stream();
if(SQ_FAILED(sq_compile(vm, squirrel_read_char, &in,
filename.c_str(), SQTrue)))
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 quit()
{
- g_screen_manager->quit();
+ ScreenManager::current()->quit();
}
int rand()