Changeset 2032 for code

Timestamp:

Oct 28, 2008, 9:26:23 PM (16 years ago)

Author:

landauf

Message:

a small change to test something

Location:

code/branches/objecthierarchy/src

Files:

• network/Synchronisable.cc (modified) (1 diff)
• orxonox/objects/infos/Level.cc (modified) (1 diff)

code/branches/objecthierarchy/src/network/Synchronisable.cc

@@ -329 +329 @@
     synchronisableHeader *syncHeader = (synchronisableHeader *)mem;
     assert(syncHeader->objectID==this->objectID);
-    assert(syncHeader->creatorID==this->creatorID);
+//    assert(syncHeader->creatorID==this->creatorID);
     if(syncHeader->dataAvailable==false){
       mem+=syncHeader->size;

code/branches/objecthierarchy/src/orxonox/objects/infos/Level.cc

@@ -52 +52 @@
 
         this->registerVariables();
-        this->xmlfilename_ = this->getFilename().substr(Settings::getDataPath().length());
+        this->xmlfilename_ = this->getFilename();
+
+        if (this->xmlfilename_.length() >= Settings::getDataPath().length())
+            this->xmlfilename_ = this->xmlfilename_.substr(Settings::getDataPath().length());
 
         COUT(0) << "created Level" << std::endl;