X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fscripting%2Fwrapper.cpp;h=57d74ed9d9e25f026800a1fbd20a6fe3b28b7a0a;hb=f81231933de4e2f826bd12a1433e1cef9a7fd71b;hp=7bbb4ead0d900d68ca4ac03fe9efc78d5e03016d;hpb=c0c4838b917943354c150d56ab970ca249267037;p=supertux.git

diff --git a/src/scripting/wrapper.cpp b/src/scripting/wrapper.cpp
index 7bbb4ead0..57d74ed9d 100644
--- a/src/scripting/wrapper.cpp
+++ b/src/scripting/wrapper.cpp
@@ -754,69 +754,6 @@ static int ScriptedObject_get_name_wrapper(HSQUIRRELVM vm)
   
 }
 
-static int Sound_release_hook(SQUserPointer ptr, int )
-{
-  Scripting::Sound* _this = reinterpret_cast<Scripting::Sound*> (ptr);
-  delete _this;
-  return 0;
-}
-
-static int Sound_play_music_wrapper(HSQUIRRELVM vm)
-{
-  Scripting::Sound* _this;
-  if(SQ_FAILED(sq_getinstanceup(vm, 1, reinterpret_cast<SQUserPointer*> (&_this), 0))) {
-    sq_throwerror(vm, _SC("'play_music' called without instance"));
-    return SQ_ERROR;
-  }
-  const char* arg0;
-  if(SQ_FAILED(sq_getstring(vm, 2, &arg0))) {
-    sq_throwerror(vm, _SC("Argument 1 not a string"));
-    return SQ_ERROR;
-  }
-  
-  try {
-    _this->play_music(arg0);
-  
-    return 0;
-  
-  } catch(std::exception& e) {
-    sq_throwerror(vm, e.what());
-    return SQ_ERROR;
-  } catch(...) {
-    sq_throwerror(vm, _SC("Unexpected exception while executing function 'play_music'"));
-    return SQ_ERROR;
-  }
-  
-}
-
-static int Sound_play_wrapper(HSQUIRRELVM vm)
-{
-  Scripting::Sound* _this;
-  if(SQ_FAILED(sq_getinstanceup(vm, 1, reinterpret_cast<SQUserPointer*> (&_this), 0))) {
-    sq_throwerror(vm, _SC("'play' called without instance"));
-    return SQ_ERROR;
-  }
-  const char* arg0;
-  if(SQ_FAILED(sq_getstring(vm, 2, &arg0))) {
-    sq_throwerror(vm, _SC("Argument 1 not a string"));
-    return SQ_ERROR;
-  }
-  
-  try {
-    _this->play(arg0);
-  
-    return 0;
-  
-  } catch(std::exception& e) {
-    sq_throwerror(vm, e.what());
-    return SQ_ERROR;
-  } catch(...) {
-    sq_throwerror(vm, _SC("Unexpected exception while executing function 'play'"));
-    return SQ_ERROR;
-  }
-  
-}
-
 static int Text_release_hook(SQUserPointer ptr, int )
 {
   Scripting::Text* _this = reinterpret_cast<Scripting::Text*> (ptr);
@@ -999,11 +936,11 @@ static int Player_release_hook(SQUserPointer ptr, int )
   return 0;
 }
 
-static int Player_set_bonus_wrapper(HSQUIRRELVM vm)
+static int Player_add_bonus_wrapper(HSQUIRRELVM vm)
 {
   Scripting::Player* _this;
   if(SQ_FAILED(sq_getinstanceup(vm, 1, reinterpret_cast<SQUserPointer*> (&_this), 0))) {
-    sq_throwerror(vm, _SC("'set_bonus' called without instance"));
+    sq_throwerror(vm, _SC("'add_bonus' called without instance"));
     return SQ_ERROR;
   }
   const char* arg0;
@@ -1013,7 +950,7 @@ static int Player_set_bonus_wrapper(HSQUIRRELVM vm)
   }
   
   try {
-    _this->set_bonus(arg0);
+    _this->add_bonus(arg0);
   
     return 0;
   
@@ -1021,7 +958,7 @@ static int Player_set_bonus_wrapper(HSQUIRRELVM vm)
     sq_throwerror(vm, e.what());
     return SQ_ERROR;
   } catch(...) {
-    sq_throwerror(vm, _SC("Unexpected exception while executing function 'set_bonus'"));
+    sq_throwerror(vm, _SC("Unexpected exception while executing function 'add_bonus'"));
     return SQ_ERROR;
   }
   
