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

diff --git a/src/scripting/functions.cpp b/src/scripting/functions.cpp
index fc946db97..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"
@@ -45,14 +44,17 @@
 #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;
@@ -63,29 +65,20 @@ void print_stacktrace(HSQUIRRELVM vm)
   print_squirrel_stack(vm);
 }
 
-int get_current_thread(HSQUIRRELVM vm)
+SQInteger get_current_thread(HSQUIRRELVM vm)
 {
-  SQObject object;
-  sq_resetobject(&object);
-  object._unVal.pThread = vm;
-  object._type = OT_THREAD;
-  sq_pushobject(vm, object);
-
+  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()
@@ -144,24 +137,19 @@ 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)
-{
-  player_status->set_keys(new_key);
-}
-
 void debug_collrects(bool enable)
 {
   Sector::show_collrects = enable;
 }
 
-void debug_draw_fps(bool enable)
+void debug_show_fps(bool enable)
 {
   config->show_fps = enable;
 }
@@ -201,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;
@@ -215,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()
@@ -274,5 +266,10 @@ void quit()
   main_loop->quit();
 }
 
+int rand()
+{
+  return systemRandom.rand();
+}
+
 }