X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fscripting%2Fwrapper.cpp;h=56d56b2c9bc1fed66d48864847e436527a5d50f7;hb=071c31e7fcf8bfbd00ec8d7d19313d7f6e433885;hp=0a7813d2cb9ba5fa380a53e9380cb45d88eac697;hpb=ce0795230a1fbf9d4867f966aa6909d19975bfcf;p=supertux.git

diff --git a/src/scripting/wrapper.cpp b/src/scripting/wrapper.cpp
index 0a7813d2c..56d56b2c9 100644
--- a/src/scripting/wrapper.cpp
+++ b/src/scripting/wrapper.cpp
@@ -72,6 +72,26 @@ static int DisplayEffect_is_black_wrapper(HSQUIRRELVM v)
   return 1;
 }
 
+static int DisplayEffect_sixteen_to_nine_wrapper(HSQUIRRELVM v)
+{
+  Scripting::DisplayEffect* _this;
+  sq_getinstanceup(v, 1, (SQUserPointer*) &_this, 0);
+  
+  _this->sixteen_to_nine();
+  
+  return 0;
+}
+
+static int DisplayEffect_four_to_three_wrapper(HSQUIRRELVM v)
+{
+  Scripting::DisplayEffect* _this;
+  sq_getinstanceup(v, 1, (SQUserPointer*) &_this, 0);
+  
+  _this->four_to_three();
+  
+  return 0;
+}
+
 static int Camera_release_hook(SQUserPointer ptr, int )
 {
   Scripting::Camera* _this = reinterpret_cast<Scripting::Camera*> (ptr);
@@ -417,46 +437,44 @@ static int Player_release_hook(SQUserPointer ptr, int )
   return 0;
 }
 
-static int Player_set_bonus_wrapper(HSQUIRRELVM v)
+static int Player_make_invincible_wrapper(HSQUIRRELVM v)
 {
   Scripting::Player* _this;
   sq_getinstanceup(v, 1, (SQUserPointer*) &_this, 0);
-  const char* arg0;
-  sq_getstring(v, 2, &arg0);
   
-  _this->set_bonus(arg0);
+  _this->make_invincible();
   
   return 0;
 }
 
-static int Player_make_invincible_wrapper(HSQUIRRELVM v)
+static int Player_deactivate_wrapper(HSQUIRRELVM v)
 {
   Scripting::Player* _this;
   sq_getinstanceup(v, 1, (SQUserPointer*) &_this, 0);
   
-  _this->make_invincible();
+  _this->deactivate();
   
   return 0;
 }
 
-static int Player_add_life_wrapper(HSQUIRRELVM v)
+static int Player_activate_wrapper(HSQUIRRELVM v)
 {
   Scripting::Player* _this;
   sq_getinstanceup(v, 1, (SQUserPointer*) &_this, 0);
   
-  _this->add_life();
+  _this->activate();
   
   return 0;
 }
 
-static int Player_add_coins_wrapper(HSQUIRRELVM v)
+static int Player_walk_wrapper(HSQUIRRELVM v)
 {
   Scripting::Player* _this;
   sq_getinstanceup(v, 1, (SQUserPointer*) &_this, 0);
-  int arg0;
-  sq_getinteger(v, 2, &arg0);
+  float arg0;
+  sq_getfloat(v, 2, &arg0);
   
-  _this->add_coins(arg0);
+  _this->walk(arg0);
   
   return 0;
 }
@@ -503,6 +521,16 @@ static int import_wrapper(HSQUIRRELVM v)
   return 0;
 }
 
+static int add_key_wrapper(HSQUIRRELVM v)
+{
+  int arg0;
+  sq_getinteger(v, 2, &arg0);
+  
+  Scripting::add_key(arg0);
+  
+  return 0;
+}
+
 } // end of namespace Wrapper
 
 void create_squirrel_instance(HSQUIRRELVM v, Scripting::DisplayEffect* object, bool setup_releasehook)
@@ -692,6 +720,46 @@ void register_supertux_wrapper(HSQUIRRELVM v)
   using namespace Wrapper;
 
   sq_pushroottable(v);