@@ -1357,28 +1294,462 @@ static int FloatingImage_get_pos_y_wrapper(HSQUIRRELVM vm)
   }
   
   try {
-    float return_value = _this->get_pos_y();
+    float return_value = _this->get_pos_y();
+  
+    sq_pushfloat(vm, return_value);
+    return 1;
+  
+  } catch(std::exception& e) {
+    sq_throwerror(vm, e.what());
+    return SQ_ERROR;
+  } catch(...) {
+    sq_throwerror(vm, _SC("Unexpected exception while executing function 'get_pos_y'"));
+    return SQ_ERROR;
+  }
+  
+}
+
+static int FloatingImage_set_anchor_point_wrapper(HSQUIRRELVM vm)
+{
+  Scripting::FloatingImage* _this;
+  if(SQ_FAILED(sq_getinstanceup(vm, 1, reinterpret_cast<SQUserPointer*> (&_this), 0))) {
+    sq_throwerror(vm, _SC("'set_anchor_point' called without instance"));
+    return SQ_ERROR;
+  }
+  int arg0;
+  if(SQ_FAILED(sq_getinteger(vm, 2, &arg0))) {
+    sq_throwerror(vm, _SC("Argument 1 not an integer"));
+    return SQ_ERROR;
+  }
+  
+  try {
+    _this->set_anchor_point(arg0);
+  
+    return 0;
+  
+  } catch(std::exception& e) {
+    sq_throwerror(vm, e.what());
+    return SQ_ERROR;
+  } catch(...) {
+    sq_throwerror(vm, _SC("Unexpected exception while executing function 'set_anchor_point'"));
+    return SQ_ERROR;
+  }
+  
+}
+
+static int FloatingImage_get_anchor_point_wrapper(HSQUIRRELVM vm)
+{
+  Scripting::FloatingImage* _this;
+  if(SQ_FAILED(sq_getinstanceup(vm, 1, reinterpret_cast<SQUserPointer*> (&_this), 0))) {
+    sq_throwerror(vm, _SC("'get_anchor_point' called without instance"));
+    return SQ_ERROR;
+  }
+  
+  try {
+    int return_value = _this->get_anchor_point();
+  
+    sq_pushinteger(vm, return_value);
+    return 1;
+  
+  } catch(std::exception& e) {
+    sq_throwerror(vm, e.what());
+    return SQ_ERROR;
+  } catch(...) {
+    sq_throwerror(vm, _SC("Unexpected exception while executing function 'get_anchor_point'"));
+    return SQ_ERROR;
+  }
+  
+}
+
+static int FloatingImage_set_visible_wrapper(HSQUIRRELVM vm)
+{
+  Scripting::FloatingImage* _this;
+  if(SQ_FAILED(sq_getinstanceup(vm, 1, reinterpret_cast<SQUserPointer*> (&_this), 0))) {
+    sq_throwerror(vm, _SC("'set_visible' called without instance"));
+    return SQ_ERROR;
+  }
+  SQBool arg0;
+  if(SQ_FAILED(sq_getbool(vm, 2, &arg0))) {
+    sq_throwerror(vm, _SC("Argument 1 not a bool"));
+    return SQ_ERROR;
+  }
+  
+  try {
+    _this->set_visible(arg0);
+  
+    return 0;
+  
+  } catch(std::exception& e) {
+    sq_throwerror(vm, e.what());
+    return SQ_ERROR;
+  } catch(...) {
+    sq_throwerror(vm, _SC("Unexpected exception while executing function 'set_visible'"));
+    return SQ_ERROR;
+  }
+  
+}
+
+static int FloatingImage_get_visible_wrapper(HSQUIRRELVM vm)
+{
+  Scripting::FloatingImage* _this;
+  if(SQ_FAILED(sq_getinstanceup(vm, 1, reinterpret_cast<SQUserPointer*> (&_this), 0))) {
+    sq_throwerror(vm, _SC("'get_visible' called without instance"));
+    return SQ_ERROR;
+  }
+  
+  try {
+    bool return_value = _this->get_visible();
+  
+    sq_pushbool(vm, return_value);
+    return 1;
+  
+  } catch(std::exception& e) {
+    sq_throwerror(vm, e.what());
+    return SQ_ERROR;
+  } catch(...) {
+    sq_throwerror(vm, _SC("Unexpected exception while executing function 'get_visible'"));
+    return SQ_ERROR;
+  }
+  
+}
+
+static int FloatingImage_set_action_wrapper(HSQUIRRELVM vm)
+{
+  Scripting::FloatingImage* _this;
+  if(SQ_FAILED(sq_getinstanceup(vm, 1, reinterpret_cast<SQUserPointer*> (&_this), 0))) {
+    sq_throwerror(vm, _SC("'set_action' called without instance"));
+    return SQ_ERROR;
+  }
+  const char* arg0;
+  if(SQ_FAILED(sq_getstring(vm, 2, &arg0))) {
+    sq_throwerror(vm, _SC("Argument 1 not a string"));
+    return SQ_ERROR;
+  }
+  
+  try {
+    _this->set_action(arg0);
+  
+    return 0;
+  
+  } catch(std::exception& e) {
+    sq_throwerror(vm, e.what());
+    return SQ_ERROR;
+  } catch(...) {
+    sq_throwerror(vm, _SC("Unexpected exception while executing function 'set_action'"));
+    return SQ_ERROR;
+  }
+  
+}
+
+static int FloatingImage_get_action_wrapper(HSQUIRRELVM vm)
+{
+  Scripting::FloatingImage* _this;
+  if(SQ_FAILED(sq_getinstanceup(vm, 1, reinterpret_cast<SQUserPointer*> (&_this), 0))) {
+    sq_throwerror(vm, _SC("'get_action' called without instance"));
+    return SQ_ERROR;
+  }
+  
+  try {
+    std::string return_value = _this->get_action();
+  
+    sq_pushstring(vm, return_value.c_str(), return_value.size());
+    return 1;
+  
+  } catch(std::exception& e) {
+    sq_throwerror(vm, e.what());
+    return SQ_ERROR;
+  } catch(...) {
+    sq_throwerror(vm, _SC("Unexpected exception while executing function 'get_action'"));
+    return SQ_ERROR;
+  }
+  
+}
+
+static int display_wrapper(HSQUIRRELVM vm)
+{
+  return Scripting::display(vm);
+}
+
+static int print_stacktrace_wrapper(HSQUIRRELVM vm)
+{
+  HSQUIRRELVM arg0 = vm;
+  
+  try {
+    Scripting::print_stacktrace(arg0);
+  
+    return 0;
+  
+  } catch(std::exception& e) {
+    sq_throwerror(vm, e.what());
+    return SQ_ERROR;
+  } catch(...) {
+    sq_throwerror(vm, _SC("Unexpected exception while executing function 'print_stacktrace'"));
+    return SQ_ERROR;
+  }
+  
+}
+
+static int get_current_thread_wrapper(HSQUIRRELVM vm)
+{
+  return Scripting::get_current_thread(vm);
+}
+
+static int display_text_file_wrapper(HSQUIRRELVM vm)
+{
+  const char* arg0;
+  if(SQ_FAILED(sq_getstring(vm, 2, &arg0))) {
+    sq_throwerror(vm, _SC("Argument 1 not a string"));
+    return SQ_ERROR;
+  }
+  
+  try {
+    Scripting::display_text_file(arg0);
+  
+    return 0;
+  
+  } catch(std::exception& e) {
+    sq_throwerror(vm, e.what());
+    return SQ_ERROR;
+  } catch(...) {
+    sq_throwerror(vm, _SC("Unexpected exception while executing function 'display_text_file'"));
+    return SQ_ERROR;
+  }
+  
+}
+
+static int load_worldmap_wrapper(HSQUIRRELVM vm)
+{
+  const char* arg0;
+  if(SQ_FAILED(sq_getstring(vm, 2, &arg0))) {
+    sq_throwerror(vm, _SC("Argument 1 not a string"));
+    return SQ_ERROR;
+  }
+  
+  try {
+    Scripting::load_worldmap(arg0);
+  
+    return 0;
+  
+  } catch(std::exception& e) {
+    sq_throwerror(vm, e.what());
+    return SQ_ERROR;
+  } catch(...) {
+    sq_throwerror(vm, _SC("Unexpected exception while executing function 'load_worldmap'"));
+    return SQ_ERROR;
+  }
+  
+}
+
+static int load_level_wrapper(HSQUIRRELVM vm)
+{
+  const char* arg0;
+  if(SQ_FAILED(sq_getstring(vm, 2, &arg0))) {
+    sq_throwerror(vm, _SC("Argument 1 not a string"));
+    return SQ_ERROR;
+  }
+  
+  try {
+    Scripting::load_level(arg0);
+  
+    return 0;
+  
+  } catch(std::exception& e) {
+    sq_throwerror(vm, e.what());
+    return SQ_ERROR;
+  } catch(...) {
+    sq_throwerror(vm, _SC("Unexpected exception while executing function 'load_level'"));
+    return SQ_ERROR;
+  }
+  
+}
+
+static int wait_wrapper(HSQUIRRELVM vm)
+{
+  HSQUIRRELVM arg0 = vm;
+  float arg1;
+  if(SQ_FAILED(sq_getfloat(vm, 2, &arg1))) {
+    sq_throwerror(vm, _SC("Argument 1 not a float"));
+    return SQ_ERROR;
+  }
+  
+  try {
+    Scripting::wait(arg0, arg1);
+  
+    return sq_suspendvm(vm);
+  
+  } catch(std::exception& e) {
+    sq_throwerror(vm, e.what());
+    return SQ_ERROR;
+  } catch(...) {
+    sq_throwerror(vm, _SC("Unexpected exception while executing function 'wait'"));
+    return SQ_ERROR;
+  }
+  
+}
+
+static int wait_for_screenswitch_wrapper(HSQUIRRELVM vm)
+{
+  HSQUIRRELVM arg0 = vm;
+  
+  try {
+    Scripting::wait_for_screenswitch(arg0);
+  
+    return sq_suspendvm(vm);
+  
+  } catch(std::exception& e) {
+    sq_throwerror(vm, e.what());
+    return SQ_ERROR;
+  } catch(...) {
+    sq_throwerror(vm, _SC("Unexpected exception while executing function 'wait_for_screenswitch'"));
+    return SQ_ERROR;
+  }
+  
+}
+
+static int exit_screen_wrapper(HSQUIRRELVM vm)
+{
+  (void) vm;
+  
+  try {
+    Scripting::exit_screen();
+  
+    return 0;
+  
+  } catch(std::exception& e) {
+    sq_throwerror(vm, e.what());
+    return SQ_ERROR;
+  } catch(...) {
+    sq_throwerror(vm, _SC("Unexpected exception while executing function 'exit_screen'"));
+    return SQ_ERROR;
+  }
+  
+}
+
+static int fadeout_screen_wrapper(HSQUIRRELVM vm)
+{
+  float arg0;
+  if(SQ_FAILED(sq_getfloat(vm, 2, &arg0))) {
+    sq_throwerror(vm, _SC("Argument 1 not a float"));
+    return SQ_ERROR;
+  }
+  
+  try {
+    Scripting::fadeout_screen(arg0);
+  
+    return 0;
+  
+  } catch(std::exception& e) {
+    sq_throwerror(vm, e.what());
+    return SQ_ERROR;
+  } catch(...) {
+    sq_throwerror(vm, _SC("Unexpected exception while executing function 'fadeout_screen'"));
+    return SQ_ERROR;
+  }
+  
+}
+
+static int shrink_screen_wrapper(HSQUIRRELVM vm)
+{
+  float arg0;
+  if(SQ_FAILED(sq_getfloat(vm, 2, &arg0))) {
+    sq_throwerror(vm, _SC("Argument 1 not a float"));
+    return SQ_ERROR;
+  }
+  float arg1;
+  if(SQ_FAILED(sq_getfloat(vm, 3, &arg1))) {
+    sq_throwerror(vm, _SC("Argument 2 not a float"));
+    return SQ_ERROR;
+  }
+  float arg2;
+  if(SQ_FAILED(sq_getfloat(vm, 4, &arg2))) {
+    sq_throwerror(vm, _SC("Argument 3 not a float"));
+    return SQ_ERROR;
+  }
+  
+  try {
+    Scripting::shrink_screen(arg0, arg1, arg2);
+  
+    return 0;
+  
+  } catch(std::exception& e) {
+    sq_throwerror(vm, e.what());
+    return SQ_ERROR;
+  } catch(...) {
+    sq_throwerror(vm, _SC("Unexpected exception while executing function 'shrink_screen'"));
+    return SQ_ERROR;
+  }
+  
+}
+
+static int translate_wrapper(HSQUIRRELVM vm)
+{
+  const char* arg0;
+  if(SQ_FAILED(sq_getstring(vm, 2, &arg0))) {
+    sq_throwerror(vm, _SC("Argument 1 not a string"));
+    return SQ_ERROR;
+  }
+  
+  try {
+    std::string return_value = Scripting::translate(arg0);
+  
+    sq_pushstring(vm, return_value.c_str(), return_value.size());
+    return 1;
+  
+  } catch(std::exception& e) {
+    sq_throwerror(vm, e.what());
+    return SQ_ERROR;
+  } catch(...) {
+    sq_throwerror(vm, _SC("Unexpected exception while executing function 'translate'"));
+    return SQ_ERROR;
+  }
+  
+}
+
+static int import_wrapper(HSQUIRRELVM vm)
+{
+  HSQUIRRELVM arg0 = vm;
+  const char* arg1;
+  if(SQ_FAILED(sq_getstring(vm, 2, &arg1))) {
+    sq_throwerror(vm, _SC("Argument 1 not a string"));
+    return SQ_ERROR;
+  }
+  
+  try {
+    Scripting::import(arg0, arg1);
+  
+    return 0;
+  
+  } catch(std::exception& e) {
+    sq_throwerror(vm, e.what());
+    return SQ_ERROR;
+  } catch(...) {
+    sq_throwerror(vm, _SC("Unexpected exception while executing function 'import'"));
+    return SQ_ERROR;
+  }
+  
+}
+
+static int save_state_wrapper(HSQUIRRELVM vm)
+{
+  (void) vm;
+  
+  try {
+    Scripting::save_state();
   
-    sq_pushfloat(vm, return_value);
-    return 1;
+    return 0;
   
   } catch(std::exception& e) {
     sq_throwerror(vm, e.what());
     return SQ_ERROR;
   } catch(...) {
-    sq_throwerror(vm, _SC("Unexpected exception while executing function 'get_pos_y'"));
+    sq_throwerror(vm, _SC("Unexpected exception while executing function 'save_state'"));
     return SQ_ERROR;
   }
   
 }
 
