Changeset 9347 for code/branches/presentation2012merge

Timestamp:

Aug 30, 2012, 10:32:58 PM (12 years ago)

Author:

landauf

Message:

removed unused function
adjusted refactored code also in commented section of TowerDefense

Location:

code/branches/presentation2012merge/src

Files:

• modules/towerdefense/TowerDefense.cc (modified) (1 diff)
• modules/towerdefense/TowerDefense.h (modified) (1 diff)
• orxonox/infos/GametypeInfo.h (modified) (1 diff)

code/branches/presentation2012merge/src/modules/towerdefense/TowerDefense.cc

@@ -301 +301 @@
     }
 
-    void TowerDefense::playerScored(PlayerInfo* player)
-    {
-        Gametype::playerScored(player);
+    void TowerDefense::playerScored(PlayerInfo* player, int score)
+    {
+        Gametype::playerScored(player, score);
     }*/
 }

code/branches/presentation2012merge/src/modules/towerdefense/TowerDefense.h

@@ -58 +58 @@
 
         //virtual void pawnKilled(Pawn* victim, Pawn* killer = 0);
-        //virtual void playerScored(PlayerInfo* player);
+        //virtual void playerScored(PlayerInfo* player, int score);
 
 

code/branches/presentation2012merge/src/orxonox/infos/GametypeInfo.h

@@ -120 +120 @@
                 { 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;