Changeset 1584 for code/branches/core3

Timestamp:

Jun 10, 2008, 3:46:17 AM (17 years ago)

Author:

landauf

Message:

some adjustments to prevent startup crash

Location:

code/branches/core3/src/orxonox/objects

Files:

• Projectile.cc (modified) (1 diff)
• RotatingProjectile.cc (modified) (1 diff)

code/branches/core3/src/orxonox/objects/Projectile.cc

@@ -75 +75 @@
         SetConfigValue(speed_, 5000.0).description("The speed of a projectile in units per second");
 
-        this->setVelocity(this->owner_->getInitialDir() * this->speed_);
+        if (this->owner_)
+            this->setVelocity(this->owner_->getInitialDir() * this->speed_);
     }
 

code/branches/core3/src/orxonox/objects/RotatingProjectile.cc

@@ -67 +67 @@
         SetConfigValue(colour_, ColourValue(1.0, 0.0, 0.0));
 
-        this->rotatingBillboard1_.getBillboardSet()->getBillboard(0)->setColour(this->colour_);
-        this->rotatingBillboard2_.getBillboardSet()->getBillboard(0)->setColour(this->colour_);
+        if (this->isInitialized())
+        {
+            this->rotatingBillboard1_.getBillboardSet()->getBillboard(0)->setColour(this->colour_);
+            this->rotatingBillboard2_.getBillboardSet()->getBillboard(0)->setColour(this->colour_);
+        }
     }