Changeset 2908 for code/branches/questsystem5/src/orxonox/objects/worldentities/Billboard.h

Timestamp:

Apr 8, 2009, 12:58:47 AM (16 years ago)

Author:

dafrick

Message:

Reverted to revision 2906 (because I'm too stupid to merge correctly, 2nd try will follow shortly. )

Location:

code/branches/questsystem5

Files:

• . (modified) (1 prop)
• src/orxonox/objects/worldentities/Billboard.h (modified) (2 diffs)

code/branches/questsystem5/src/orxonox/objects/worldentities/Billboard.h

@@ -34 +34 @@
 #include "util/Math.h"
 #include "tools/BillboardSet.h"
-#include "objects/Teamcolourable.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport Billboard : public StaticEntity, public Teamcolourable
+    class _OrxonoxExport Billboard : public StaticEntity
     {
         public:
@@ -62 +61 @@
                 { return this->colour_; }
 
-            virtual void setTeamColour(const ColourValue& colour)
-                { this->setColour(colour); }
-
         protected:
             inline BillboardSet& getBillboardSet()