Add scripting method to set a Sector's gravity

 - using the Console, this is currently done using e.g. sector.settings.set_gravity(10)

SVN-Revision: 5462

diff --git a/src/scripting/ssector.hpp b/src/scripting/ssector.hpp
index 82fc542..08dda19 100644 (file)
--- a/src/scripting/ssector.hpp
+++ b/src/scripting/ssector.hpp
@@ -34,6 +34,7 @@ public:
   virtual float get_ambient_red() = 0;
   virtual float get_ambient_green() = 0;
   virtual float get_ambient_blue() = 0;
+  virtual void set_gravity(float gravity) = 0;
 };
 
 }

diff --git a/src/scripting/wrapper.cpp b/src/scripting/wrapper.cpp
index 7a5ab30..d3c8cf1 100644 (file)
--- a/src/scripting/wrapper.cpp
+++ b/src/scripting/wrapper.cpp
@@ -2878,6 +2878,35 @@ static SQInteger SSector_get_ambient_blue_wrapper(HSQUIRRELVM vm)
 
 }
 
+static SQInteger SSector_set_gravity_wrapper(HSQUIRRELVM vm)
+{
+  SQUserPointer data;
+  if(SQ_FAILED(sq_getinstanceup(vm, 1, &data, 0))) {
+    sq_throwerror(vm, _SC("'set_gravity' called without instance"));
+    return SQ_ERROR;
+  }
+  Scripting::SSector* _this = reinterpret_cast<Scripting::SSector*> (data);
+  SQFloat arg0;
+  if(SQ_FAILED(sq_getfloat(vm, 2, &arg0))) {
+    sq_throwerror(vm, _SC("Argument 1 not a float"));
+    return SQ_ERROR;
+  }
+
+  try {
+    _this->set_gravity(static_cast<float> (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_gravity'"));
+    return SQ_ERROR;
+  }
+
+}
+
 static SQInteger LevelTime_release_hook(SQUserPointer ptr, SQInteger )
 {
   Scripting::LevelTime* _this = reinterpret_cast<Scripting::LevelTime*> (ptr);
@@ -5166,6 +5195,12 @@ void register_supertux_wrapper(HSQUIRRELVM v)
     throw SquirrelError(v, "Couldn't register function 'get_ambient_blue'");
   }
 
+  sq_pushstring(v, "set_gravity", -1);
+  sq_newclosure(v, &SSector_set_gravity_wrapper, 0);
+  if(SQ_FAILED(sq_createslot(v, -3))) {
+    throw SquirrelError(v, "Couldn't register function 'set_gravity'");
+  }
+
   if(SQ_FAILED(sq_createslot(v, -3))) {
     throw SquirrelError(v, "Couldn't register class 'SSector'");
   }

diff --git a/src/sector.cpp b/src/sector.cpp
index eb3ead6..688bba3 100644 (file)
--- a/src/sector.cpp
+++ b/src/sector.cpp
@@ -1571,3 +1571,22 @@ Sector::get_ambient_blue()
 {
   return ambient_light.blue;
 }
+
+void
+Sector::set_gravity(float gravity)
+{
+  log_warning << "Changing a Sector's gravitational constant might have unforseen side-effects" << std::endl;
+
+  this->gravity = gravity;
+
+  for(GameObjects::iterator i = gameobjects.begin(); i != gameobjects.end(); ++i) {
+    GameObject* game_object = *i;
+    if(!game_object) continue;
+    if(!game_object->is_valid()) continue;
+    UsesPhysic *physics_object = dynamic_cast<UsesPhysic*>(game_object);
+    if (!physics_object) continue;
+
+    physics_object->physic.set_gravity(gravity);
+  }
+}
+

diff --git a/src/sector.hpp b/src/sector.hpp
index 5033959..e3b22e0 100644 (file)
--- a/src/sector.hpp
+++ b/src/sector.hpp
@@ -193,6 +193,11 @@ public:
   float get_ambient_green();
   float get_ambient_blue();
 
+  /**
+   *  set gravity throughout sector
+   */
+  void set_gravity(float gravity);
+
 private:
   Level* level; /**< Parent level containing this sector */
   uint32_t collision_tile_attributes(const Rect& dest) const;