Changeset 6417 for code/trunk/src/orxonox/interfaces

Timestamp:

Dec 25, 2009, 10:23:58 PM (15 years ago)

Author:

rgrieder

Message:

Merged presentation2 branch back to trunk.
Major new features:

• Actual GUI with settings, etc.
• Improved space ship steering (human interaction)
• Rocket fire and more particle effects
• Advanced sound framework

Location:

code/trunk

Files:

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

code/trunk/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);
         }

code/trunk/src/orxonox/interfaces/Rewardable.h

@@ -43 +43 @@
     @brief
         Rewardable is an Interface, that can be implemented by any object to enable it to be given as reward to a player through QuestEffects. (With the AddReward effect.)
-        
+
         It just needs to inherit form Rewardable, and implement the reward() method.
     @author