Changeset 9003 in orxonox.OLD for trunk/src/lib/script_engine/script.h

Timestamp:

Jul 2, 2006, 1:36:13 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the single_player_map branche back
merged with command:
svn merge -r8896:HEAD ​https://svn.orxonox.net/orxonox/branches/single_player_map .
no conflicts

File:

• trunk/src/lib/script_engine/script.h (modified) (2 diffs)

trunk/src/lib/script_engine/script.h

@@ -31 +31 @@
     void loadFileNoRet(const std::string& filename) { loadFile(filename); };
     bool loadFile(const std::string& filename);
-    void addObject(const std::string& className, const std::string& objectName);
+    void addObject( const std::string& className,const std::string& objectName);
 
     /// QUERRYING
@@ -61 +61 @@
 
   private:
-
+    void addThisScript();
     int  reportError(int error);                      //!< Get errormessage from the lua stack and print it.
     bool registerStandartClasses();                   //!< Register all the classes that the script might need