+  sq_pushstring(v, "KEY_BRASS", -1);
+  sq_pushinteger(v, 1);
+  if(SQ_FAILED(sq_createslot(v, -3))) {
+    std::ostringstream msg;
+    msg << "Couldn't register constant'KEY_BRASS'";
+    throw SquirrelError(v, msg.str());
+  }
+
+  sq_pushstring(v, "KEY_IRON", -1);
+  sq_pushinteger(v, 2);
+  if(SQ_FAILED(sq_createslot(v, -3))) {
+    std::ostringstream msg;
+    msg << "Couldn't register constant'KEY_IRON'";
+    throw SquirrelError(v, msg.str());
+  }
+
+  sq_pushstring(v, "KEY_BRONZE", -1);
+  sq_pushinteger(v, 4);
+  if(SQ_FAILED(sq_createslot(v, -3))) {
+    std::ostringstream msg;
+    msg << "Couldn't register constant'KEY_BRONZE'";
+    throw SquirrelError(v, msg.str());
+  }
+
+  sq_pushstring(v, "KEY_SILVER", -1);
+  sq_pushinteger(v, 8);
+  if(SQ_FAILED(sq_createslot(v, -3))) {
+    std::ostringstream msg;
+    msg << "Couldn't register constant'KEY_SILVER'";
+    throw SquirrelError(v, msg.str());
+  }
+
+  sq_pushstring(v, "KEY_GOLD", -1);
+  sq_pushinteger(v, 16);
+  if(SQ_FAILED(sq_createslot(v, -3))) {
+    std::ostringstream msg;
+    msg << "Couldn't register constant'KEY_GOLD'";
+    throw SquirrelError(v, msg.str());
+  }
+
   sq_pushstring(v, "display_text_file", -1);
   sq_newclosure(v, &display_text_file_wrapper, 0);
   if(SQ_FAILED(sq_createslot(v, -3))) {
@@ -724,6 +792,14 @@ void register_supertux_wrapper(HSQUIRRELVM v)
     throw SquirrelError(v, msg.str());
   }
 
+  sq_pushstring(v, "add_key", -1);
+  sq_newclosure(v, &add_key_wrapper, 0);
+  if(SQ_FAILED(sq_createslot(v, -3))) {
+    std::ostringstream msg;
+    msg << "Couldn't register function'add_key'";
+    throw SquirrelError(v, msg.str());
+  }
+
   // Register class DisplayEffect
   sq_pushstring(v, "DisplayEffect", -1);
   if(sq_newclass(v, SQFalse) < 0) {
@@ -763,6 +839,22 @@ void register_supertux_wrapper(HSQUIRRELVM v)
     throw SquirrelError(v, msg.str());
   }
 
+  sq_pushstring(v, "sixteen_to_nine", -1);
+  sq_newclosure(v, &DisplayEffect_sixteen_to_nine_wrapper, 0);
+  if(SQ_FAILED(sq_createslot(v, -3))) {
+    std::ostringstream msg;
+    msg << "Couldn't register function'sixteen_to_nine'";
+    throw SquirrelError(v, msg.str());
+  }
+
+  sq_pushstring(v, "four_to_three", -1);
+  sq_newclosure(v, &DisplayEffect_four_to_three_wrapper, 0);
+  if(SQ_FAILED(sq_createslot(v, -3))) {
+    std::ostringstream msg;
+    msg << "Couldn't register function'four_to_three'";
+    throw SquirrelError(v, msg.str());
+  }
+
   if(SQ_FAILED(sq_createslot(v, -3))) {
     std::ostringstream msg;
     msg << "Couldn't register class'DisplayEffect'";
@@ -1041,35 +1133,35 @@ 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, "make_invincible", -1);
+  sq_newclosure(v, &Player_make_invincible_wrapper, 0);
   if(SQ_FAILED(sq_createslot(v, -3))) {
     std::ostringstream msg;
-    msg << "Couldn't register function'set_bonus'";
+    msg << "Couldn't register function'make_invincible'";
     throw SquirrelError(v, msg.str());
   }
 
-  sq_pushstring(v, "make_invincible", -1);
-  sq_newclosure(v, &Player_make_invincible_wrapper, 0);
+  sq_pushstring(v, "deactivate", -1);
+  sq_newclosure(v, &Player_deactivate_wrapper, 0);
   if(SQ_FAILED(sq_createslot(v, -3))) {
     std::ostringstream msg;
-    msg << "Couldn't register function'make_invincible'";
+    msg << "Couldn't register function'deactivate'";
     throw SquirrelError(v, msg.str());
   }
 
-  sq_pushstring(v, "add_life", -1);
-  sq_newclosure(v, &Player_add_life_wrapper, 0);
+  sq_pushstring(v, "activate", -1);
+  sq_newclosure(v, &Player_activate_wrapper, 0);
   if(SQ_FAILED(sq_createslot(v, -3))) {
     std::ostringstream msg;
-    msg << "Couldn't register function'add_life'";
+    msg << "Couldn't register function'activate'";
     throw SquirrelError(v, msg.str());
   }
 
-  sq_pushstring(v, "add_coins", -1);
-  sq_newclosure(v, &Player_add_coins_wrapper, 0);
+  sq_pushstring(v, "walk", -1);
+  sq_newclosure(v, &Player_walk_wrapper, 0);
   if(SQ_FAILED(sq_createslot(v, -3))) {
     std::ostringstream msg;
-    msg << "Couldn't register function'add_coins'";
+    msg << "Couldn't register function'walk'";
     throw SquirrelError(v, msg.str());
   }