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

Timestamp:

Oct 3, 2006, 12:19:30 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

File:

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

trunk/src/lib/script_engine/script.h

@@ -22 +22 @@
 class Script : public BaseObject
 {
+  ObjectListDeclaration(Script);
   public:
     Script(const TiXmlElement* root = NULL);
@@ -33 +34 @@
     bool loadFile(const std::string& filename);
     void addObject( const std::string& className,const std::string& objectName);
-    void registerClass(const std::string& className);                           //!< Register a class but dont add any instances 
+    void registerClass(const std::string& className);                           //!< Register a class but dont add any instances
 
     /// QUERRYING