Changeset 2821 for code/branches/miniprojects/src/orxonox

Timestamp:

Mar 23, 2009, 1:04:52 AM (16 years ago)

Author:

landauf

Message:

renamed TeamGametype to TeamDeathmatch.

Location:

code/branches/miniprojects/src/orxonox/objects/gametypes

Files:

• CMakeLists.txt (modified) (1 diff)
• TeamDeathmatch.cc (moved) (moved from code/branches/miniprojects/src/orxonox/objects/gametypes/TeamGametype.cc) (8 diffs, 1 prop)
• TeamDeathmatch.h (moved) (moved from code/branches/miniprojects/src/orxonox/objects/gametypes/TeamGametype.h) (3 diffs, 1 prop)

code/branches/miniprojects/src/orxonox/objects/gametypes/CMakeLists.txt

@@ -2 +2 @@
   Gametype.cc
   Deathmatch.cc
-  TeamGametype.cc
+  TeamDeathmatch.cc
 )

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

@@ -28 +28 @@
 
 #include "OrxonoxStableHeaders.h"
-#include "TeamGametype.h"
+#include "TeamDeathmatch.h"
 
 #include "core/CoreIncludes.h"
@@ -37 +37 @@
 namespace orxonox
 {
-    CreateUnloadableFactory(TeamGametype);
+    CreateUnloadableFactory(TeamDeathmatch);
 
-    TeamGametype::TeamGametype(BaseObject* creator) : Deathmatch(creator)
+    TeamDeathmatch::TeamDeathmatch(BaseObject* creator) : Deathmatch(creator)
     {
-        RegisterObject(TeamGametype);
+        RegisterObject(TeamDeathmatch);
 
         this->teams_ = 2;
@@ -48 +48 @@
     }
 
-    void TeamGametype::setConfigValues()
+    void TeamDeathmatch::setConfigValues()
     {
         SetConfigValue(teams_, 2);
@@ -64 +64 @@
     }
 
-    void TeamGametype::playerEntered(PlayerInfo* player)
+    void TeamDeathmatch::playerEntered(PlayerInfo* player)
     {
         Deathmatch::playerEntered(player);
@@ -88 +88 @@
     }
 
-    bool TeamGametype::playerLeft(PlayerInfo* player)
+    bool TeamDeathmatch::playerLeft(PlayerInfo* player)
     {
         bool valid_player = Deathmatch::playerLeft(player);
@@ -98 +98 @@
     }
 
-    bool TeamGametype::allowPawnHit(Pawn* victim, Pawn* originator)
+    bool TeamDeathmatch::allowPawnHit(Pawn* victim, Pawn* originator)
     {
         return (!this->pawnsAreInTheSameTeam(victim, originator));
     }
 
-    bool TeamGametype::allowPawnDamage(Pawn* victim, Pawn* originator)
+    bool TeamDeathmatch::allowPawnDamage(Pawn* victim, Pawn* originator)
     {
         return (!this->pawnsAreInTheSameTeam(victim, originator));
     }
 
-    bool TeamGametype::allowPawnDeath(Pawn* victim, Pawn* originator)
+    bool TeamDeathmatch::allowPawnDeath(Pawn* victim, Pawn* originator)
     {
         return (!this->pawnsAreInTheSameTeam(victim, originator));
     }
 
-    SpawnPoint* TeamGametype::getBestSpawnPoint(PlayerInfo* player) const
+    SpawnPoint* TeamDeathmatch::getBestSpawnPoint(PlayerInfo* player) const
     {
         int desiredTeamNr = -1;
@@ -153 +153 @@
     }
 
-    void TeamGametype::playerStartsControllingPawn(PlayerInfo* player, Pawn* pawn)
+    void TeamDeathmatch::playerStartsControllingPawn(PlayerInfo* player, Pawn* pawn)
     {
         if (!player)
@@ -177 +177 @@
     }
 
-    bool TeamGametype::pawnsAreInTheSameTeam(Pawn* pawn1, Pawn* pawn2)
+    bool TeamDeathmatch::pawnsAreInTheSameTeam(Pawn* pawn1, Pawn* pawn2)
     {
         if (pawn1 && pawn2)

code/branches/miniprojects/src/orxonox/objects/gametypes/TeamDeathmatch.h

@@ -27 +27 @@
  */
 
-#ifndef _TeamGametype_H__
-#define _TeamGametype_H__
+#ifndef _TeamDeathmatch_H__
+#define _TeamDeathmatch_H__
 
 #include "OrxonoxPrereqs.h"
@@ -38 +38 @@
 namespace orxonox
 {
-    class _OrxonoxExport TeamGametype : public Deathmatch
+    class _OrxonoxExport TeamDeathmatch : public Deathmatch
     {
         public:
-            TeamGametype(BaseObject* creator);
-            virtual ~TeamGametype() {}
+            TeamDeathmatch(BaseObject* creator);
+            virtual ~TeamDeathmatch() {}
 
             void setConfigValues();
@@ -65 +65 @@
 }
 
-#endif /* _TeamGametype_H__ */
+#endif /* _TeamDeathmatch_H__ */