Changeset 1959 for code/branches/objecthierarchy/src/core/LuaBind.h

Timestamp:

Oct 19, 2008, 11:46:37 PM (17 years ago)

Author:

rgrieder

Message:

Merged script_trigger branch into objecthierarchy branch.
Also merged changes in Script.cc and Script.h manually to LuaBind.cc and LuaBind.h.

Location:

code/branches/objecthierarchy

Files:

• . (modified) (1 prop)
• src/core/LuaBind.h (copied) (copied from code/branches/script_trigger/src/core/LuaBind.h) (4 diffs, 1 prop)

code/branches/objecthierarchy/src/core/LuaBind.h

@@ -28 +28 @@
 
 /**
- @file  LuaBind.h
+ @file
  @brief Representation of an interface to lua
  @author Benjamin Knecht <beni_at_orxonox.net>
@@ -39 +39 @@
 
 extern "C" {
-#include <lua.h>
+#include <lua/lua.h>
 }
 
@@ -47 +47 @@
 namespace orxonox // tolua_export
 { // tolua_export
-
-  class _CoreExport LuaBind // tolua_export
-  { // tolua_export
+  class _CoreExport LuaBind
+  {
+  /*
+  class LuaBind { // tolua_export
+  */
     struct LoadS {
       const char *s;
@@ -73 +75 @@
     inline std::string getLuaOutput() { return output_; };
     //inline std::string* getFileString() { return &fileString_; };
+    inline void clearLuaOutput() { output_ = ""; }
 
-    unsigned int getNextQuote(const std::string& text, unsigned int start);
     std::string replaceLuaTags(const std::string& text); // tolua_export