X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fscripting%2Ffunctions.cpp;h=aa8ace74d81c2d9fb5221c795d38d16bb343a161;hb=2892ebda09d24c977547159e34abf0244884b89e;hp=b7a377903d5c01e719adce9dd02c5bbceeba52a0;hpb=112f01454123c94f5627200c6819b219026f0af0;p=supertux.git

diff --git a/src/scripting/functions.cpp b/src/scripting/functions.cpp
index b7a377903..aa8ace74d 100644
--- a/src/scripting/functions.cpp
+++ b/src/scripting/functions.cpp
@@ -29,7 +29,6 @@
 #include "game_session.hpp"
 #include "tinygettext/tinygettext.hpp"
 #include "physfs/physfs_stream.hpp"
-#include "script_manager.hpp"
 #include "resources.hpp"
 #include "gettext.hpp"
 #include "log.hpp"
@@ -37,36 +36,49 @@
 #include "worldmap/worldmap.hpp"
 #include "world.hpp"
 #include "sector.hpp"
+#include "gameconfig.hpp"
 #include "object/player.hpp"
 #include "object/tilemap.hpp"
 #include "main.hpp"
+#include "fadeout.hpp"
+#include "shrinkfade.hpp"
 #include "object/camera.hpp"
 #include "flip_level_transformer.hpp"
+#include "audio/sound_manager.hpp"
+#include "random_generator.hpp"
 
 #include "squirrel_error.hpp"
-#include "wrapper_util.hpp"
+#include "squirrel_util.hpp"
+#include "time_scheduler.hpp"
 
 namespace Scripting
 {
 
-int display(HSQUIRRELVM vm)
+SQInteger display(HSQUIRRELVM vm)
 {
   Console::output << squirrel2string(vm, -1) << std::endl;
   return 0;
 }
 
+void print_stacktrace(HSQUIRRELVM vm)
+{
+  print_squirrel_stack(vm);
+}
+
+SQInteger get_current_thread(HSQUIRRELVM vm)
+{
+  sq_pushobject(vm, vm_to_object(vm));
+  return 1;
+}
+
 void wait(HSQUIRRELVM vm, float seconds)
 {
-  SQUserPointer ptr = sq_getforeignptr(vm);
-  ScriptManager* script_manager = reinterpret_cast<ScriptManager*> (ptr);
-  script_manager->set_wakeup_event(vm, ScriptManager::TIME, seconds);
+  TimeScheduler::instance->schedule_thread(vm, game_time + seconds);
 }
 
 void wait_for_screenswitch(HSQUIRRELVM vm)
 {
-  SQUserPointer ptr = sq_getforeignptr(vm);
-  ScriptManager* script_manager = reinterpret_cast<ScriptManager*> (ptr);
-  script_manager->set_wakeup_event(vm, ScriptManager::SCREEN_SWITCHED);
+  main_loop->waiting_threads.add(vm);
 }
 
 void exit_screen()
@@ -74,6 +86,16 @@ void exit_screen()
   main_loop->exit_screen();
 }
 
+void fadeout_screen(float seconds)
+{
+  main_loop->set_screen_fade(new FadeOut(seconds));
+}
+
+void shrink_screen(float dest_x, float dest_y, float seconds)
+{
+  main_loop->set_screen_fade(new ShrinkFade(Vector(dest_x, dest_y), seconds));
+}
+
 std::string translate(const std::string& text)
 {
   return dictionary_manager.get_dictionary().translate(text);
@@ -88,14 +110,12 @@ void load_worldmap(const std::string& filename)
 {
   using namespace WorldMapNS;
 
-  std::auto_ptr<WorldMap> worldmap(new WorldMap());
-  worldmap->loadmap(filename);
-  main_loop->push_screen(worldmap.release());
+  main_loop->push_screen(new WorldMap(filename));
 }
 
 void load_level(const std::string& filename)
 {
-  main_loop->push_screen(new GameSession(filename, ST_GL_PLAY));
+  main_loop->push_screen(new GameSession(filename));
 }
 
 static SQInteger squirrel_read_char(SQUserPointer file)
@@ -108,7 +128,6 @@ static SQInteger squirrel_read_char(SQUserPointer file)
   return c;
 }
 
-
 void import(HSQUIRRELVM vm, const std::string& filename)
 {
   IFileStream in(filename);
@@ -118,33 +137,37 @@ void import(HSQUIRRELVM vm, const std::string& filename)
     throw SquirrelError(vm, "Couldn't parse script");
     
   sq_pushroottable(vm);
-  if(SQ_FAILED(sq_call(vm, 1, SQFalse))) {
+  if(SQ_FAILED(sq_call(vm, 1, SQFalse, SQTrue))) {
     sq_pop(vm, 1);
     throw SquirrelError(vm, "Couldn't execute script");
   }
   sq_pop(vm, 1);
 }
 
-void add_key(int new_key)
+void debug_collrects(bool enable)
 {
-  player_status->set_keys(new_key);
+  Sector::show_collrects = enable;
 }
 
-void debug_collrects(bool enable)
+void debug_show_fps(bool enable)
 {
-  Sector::show_collrects = enable;
+  config->show_fps = enable;
 }
 
-void draw_solids_only(bool enable)
+void debug_draw_solids_only(bool enable)
 {
   Sector::draw_solids_only = enable;
 }
 
 void save_state()
 {
+  using namespace WorldMapNS;
+  
   if(World::current() == NULL)
     throw std::runtime_error("Can't save state without active World");
 
+  if(WorldMap::current() != NULL)
+    WorldMap::current()->save_state();
   World::current()->save_state();
 }
 
@@ -166,6 +189,16 @@ bool validate_sector_player()
   return true;
 }
 
+void play_music(const std::string& filename)
+{
+  sound_manager->play_music(filename);
+}
+
+void play_sound(const std::string& filename)
+{
+  sound_manager->play(filename);
+}
+
 void grease()
 {
   if (!validate_sector_player()) return;
@@ -180,25 +213,19 @@ void invincible()
   tux->invincible_timer.start(10000);
 }
 
-void mortal()
-{
-  if (!validate_sector_player()) return;
-  ::Player* tux = Sector::current()->player;
-  tux->invincible_timer.stop();
-}
-
-void shrink()
+void ghost()
 {
   if (!validate_sector_player()) return;
   ::Player* tux = Sector::current()->player;
-  tux->kill(tux->SHRINK);
+  tux->set_ghost_mode(true);
 }
 
-void kill()
+void mortal()
 {
   if (!validate_sector_player()) return;
   ::Player* tux = Sector::current()->player;
-  tux->kill(tux->KILL);
+  tux->invincible_timer.stop();
+  tux->set_ghost_mode(false);
 }
 
 void restart()
@@ -239,5 +266,10 @@ void quit()
   main_loop->quit();
 }
 
+int rand()
+{
+  return systemRandom.rand();
+}
+
 }