[Orxonox-commit 4676] r9347 - in code/branches/presentation2012merge/src: modules/towerdefense orxonox/infos

[landauf at orxonox.net]

Author: landauf
Date: 2012-08-30 22:32:58 +0200 (Thu, 30 Aug 2012)
New Revision: 9347

Modified:
   code/branches/presentation2012merge/src/modules/towerdefense/TowerDefense.cc
   code/branches/presentation2012merge/src/modules/towerdefense/TowerDefense.h
   code/branches/presentation2012merge/src/orxonox/infos/GametypeInfo.h
Log:
removed unused function
adjusted refactored code also in commented section of TowerDefense

Modified: code/branches/presentation2012merge/src/modules/towerdefense/TowerDefense.cc
===================================================================
--- code/branches/presentation2012merge/src/modules/towerdefense/TowerDefense.cc	2012-08-30 15:11:07 UTC (rev 9346)
+++ code/branches/presentation2012merge/src/modules/towerdefense/TowerDefense.cc	2012-08-30 20:32:58 UTC (rev 9347)
@@ -300,8 +300,8 @@
         Deathmatch::pawnKilled(victim, killer);
     }
 
-    void TowerDefense::playerScored(PlayerInfo* player)
+    void TowerDefense::playerScored(PlayerInfo* player, int score)
     {
-        Gametype::playerScored(player);
+        Gametype::playerScored(player, score);
     }*/
 }

Modified: code/branches/presentation2012merge/src/modules/towerdefense/TowerDefense.h
===================================================================
--- code/branches/presentation2012merge/src/modules/towerdefense/TowerDefense.h	2012-08-30 15:11:07 UTC (rev 9346)
+++ code/branches/presentation2012merge/src/modules/towerdefense/TowerDefense.h	2012-08-30 20:32:58 UTC (rev 9347)
@@ -57,7 +57,7 @@
         //virtual bool playerLeft(PlayerInfo* player);
 
         //virtual void pawnKilled(Pawn* victim, Pawn* killer = 0);
-        //virtual void playerScored(PlayerInfo* player);
+        //virtual void playerScored(PlayerInfo* player, int score);
 
 
         /*  Called by TowerDefenseCenterpoint upon game start

Modified: code/branches/presentation2012merge/src/orxonox/infos/GametypeInfo.h
===================================================================
--- code/branches/presentation2012merge/src/orxonox/infos/GametypeInfo.h	2012-08-30 15:11:07 UTC (rev 9346)
+++ code/branches/presentation2012merge/src/orxonox/infos/GametypeInfo.h	2012-08-30 20:32:58 UTC (rev 9347)
@@ -119,9 +119,6 @@
             inline const std::string& getHUDTemplate() const
                 { return this->hudtemplate_; }
 
-            inline unsigned int getNumberOfPlayers() const
-                {  return this->spawnedPlayers_.size(); }
-
             void sendAnnounceMessage(const std::string& message) const;
             void sendAnnounceMessage(const std::string& message, unsigned int clientID) const;
             void sendKillMessage(const std::string& message, unsigned int clientID) const;