Changeset 6412 for code/branches/pickup2/src/orxonox/interfaces/RadarViewable.cc

Timestamp:

Dec 25, 2009, 1:18:03 PM (15 years ago)

Author:

dafrick

Message:

Merged presentation2 branch into pickup2 branch.

Location:

code/branches/pickup2

Files:

• . (modified) (1 prop)
• src/orxonox/interfaces/RadarViewable.cc (modified) (3 diffs)

code/branches/pickup2/src/orxonox/interfaces/RadarViewable.cc

@@ -51 +51 @@
         , line_(NULL)
         , LineNode_(NULL)
+        , isHumanShip_(false)
+        , bVisibility_(true)
         , radarObjectCamouflage_(0.0f)
         , radarObjectShape_(Dot)
@@ -56 +58 @@
     {
         RegisterRootObject(RadarViewable);
-
-        this->bVisibility_ = true;
-        this->isHumanShip_ = false;
 
         this->uniqueId_=getUniqueNumberString();
@@ -164 +163 @@
         if (!object)
         {
-            COUT(1) << "Assertation: Every RadarViewable has to be assigned a WorldEntity pointer!" << std::endl;
+            COUT(1) << "Assertion: Every RadarViewable has to be assigned a WorldEntity pointer!" << std::endl;
             assert(0);
         }