-static int FloatingImage_set_anchor_point_wrapper(HSQUIRRELVM vm)
+static int add_key_wrapper(HSQUIRRELVM vm)
 {
-  Scripting::FloatingImage* _this;
-  if(SQ_FAILED(sq_getinstanceup(vm, 1, reinterpret_cast<SQUserPointer*> (&_this), 0))) {
-    sq_throwerror(vm, _SC("'set_anchor_point' called without instance"));
-    return SQ_ERROR;
-  }
   int arg0;
   if(SQ_FAILED(sq_getinteger(vm, 2, &arg0))) {
     sq_throwerror(vm, _SC("Argument 1 not an integer"));
@@ -1386,7 +1757,7 @@ static int FloatingImage_set_anchor_point_wrapper(HSQUIRRELVM vm)
   }
   
   try {
-    _this->set_anchor_point(arg0);
+    Scripting::add_key(arg0);
   
     return 0;
   
@@ -1394,43 +1765,37 @@ static int FloatingImage_set_anchor_point_wrapper(HSQUIRRELVM vm)
     sq_throwerror(vm, e.what());
     return SQ_ERROR;
   } catch(...) {
-    sq_throwerror(vm, _SC("Unexpected exception while executing function 'set_anchor_point'"));
+    sq_throwerror(vm, _SC("Unexpected exception while executing function 'add_key'"));
     return SQ_ERROR;
   }
   
 }
 
