Removed load/save functions from scripting interface

[supertux.git] / src / scripting / functions.cpp

diff --git a/src/scripting/functions.cpp b/src/scripting/functions.cpp
index 5a03f37..5e2aace 100644 (file)
--- a/src/scripting/functions.cpp
+++ b/src/scripting/functions.cpp
@@ -32,6 +32,7 @@
 #include "supertux/tile.hpp"
 #include "supertux/world.hpp"
 #include "util/gettext.hpp"
+#include "video/renderer.hpp"
 #include "worldmap/tux.hpp"
 
 #include "scripting/squirrel_util.hpp"
@@ -63,27 +64,27 @@ void wait(HSQUIRRELVM vm, float seconds)
 
 void wait_for_screenswitch(HSQUIRRELVM vm)
 {
-  g_screen_manager->waiting_threads.add(vm);
+  g_screen_manager->m_waiting_threads.add(vm);
 }
 
 void exit_screen()
 {
-  g_screen_manager->exit_screen();
+  g_screen_manager->pop_screen();
 }
 
 void fadeout_screen(float seconds)
 {
-  g_screen_manager->set_screen_fade(new FadeOut(seconds));
+  g_screen_manager->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(new ShrinkFade(Vector(dest_x, dest_y), seconds));
+  g_screen_manager->set_screen_fade(std::unique_ptr<ScreenFade>(new ShrinkFade(Vector(dest_x, dest_y), seconds)));
 }
 
 void abort_screenfade()
 {
-  g_screen_manager->set_screen_fade(NULL);
+  g_screen_manager->set_screen_fade(std::unique_ptr<ScreenFade>());
 }
 
 std::string translate(const std::string& text)
@@ -93,25 +94,7 @@ std::string translate(const std::string& text)
 
 void display_text_file(const std::string& filename)
 {
-  g_screen_manager->push_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(new WorldMap(filename, World::current()->get_player_status()));
-}
-
-void load_level(const std::string& filename)
-{
-  if(GameSession::current() == NULL)
-    throw std::runtime_error("Can't start level without active level.");
-
-  g_screen_manager->push_screen(new GameSession(filename, GameSession::current()->get_player_status()));
+  g_screen_manager->push_screen(std::unique_ptr<Screen>(new TextScroller(filename)));
 }
 
 void import(HSQUIRRELVM vm, const std::string& filename)
@@ -160,27 +143,6 @@ void debug_worldmap_ghost(bool enable)
   WorldMap::current()->get_tux()->set_ghost_mode(enable);
 }
 
-void save_state()
-{
-  using namespace worldmap;
-
-  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 worldmap;
-
-  if(WorldMap::current() == NULL)
-    throw std::runtime_error("Can't update Worldmap: none active");
-
-  WorldMap::current()->load_state();
-}
-
 // not added to header, function to only be used by others
 // in this file
 bool validate_sector_player()
@@ -271,8 +233,9 @@ void camera()
   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)
+{
+  Renderer::instance()->set_gamma(gamma);
 }
 
 void quit()