#include "math/random_generator.hpp"
#include "object/camera.hpp"
#include "object/player.hpp"
-#include "physfs/physfs_stream.hpp"
+#include "physfs/buffered_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 "supertux/tile.hpp"
#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"
-extern float g_game_speed;
-
-namespace Scripting {
+namespace scripting {
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_main_loop->waiting_threads.add(vm);
+ ScreenManager::current()->m_waiting_threads.add(vm);
}
void exit_screen()
{
- g_main_loop->exit_screen();
+ ScreenManager::current()->pop_screen();
}
void fadeout_screen(float seconds)
{
- g_main_loop->set_screen_fade(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_main_loop->set_screen_fade(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_main_loop->set_screen_fade(NULL);
+ 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_main_loop->push_screen(new TextScroller(filename));
+ ScreenManager::current()->push_screen(std::unique_ptr<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 (!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)
{
- g_main_loop->push_screen(new GameSession(filename));
-}
-
-static SQInteger squirrel_read_char(SQUserPointer file)
-{
- std::istream* in = reinterpret_cast<std::istream*> (file);
- char c = in->get();
- if(in->eof())
- return 0;
-
- return c;
+ if (!GameSession::current())
+ {
+ throw std::runtime_error("Can't start level without active level.");
+ }
+ else
+ {
+ 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)))
Sector::draw_solids_only = enable;
}
+void debug_draw_editor_images(bool enable)
+{
+ Tile::draw_editor_images = enable;
+}
+
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;
-
- if(World::current() == NULL || WorldMap::current() == NULL)
- throw std::runtime_error("Can't save state without active World");
-
- WorldMap::current()->save_state();
- World::current()->save_state();
-}
-
-void update_worldmap()
-{
- using namespace WorldMapNS;
+ using worldmap::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()
{
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);
}
{
if (!validate_sector_player()) return;
::Player* tux = Sector::current()->player;
- log_info << "You are at x " << tux->get_pos().x << ", y " << tux->get_pos().y << std::endl;
+ log_info << "You are at x " << ((int) tux->get_pos().x) << ", y " << ((int) tux->get_pos().y) << std::endl;
}
void gotoend()
log_info << "Camera is at " << Sector::current()->camera->get_translation().x << "," << Sector::current()->camera->get_translation().y << std::endl;
}
-void set_gamma(float gamma) {
- SDL_SetGamma(gamma, gamma, gamma);
+void set_gamma(float gamma)
+{
+ VideoSystem::current()->get_renderer().set_gamma(gamma);
}
void quit()
{
- g_main_loop->quit();
+ ScreenManager::current()->quit();
}
int rand()
{
- return systemRandom.rand();
+ return gameRandom.rand();
}
void set_game_speed(float speed)
}
// Reset random seed
g_config->random_seed = GameSession::current()->get_demo_random_seed(filename);
- g_config->random_seed = systemRandom.srand(g_config->random_seed);
+ g_config->random_seed = gameRandom.srand(g_config->random_seed);
GameSession::current()->restart_level();
GameSession::current()->play_demo(filename);
}
projects / supertux.git / blobdiff