-static int FloatingImage_get_anchor_point_wrapper(HSQUIRRELVM vm)
+static int debug_collrects_wrapper(HSQUIRRELVM vm)
 {
-  Scripting::FloatingImage* _this;
-  if(SQ_FAILED(sq_getinstanceup(vm, 1, reinterpret_cast<SQUserPointer*> (&_this), 0))) {
-    sq_throwerror(vm, _SC("'get_anchor_point' called without instance"));
+  SQBool arg0;
+  if(SQ_FAILED(sq_getbool(vm, 2, &arg0))) {
+    sq_throwerror(vm, _SC("Argument 1 not a bool"));
     return SQ_ERROR;
   }
   
   try {
-    int return_value = _this->get_anchor_point();
+    Scripting::debug_collrects(arg0);
   
-    sq_pushinteger(vm, return_value);
-    return 1;
+    return 0;
   
   } catch(std::exception& e) {
     sq_throwerror(vm, e.what());
     return SQ_ERROR;
   } catch(...) {
-    sq_throwerror(vm, _SC("Unexpected exception while executing function 'get_anchor_point'"));
+    sq_throwerror(vm, _SC("Unexpected exception while executing function 'debug_collrects'"));
     return SQ_ERROR;
   }
   
 }
 
-static int FloatingImage_set_visible_wrapper(HSQUIRRELVM vm)
+static int debug_draw_fps_wrapper(HSQUIRRELVM vm)
 {
-  Scripting::FloatingImage* _this;
-  if(SQ_FAILED(sq_getinstanceup(vm, 1, reinterpret_cast<SQUserPointer*> (&_this), 0))) {
-    sq_throwerror(vm, _SC("'set_visible' called without instance"));
-    return SQ_ERROR;
-  }
   SQBool arg0;
   if(SQ_FAILED(sq_getbool(vm, 2, &arg0))) {
     sq_throwerror(vm, _SC("Argument 1 not a bool"));
@@ -1438,7 +1803,7 @@ static int FloatingImage_set_visible_wrapper(HSQUIRRELVM vm)
   }
   
   try {
-    _this->set_visible(arg0);
+    Scripting::debug_draw_fps(arg0);
   
     return 0;
   
@@ -1446,42 +1811,36 @@ static int FloatingImage_set_visible_wrapper(HSQUIRRELVM vm)
     sq_throwerror(vm, e.what());
     return SQ_ERROR;
   } catch(...) {
-    sq_throwerror(vm, _SC("Unexpected exception while executing function 'set_visible'"));
+    sq_throwerror(vm, _SC("Unexpected exception while executing function 'debug_draw_fps'"));
     return SQ_ERROR;
   }
   
 }
 
-static int FloatingImage_get_visible_wrapper(HSQUIRRELVM vm)
+static int debug_draw_solids_only_wrapper(HSQUIRRELVM vm)
 {
-  Scripting::FloatingImage* _this;
-  if(SQ_FAILED(sq_getinstanceup(vm, 1, reinterpret_cast<SQUserPointer*> (&_this), 0))) {
-    sq_throwerror(vm, _SC("'get_visible' called without instance"));
+  SQBool arg0;
+  if(SQ_FAILED(sq_getbool(vm, 2, &arg0))) {
+    sq_throwerror(vm, _SC("Argument 1 not a bool"));
     return SQ_ERROR;
   }
   
   try {
-    bool return_value = _this->get_visible();
+    Scripting::debug_draw_solids_only(arg0);
   
-    sq_pushbool(vm, return_value);
-    return 1;
+    return 0;
   
   } catch(std::exception& e) {
     sq_throwerror(vm, e.what());
     return SQ_ERROR;
   } catch(...) {
-    sq_throwerror(vm, _SC("Unexpected exception while executing function 'get_visible'"));
+    sq_throwerror(vm, _SC("Unexpected exception while executing function 'debug_draw_solids_only'"));
     return SQ_ERROR;
   }
   
 }
 
-static int display_wrapper(HSQUIRRELVM vm)
-{
-  return Scripting::display(vm);
-}
-
-static int display_text_file_wrapper(HSQUIRRELVM vm)
+static int play_music_wrapper(HSQUIRRELVM vm)
 {
   const char* arg0;
   if(SQ_FAILED(sq_getstring(vm, 2, &arg0))) {
@@ -1490,7 +1849,7 @@ static int display_text_file_wrapper(HSQUIRRELVM vm)
   }
   
   try {
-    Scripting::display_text_file(arg0);
+    Scripting::play_music(arg0);
   
     return 0;
   
@@ -1498,13 +1857,13 @@ static int display_text_file_wrapper(HSQUIRRELVM vm)
     sq_throwerror(vm, e.what());
     return SQ_ERROR;
   } catch(...) {
-    sq_throwerror(vm, _SC("Unexpected exception while executing function 'display_text_file'"));
+    sq_throwerror(vm, _SC("Unexpected exception while executing function 'play_music'"));
     return SQ_ERROR;
   }
   
 }
 
-static int load_worldmap_wrapper(HSQUIRRELVM vm)
+static int play_sound_wrapper(HSQUIRRELVM vm)
 {
   const char* arg0;
   if(SQ_FAILED(sq_getstring(vm, 2, &arg0))) {
@@ -1513,7 +1872,7 @@ static int load_worldmap_wrapper(HSQUIRRELVM vm)
   }
   
   try {
-    Scripting::load_worldmap(arg0);
+    Scripting::play_sound(arg0);
   
     return 0;
   
@@ -1521,22 +1880,18 @@ static int load_worldmap_wrapper(HSQUIRRELVM vm)
     sq_throwerror(vm, e.what());
     return SQ_ERROR;
   } catch(...) {
-    sq_throwerror(vm, _SC("Unexpected exception while executing function 'load_worldmap'"));
+    sq_throwerror(vm, _SC("Unexpected exception while executing function 'play_sound'"));
     return SQ_ERROR;
   }
   
 }
 
-static int load_level_wrapper(HSQUIRRELVM vm)
+static int grease_wrapper(HSQUIRRELVM vm)
 {
-  const char* arg0;
-  if(SQ_FAILED(sq_getstring(vm, 2, &arg0))) {
-    sq_throwerror(vm, _SC("Argument 1 not a string"));
-    return SQ_ERROR;
-  }
+  (void) vm;
   
   try {
-    Scripting::load_level(arg0);
+    Scripting::grease();
   
     return 0;
   
@@ -1544,61 +1899,56 @@ static int load_level_wrapper(HSQUIRRELVM vm)
     sq_throwerror(vm, e.what());
     return SQ_ERROR;
   } catch(...) {
-    sq_throwerror(vm, _SC("Unexpected exception while executing function 'load_level'"));
+    sq_throwerror(vm, _SC("Unexpected exception while executing function 'grease'"));
     return SQ_ERROR;
   }
   
 }
 
-static int wait_wrapper(HSQUIRRELVM vm)
+static int invincible_wrapper(HSQUIRRELVM vm)
 {
-  HSQUIRRELVM arg0 = vm;
-  float arg1;
-  if(SQ_FAILED(sq_getfloat(vm, 2, &arg1))) {
-    sq_throwerror(vm, _SC("Argument 1 not a float"));
-    return SQ_ERROR;
-  }
+  (void) vm;
   
   try {
-    Scripting::wait(arg0, arg1);
+    Scripting::invincible();
   
-    return sq_suspendvm(vm);
+    return 0;
   
   } catch(std::exception& e) {
     sq_throwerror(vm, e.what());
     return SQ_ERROR;
   } catch(...) {
-    sq_throwerror(vm, _SC("Unexpected exception while executing function 'wait'"));
+    sq_throwerror(vm, _SC("Unexpected exception while executing function 'invincible'"));
     return SQ_ERROR;
   }
   
 }
 
-static int wait_for_screenswitch_wrapper(HSQUIRRELVM vm)
+static int mortal_wrapper(HSQUIRRELVM vm)
 {
-  HSQUIRRELVM arg0 = vm;
+  (void) vm;
   
   try {
-    Scripting::wait_for_screenswitch(arg0);
+    Scripting::mortal();
   
-    return sq_suspendvm(vm);
+    return 0;
   
   } catch(std::exception& e) {
     sq_throwerror(vm, e.what());
     return SQ_ERROR;
   } catch(...) {
-    sq_throwerror(vm, _SC("Unexpected exception while executing function 'wait_for_screenswitch'"));
+    sq_throwerror(vm, _SC("Unexpected exception while executing function 'mortal'"));
     return SQ_ERROR;
   }
   
 }
 
-static int exit_screen_wrapper(HSQUIRRELVM vm)
+static int shrink_wrapper(HSQUIRRELVM vm)
 {
   (void) vm;
   
   try {
-    Scripting::exit_screen();
+    Scripting::shrink();
   
     return 0;
   
@@ -1606,47 +1956,37 @@ static int exit_screen_wrapper(HSQUIRRELVM vm)
     sq_throwerror(vm, e.what());
     return SQ_ERROR;
   } catch(...) {
-    sq_throwerror(vm, _SC("Unexpected exception while executing function 'exit_screen'"));
+    sq_throwerror(vm, _SC("Unexpected exception while executing function 'shrink'"));
     return SQ_ERROR;
   }
   
 }
 
-static int translate_wrapper(HSQUIRRELVM vm)
+static int kill_wrapper(HSQUIRRELVM vm)
 {
-  const char* arg0;
-  if(SQ_FAILED(sq_getstring(vm, 2, &arg0))) {
-    sq_throwerror(vm, _SC("Argument 1 not a string"));
-    return SQ_ERROR;
-  }
+  (void) vm;
   
   try {
-    std::string return_value = Scripting::translate(arg0);
+    Scripting::kill();
   
-    sq_pushstring(vm, return_value.c_str(), return_value.size());
-    return 1;
+    return 0;
   
   } catch(std::exception& e) {
     sq_throwerror(vm, e.what());
     return SQ_ERROR;
   } catch(...) {
-    sq_throwerror(vm, _SC("Unexpected exception while executing function 'translate'"));
+    sq_throwerror(vm, _SC("Unexpected exception while executing function 'kill'"));
     return SQ_ERROR;
   }
   
 }
 
-static int import_wrapper(HSQUIRRELVM vm)
+static int restart_wrapper(HSQUIRRELVM vm)
 {
-  HSQUIRRELVM arg0 = vm;
-  const char* arg1;
-  if(SQ_FAILED(sq_getstring(vm, 2, &arg1))) {
-    sq_throwerror(vm, _SC("Argument 1 not a string"));
-    return SQ_ERROR;
-  }
+  (void) vm;
   
   try {
-    Scripting::import(arg0, arg1);
+    Scripting::restart();
   
     return 0;
   
@@ -1654,18 +1994,18 @@ static int import_wrapper(HSQUIRRELVM vm)
     sq_throwerror(vm, e.what());
     return SQ_ERROR;
   } catch(...) {
-    sq_throwerror(vm, _SC("Unexpected exception while executing function 'import'"));
+    sq_throwerror(vm, _SC("Unexpected exception while executing function 'restart'"));
     return SQ_ERROR;
   }
   
 }
 
-static int save_state_wrapper(HSQUIRRELVM vm)
+static int whereami_wrapper(HSQUIRRELVM vm)
 {
   (void) vm;
   
   try {
-    Scripting::save_state();
+    Scripting::whereami();
   
     return 0;
   
@@ -1673,22 +2013,18 @@ static int save_state_wrapper(HSQUIRRELVM vm)
     sq_throwerror(vm, e.what());
     return SQ_ERROR;
   } catch(...) {
-    sq_throwerror(vm, _SC("Unexpected exception while executing function 'save_state'"));
+    sq_throwerror(vm, _SC("Unexpected exception while executing function 'whereami'"));
     return SQ_ERROR;
   }
   
 }
 
-static int add_key_wrapper(HSQUIRRELVM vm)
+static int gotoend_wrapper(HSQUIRRELVM vm)
 {
-  int arg0;
-  if(SQ_FAILED(sq_getinteger(vm, 2, &arg0))) {
-    sq_throwerror(vm, _SC("Argument 1 not an integer"));
-    return SQ_ERROR;
-  }
+  (void) vm;
   
   try {
-    Scripting::add_key(arg0);
+    Scripting::gotoend();
   
     return 0;
   
@@ -1696,22 +2032,37 @@ static int add_key_wrapper(HSQUIRRELVM vm)
     sq_throwerror(vm, e.what());
     return SQ_ERROR;
   } catch(...) {
-    sq_throwerror(vm, _SC("Unexpected exception while executing function 'add_key'"));
+    sq_throwerror(vm, _SC("Unexpected exception while executing function 'gotoend'"));
     return SQ_ERROR;
   }
   
 }
 
-static int debug_collrects_wrapper(HSQUIRRELVM vm)
+static int camera_wrapper(HSQUIRRELVM vm)
 {
-  SQBool arg0;
-  if(SQ_FAILED(sq_getbool(vm, 2, &arg0))) {
-    sq_throwerror(vm, _SC("Argument 1 not a bool"));
+  (void) vm;
+  
+  try {
+    Scripting::camera();
+  
+    return 0;
+  
+  } catch(std::exception& e) {
+    sq_throwerror(vm, e.what());
+    return SQ_ERROR;
+  } catch(...) {
+    sq_throwerror(vm, _SC("Unexpected exception while executing function 'camera'"));
     return SQ_ERROR;
   }
   
+}
+
+static int quit_wrapper(HSQUIRRELVM vm)
+{
+  (void) vm;
+  
   try {
-    Scripting::debug_collrects(arg0);
+    Scripting::quit();
   
     return 0;
   
@@ -1719,7 +2070,7 @@ static int debug_collrects_wrapper(HSQUIRRELVM vm)
     sq_throwerror(vm, e.what());
     return SQ_ERROR;
   } catch(...) {
-    sq_throwerror(vm, _SC("Unexpected exception while executing function 'debug_collrects'"));
+    sq_throwerror(vm, _SC("Unexpected exception while executing function 'quit'"));
     return SQ_ERROR;
   }
   
@@ -1831,32 +2182,6 @@ void create_squirrel_instance(HSQUIRRELVM v, Scripting::ScriptedObject* object,
   sq_remove(v, -2); // remove root table
 }
 
-void create_squirrel_instance(HSQUIRRELVM v, Scripting::Sound* object, bool setup_releasehook)
-{
-  using namespace Wrapper;
-
-  sq_pushroottable(v);
-  sq_pushstring(v, "Sound", -1);
-  if(SQ_FAILED(sq_get(v, -2))) {
-    std::ostringstream msg;
-    msg << "Couldn't resolved squirrel type 'Sound'";
-    throw SquirrelError(v, msg.str());
-  }
-
-  if(SQ_FAILED(sq_createinstance(v, -1)) || SQ_FAILED(sq_setinstanceup(v, -1, object))) {
-    std::ostringstream msg;
-    msg << "Couldn't setup squirrel instance for object of type 'Sound'";
-    throw SquirrelError(v, msg.str());
-  }
-  sq_remove(v, -2); // remove object name
-
-  if(setup_releasehook) {
-    sq_setreleasehook(v, -1, Sound_release_hook);
-  }
-
-  sq_remove(v, -2); // remove root table
-}
-
 void create_squirrel_instance(HSQUIRRELVM v, Scripting::Text* object, bool setup_releasehook)
 {
   using namespace Wrapper;
@@ -2029,6 +2354,18 @@ void register_supertux_wrapper(HSQUIRRELVM v)
     throw SquirrelError(v, "Couldn't register function 'display'");
   }
 
+  sq_pushstring(v, "print_stacktrace", -1);
+  sq_newclosure(v, &print_stacktrace_wrapper, 0);
+  if(SQ_FAILED(sq_createslot(v, -3))) {
+    throw SquirrelError(v, "Couldn't register function 'print_stacktrace'");
+  }
+
+  sq_pushstring(v, "get_current_thread", -1);
+  sq_newclosure(v, &get_current_thread_wrapper, 0);
+  if(SQ_FAILED(sq_createslot(v, -3))) {
+    throw SquirrelError(v, "Couldn't register function 'get_current_thread'");
+  }
+
   sq_pushstring(v, "display_text_file", -1);
   sq_newclosure(v, &display_text_file_wrapper, 0);
   if(SQ_FAILED(sq_createslot(v, -3))) {
@@ -2065,6 +2402,18 @@ void register_supertux_wrapper(HSQUIRRELVM v)
     throw SquirrelError(v, "Couldn't register function 'exit_screen'");
   }
 
+  sq_pushstring(v, "fadeout_screen", -1);
+  sq_newclosure(v, &fadeout_screen_wrapper, 0);
+  if(SQ_FAILED(sq_createslot(v, -3))) {
+    throw SquirrelError(v, "Couldn't register function 'fadeout_screen'");
+  }
+
+  sq_pushstring(v, "shrink_screen", -1);
+  sq_newclosure(v, &shrink_screen_wrapper, 0);
+  if(SQ_FAILED(sq_createslot(v, -3))) {
+    throw SquirrelError(v, "Couldn't register function 'shrink_screen'");
+  }
+
   sq_pushstring(v, "translate", -1);
   sq_newclosure(v, &translate_wrapper, 0);
   if(SQ_FAILED(sq_createslot(v, -3))) {
@@ -2095,6 +2444,90 @@ void register_supertux_wrapper(HSQUIRRELVM v)
     throw SquirrelError(v, "Couldn't register function 'debug_collrects'");
   }
 
+  sq_pushstring(v, "debug_draw_fps", -1);
+  sq_newclosure(v, &debug_draw_fps_wrapper, 0);
+  if(SQ_FAILED(sq_createslot(v, -3))) {
+    throw SquirrelError(v, "Couldn't register function 'debug_draw_fps'");
+  }
+
+  sq_pushstring(v, "debug_draw_solids_only", -1);
+  sq_newclosure(v, &debug_draw_solids_only_wrapper, 0);
+  if(SQ_FAILED(sq_createslot(v, -3))) {
+    throw SquirrelError(v, "Couldn't register function 'debug_draw_solids_only'");
+  }
+
+  sq_pushstring(v, "play_music", -1);
+  sq_newclosure(v, &play_music_wrapper, 0);
+  if(SQ_FAILED(sq_createslot(v, -3))) {
+    throw SquirrelError(v, "Couldn't register function 'play_music'");
+  }
+
+  sq_pushstring(v, "play_sound", -1);
+  sq_newclosure(v, &play_sound_wrapper, 0);
+  if(SQ_FAILED(sq_createslot(v, -3))) {
+    throw SquirrelError(v, "Couldn't register function 'play_sound'");
+  }
+
+  sq_pushstring(v, "grease", -1);
+  sq_newclosure(v, &grease_wrapper, 0);
+  if(SQ_FAILED(sq_createslot(v, -3))) {
+    throw SquirrelError(v, "Couldn't register function 'grease'");
+  }
+
+  sq_pushstring(v, "invincible", -1);
+  sq_newclosure(v, &invincible_wrapper, 0);
+  if(SQ_FAILED(sq_createslot(v, -3))) {
+    throw SquirrelError(v, "Couldn't register function 'invincible'");
+  }
+
+  sq_pushstring(v, "mortal", -1);
+  sq_newclosure(v, &mortal_wrapper, 0);
+  if(SQ_FAILED(sq_createslot(v, -3))) {
+    throw SquirrelError(v, "Couldn't register function 'mortal'");
+  }
+
+  sq_pushstring(v, "shrink", -1);
+  sq_newclosure(v, &shrink_wrapper, 0);
+  if(SQ_FAILED(sq_createslot(v, -3))) {
+    throw SquirrelError(v, "Couldn't register function 'shrink'");
+  }
+
+  sq_pushstring(v, "kill", -1);
+  sq_newclosure(v, &kill_wrapper, 0);
+  if(SQ_FAILED(sq_createslot(v, -3))) {
+    throw SquirrelError(v, "Couldn't register function 'kill'");
+  }
+
+  sq_pushstring(v, "restart", -1);
+  sq_newclosure(v, &restart_wrapper, 0);
+  if(SQ_FAILED(sq_createslot(v, -3))) {
+    throw SquirrelError(v, "Couldn't register function 'restart'");
+  }
+
+  sq_pushstring(v, "whereami", -1);
+  sq_newclosure(v, &whereami_wrapper, 0);
+  if(SQ_FAILED(sq_createslot(v, -3))) {
+    throw SquirrelError(v, "Couldn't register function 'whereami'");
+  }
+
+  sq_pushstring(v, "gotoend", -1);
+  sq_newclosure(v, &gotoend_wrapper, 0);
+  if(SQ_FAILED(sq_createslot(v, -3))) {
+    throw SquirrelError(v, "Couldn't register function 'gotoend'");
+  }
+
+  sq_pushstring(v, "camera", -1);
+  sq_newclosure(v, &camera_wrapper, 0);
+  if(SQ_FAILED(sq_createslot(v, -3))) {
+    throw SquirrelError(v, "Couldn't register function 'camera'");
+  }
+
+  sq_pushstring(v, "quit", -1);
+  sq_newclosure(v, &quit_wrapper, 0);
+  if(SQ_FAILED(sq_createslot(v, -3))) {
+    throw SquirrelError(v, "Couldn't register function 'quit'");
+  }
+
   // Register class DisplayEffect
   sq_pushstring(v, "DisplayEffect", -1);
   if(sq_newclass(v, SQFalse) < 0) {
@@ -2289,29 +2722,6 @@ void register_supertux_wrapper(HSQUIRRELVM v)
     throw SquirrelError(v, "Couldn't register class 'ScriptedObject'");
   }
 
-  // Register class Sound
-  sq_pushstring(v, "Sound", -1);
-  if(sq_newclass(v, SQFalse) < 0) {
-    std::ostringstream msg;
-    msg << "Couldn't create new class 'Sound'";
-    throw SquirrelError(v, msg.str());
-  }
-  sq_pushstring(v, "play_music", -1);
-  sq_newclosure(v, &Sound_play_music_wrapper, 0);
-  if(SQ_FAILED(sq_createslot(v, -3))) {
-    throw SquirrelError(v, "Couldn't register function 'play_music'");
-  }
-
-  sq_pushstring(v, "play", -1);
-  sq_newclosure(v, &Sound_play_wrapper, 0);
-  if(SQ_FAILED(sq_createslot(v, -3))) {
-    throw SquirrelError(v, "Couldn't register function 'play'");
-  }
-
-  if(SQ_FAILED(sq_createslot(v, -3))) {
-    throw SquirrelError(v, "Couldn't register class 'Sound'");
-  }
-
   // Register class Text
   sq_pushstring(v, "Text", -1);
   if(sq_newclass(v, SQFalse) < 0) {
@@ -2366,10 +2776,10 @@ void register_supertux_wrapper(HSQUIRRELVM v)
     msg << "Couldn't create new class 'Player'";
     throw SquirrelError(v, msg.str());
   }
-  sq_pushstring(v, "set_bonus", -1);
-  sq_newclosure(v, &Player_set_bonus_wrapper, 0);
+  sq_pushstring(v, "add_bonus", -1);
+  sq_newclosure(v, &Player_add_bonus_wrapper, 0);
   if(SQ_FAILED(sq_createslot(v, -3))) {
-    throw SquirrelError(v, "Couldn't register function 'set_bonus'");
+    throw SquirrelError(v, "Couldn't register function 'add_bonus'");
   }
 
   sq_pushstring(v, "add_coins", -1);
@@ -2485,6 +2895,18 @@ void register_supertux_wrapper(HSQUIRRELVM v)
     throw SquirrelError(v, "Couldn't register function 'get_visible'");
   }
 
+  sq_pushstring(v, "set_action", -1);
+  sq_newclosure(v, &FloatingImage_set_action_wrapper, 0);
+  if(SQ_FAILED(sq_createslot(v, -3))) {
+    throw SquirrelError(v, "Couldn't register function 'set_action'");
+  }
+
+  sq_pushstring(v, "get_action", -1);
+  sq_newclosure(v, &FloatingImage_get_action_wrapper, 0);
+  if(SQ_FAILED(sq_createslot(v, -3))) {
+    throw SquirrelError(v, "Couldn't register function 'get_action'");
+  }
+
   if(SQ_FAILED(sq_createslot(v, -3))) {
     throw SquirrelError(v, "Couldn't register class 'FloatingImage'");
   }