Changeset 8399 in orxonox.OLD

Timestamp:

Jun 14, 2006, 4:53:53 PM (18 years ago)

Author:

bensch

Message:

passing along scriptmethods

Location:

branches/script_engine/src/lib/script_engine

Files:

• lunar.h (modified) (2 diffs)
• script_class.cc (modified) (2 diffs)
• script_class.h (modified) (3 diffs)

branches/script_engine/src/lib/script_engine/lunar.h

@@ -7 +7 @@
 
 #include "luaincl.h"
-#include "executor/executor_lua.h"
+#include "script_method.h"
 
 
@@ -21 +21 @@
 
 
-  static void Register(Script* script, const std::string& className)
+  static void Register(Script* script, const std::string& className, const ScriptMethod* scriptMethod)
   {
     if(script != NULL)
-      Register(script->getLuaState(), className);
-  }
-
-  static void Register(lua_State *L, const std::string& className)
+      Register(script->getLuaState(), className, scriptMethod);
+  }
+
+  static void Register(lua_State *L, const std::string& className, const ScriptMethod* scriptMethod)
   {
     Lunar<T>::className = className;

branches/script_engine/src/lib/script_engine/script_class.cc

@@ -28 +28 @@
   assert(scriptMethods != NULL);
   this->setClassID(CL_SCRIPT_CLASS, "ScriptClass");
-  this->classID = classID;
 
-  this->scriptMethods = scriptMethods;
+  this->_classID = classID;
+
+  this->_scriptMethods = scriptMethods;
 }
 
@@ -39 +40 @@
 ScriptClass::~ScriptClass ()
 {
-  delete this->scriptMethods;
+  delete this->_scriptMethods;
 }

branches/script_engine/src/lib/script_engine/script_class.h

@@ -31 +31 @@
 
   bool operator==(const std::string& name) { return (this->getName() == name); }
-  bool operator==(ClassID classID) { return (this->classID == classID); }
+  bool operator==(ClassID classID) { return (this->_classID == classID); }
 
   virtual void registerClass(Script* script) = 0;
   virtual int insertObject(Script* L, BaseObject* obj, bool gc=false) = 0;
+
+  const ScriptMethod* scriptMethods() const { return this->_scriptMethods; }
 
 protected:
@@ -40 +42 @@
 
 private:
-  ClassID             classID;
-  ScriptMethod*       scriptMethods;
+  ClassID             _classID;
+  ScriptMethod*       _scriptMethods;
 };
 
@@ -57 +59 @@
   virtual void registerClass(Script* script)
   {
-    Lunar<T>::Register(script, this->getName());
+    Lunar<T>::Register(script, this->getName(), this->scriptMethods());
   }
   virtual int insertObject(Script* L, BaseObject* obj, bool gc=false)