Changeset 2031 for code/branches/objecthierarchy/src/orxonox

Timestamp:

Oct 28, 2008, 9:11:02 PM (16 years ago)

Author:

landauf

Message:

some small adjustments in the network

Location:

code/branches/objecthierarchy/src/orxonox

Files:

• objects/infos/Level.cc (modified) (1 diff)
• objects/worldentities/triggers/Trigger.cc (modified) (1 diff)
• tools/Timer.cc (modified) (1 diff)

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

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

code/branches/objecthierarchy/src/orxonox/objects/worldentities/triggers/Trigger.cc

@@ -69 +69 @@
 
     this->getNode()->attachObject(this->debugBillboard_.getBillboardSet());
+    this->setObjectMode(0x0);
   }
 

code/branches/objecthierarchy/src/orxonox/tools/Timer.cc

@@ -112 +112 @@
     void TimerBase::run() const
     {
+        bool temp = this->bKillAfterCall_; // to avoid errors with bKillAfterCall_=false and an exutors which destroy the timer
+
         (*this->executor_)();
 
-        if (this->bKillAfterCall_)
+        if (temp)
             delete this;
     }