Changeset 2820 for code/branches/miniprojects/src/orxonox/objects/gametypes/TeamGametype.h

Timestamp:

Mar 23, 2009, 12:44:10 AM (15 years ago)

Author:

landauf

Message:

Split Gametype into Gametype+Deathmatch. The only difference is output like "player x killed player y" which only appears in Deathmatch now. TeamGametype inherits from Deathmatch (and will shortly be renamed into TeamDeathmatch).

File:

• code/branches/miniprojects/src/orxonox/objects/gametypes/TeamGametype.h (modified) (2 diffs)

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

@@ -34 +34 @@
 #include <vector>
 
-#include "Gametype.h"
+#include "Deathmatch.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport TeamGametype : public Gametype
+    class _OrxonoxExport TeamGametype : public Deathmatch
     {
         public:
@@ -47 +47 @@
 
             virtual void playerEntered(PlayerInfo* player);
-            virtual void playerLeft(PlayerInfo* player);
+            virtual bool playerLeft(PlayerInfo* player);
 
             virtual bool allowPawnHit(Pawn* victim, Pawn* originator = 0);