Changeset 2161 for code/branches/objecthierarchy/src/orxonox/objects/worldentities/triggers

Timestamp:

Nov 9, 2008, 4:28:42 AM (16 years ago)

Author:

landauf

Message:

• added more exceptions to handle problems while loading a level or single objects
• dedicated server runs and clients may join, but there are still some heavy problems

File:

• code/branches/objecthierarchy/src/orxonox/objects/worldentities/triggers/Trigger.cc (modified) (2 diffs)

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

@@ -69 +69 @@
       this->debugBillboard_.setBillboardSet(this->getScene()->getSceneManager(), "Examples/Flare", ColourValue(1.0, 0.0, 0.0), 1);
       this->debugBillboard_.setVisible(false);
-    }
-
-    this->getNode()->attachObject(this->debugBillboard_.getBillboardSet());
+
+      if (this->debugBillboard_.getBillboardSet())
+        this->getNode()->attachObject(this->debugBillboard_.getBillboardSet());
+    }
+
     this->setObjectMode(0x0);
   }
@@ -310 +312 @@
   void Trigger::setBillboardColour(const ColourValue& colour)
   {
-    this->debugBillboard_.getBillboardSet()->getBillboard(0)->setColour(colour);
+    this->debugBillboard_.setColour(colour);
   }