Changeset 8783 in orxonox.OLD for trunk/src/lib

Timestamp:

Jun 26, 2006, 2:00:31 PM (19 years ago)

Author:

patrick

Message:

merged the script engine branche back to trunk

Location:

trunk/src/lib

Files:

• lang/class_list.cc (modified) (1 diff)
• script_engine/script.cc (modified) (2 diffs)

trunk/src/lib/lang/class_list.cc

@@ -235 +235 @@
 BaseObject* ClassList::getObject(const std::string& objectName, const std::string& className)
 {
+
   ClassList* cl = ClassList::getClassList(className);
   if (cl != NULL)

trunk/src/lib/script_engine/script.cc

@@ -114 +114 @@
  void Script::addObject(const std::string& className, const std::string& objectName)
  {
-   //printf("Script %p: I am about to add %s of class %s\n",this,objectName.c_str(),className.c_str());
+  // printf("Script %p: I am about to add %s of class %s\n",this,objectName.c_str(),className.c_str());
 
    BaseObject* scriptClass = ClassList::getObject(className, CL_SCRIPT_CLASS);
-   //printf("The script class for %s is at %p \n",className.c_str(),scriptClass);
+  // printf("The script class for %s is at %p \n",className.c_str(),scriptClass);
    WorldObject tmpObj;
    if (scriptClass != NULL)
@@ -128 +128 @@
 
      BaseObject* object = ClassList::getObject(objectName, className);
-     //printf("%s is at %p \n",objectName.c_str(),object);
+    // printf("%s is at %p \n",objectName.c_str(),object);
      if (object != NULL && !objectIsAdded(objectName))
      {