Changeset 3183

Timestamp:

Jun 15, 2009, 10:48:12 PM (16 years ago)

Author:

rgrieder

Message:

Renamed Teamcolourable to TeamColourable

Location:

code/branches/pch/src/orxonox

Files:

• interfaces/InterfaceCompilation.cc (modified) (2 diffs)
• interfaces/TeamColourable.h (moved) (moved from code/branches/pch/src/orxonox/interfaces/Teamcolourable.h) (3 diffs, 1 prop)
• objects/gametypes/TeamDeathmatch.cc (modified) (2 diffs)
• objects/quest/AddReward.cc (modified) (1 diff)
• objects/worldentities/Billboard.h (modified) (1 diff)
• objects/worldentities/Light.h (modified) (1 diff)
• objects/worldentities/pawns/TeamBaseMatchBase.cc (modified) (2 diffs)

code/branches/pch/src/orxonox/interfaces/InterfaceCompilation.cc

@@ -37 +37 @@
 #include "RadarListener.h"
 #include "Rewardable.h"
-#include "Teamcolourable.h"
+#include "TeamColourable.h"
 #include "Tickable.h"
 #include "TimeFactorListener.h"
@@ -74 +74 @@
 
     //----------------------------
-    // Teamcolourable
+    // TeamColourable
     //----------------------------
-    Teamcolourable::Teamcolourable()
+    TeamColourable::TeamColourable()
     {
-        RegisterRootObject(Teamcolourable);
+        RegisterRootObject(TeamColourable);
     }
 

code/branches/pch/src/orxonox/interfaces/TeamColourable.h

@@ -27 +27 @@
  */
 
-#ifndef _Teamcolourable_H__
-#define _Teamcolourable_H__
+#ifndef _TeamColourable_H__
+#define _TeamColourable_H__
 
 #include "OrxonoxPrereqs.h"
@@ -37 +37 @@
 namespace orxonox
 {
-    class _OrxonoxExport Teamcolourable : virtual public OrxonoxClass
+    class _OrxonoxExport TeamColourable : virtual public OrxonoxClass
     {
         public:
@@ -43 +43 @@
 
         protected:
-            Teamcolourable();
+            TeamColourable();
     };
 }
 
-#endif /* _Teamcolourable_H__ */
+#endif /* _TeamColourable_H__ */

code/branches/pch/src/orxonox/objects/gametypes/TeamDeathmatch.cc

@@ -31 +31 @@
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"
-#include "interfaces/Teamcolourable.h"
+#include "interfaces/TeamColourable.h"
 #include "objects/worldentities/TeamSpawnPoint.h"
 
@@ -168 +168 @@
                 for (std::set<WorldEntity*>::iterator it = pawnAttachments.begin(); it != pawnAttachments.end(); ++it)
                 {
-                    if ((*it)->isA(Class(Teamcolourable)))
+                    if ((*it)->isA(Class(TeamColourable)))
                     {
-                        Teamcolourable* tc = dynamic_cast<Teamcolourable*>(*it);
+                        TeamColourable* tc = dynamic_cast<TeamColourable*>(*it);
                         tc->setTeamColour(this->teamcolours_[it_player->second]);
                     }

code/branches/pch/src/orxonox/objects/quest/AddReward.cc

@@ -36 +36 @@
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
-#include "Rewardable.h"
+#include "interfaces/Rewardable.h"
 
 namespace orxonox

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

@@ -34 +34 @@
 #include "util/Math.h"
 #include "tools/BillboardSet.h"
-#include "interfaces/Teamcolourable.h"
+#include "interfaces/TeamColourable.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport Billboard : public StaticEntity, public Teamcolourable
+    class _OrxonoxExport Billboard : public StaticEntity, public TeamColourable
     {
         public:

code/branches/pch/src/orxonox/objects/worldentities/Light.h

@@ -37 +37 @@
 
 #include "util/Math.h"
-#include "interfaces/Teamcolourable.h"
+#include "interfaces/TeamColourable.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport Light : public StaticEntity, public Teamcolourable
+    class _OrxonoxExport Light : public StaticEntity, public TeamColourable
     {
         public:

code/branches/pch/src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.cc

@@ -31 +31 @@
 #include "core/CoreIncludes.h"
 #include "objects/gametypes/TeamBaseMatch.h"
-#include "interfaces/Teamcolourable.h"
+#include "interfaces/TeamColourable.h"
 #include "interfaces/PawnListener.h"
 
@@ -81 +81 @@
         for (std::set<WorldEntity*>::iterator it = attachments.begin(); it != attachments.end(); ++it)
         {
-            if ((*it)->isA(Class(Teamcolourable)))
+            if ((*it)->isA(Class(TeamColourable)))
             {
-                Teamcolourable* tc = dynamic_cast<Teamcolourable*>(*it);
+                TeamColourable* tc = dynamic_cast<TeamColourable*>(*it);
                 tc->setTeamColour(colour);
             }