Changeset 9340 for code/branches/presentation2012merge/src/orxonox

Timestamp:

Aug 20, 2012, 4:46:52 PM (12 years ago)

Author:

jo

Message:

On the way of repairing a bug that was caused by manual refactoring of gametype's playerScored function.

Location:

code/branches/presentation2012merge/src/orxonox/gametypes

Files:

• Deathmatch.cc (modified) (1 diff)
• Deathmatch.h (modified) (1 diff)
• Dynamicmatch.cc (modified) (2 diffs)
• TeamBaseMatch.cc (modified) (1 diff)
• TeamBaseMatch.h (modified) (1 diff)
• TeamDeathmatch.cc (modified) (1 diff)
• TeamDeathmatch.h (modified) (1 diff)

code/branches/presentation2012merge/src/orxonox/gametypes/Deathmatch.cc

@@ -114 +114 @@
     }
 
-    void Deathmatch::playerScored(PlayerInfo* player)
+    void Deathmatch::playerScored(PlayerInfo* player, int score)
     {
-        Gametype::playerScored(player);
+        Gametype::playerScored(player, score);
 
         if (player)

code/branches/presentation2012merge/src/orxonox/gametypes/Deathmatch.h

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

code/branches/presentation2012merge/src/orxonox/gametypes/Dynamicmatch.cc

@@ -310 +310 @@
         if (spaceship)
         {
+            WeakPtr<SpaceShip>* ptr = new WeakPtr<SpaceShip>(spaceship);
+            if(ptr == NULL)
+                return;
             spaceship->addSpeedFactor(5);
-            WeakPtr<SpaceShip>* ptr = new WeakPtr<SpaceShip>(spaceship);
             ExecutorPtr executor = createExecutor(createFunctor(&Dynamicmatch::resetSpeedFactor, this));
             executor->setDefaultValue(0, ptr);
@@ -490 +492 @@
         }
         //killers: every 4th player is a killer
-        if (getPlayerCount()/4 > (int)numberOf[killer])
+        if ( static_cast<unsigned int>(getPlayerCount()/4) > numberOf[killer])
         {
             notEnoughKillers=true;

code/branches/presentation2012merge/src/orxonox/gametypes/TeamBaseMatch.cc

@@ -128 +128 @@
 
     // collect Points for killing oppenents
-    void TeamBaseMatch::playerScored(PlayerInfo* player)
+    void TeamBaseMatch::playerScored(PlayerInfo* player, int score)
     {
         int teamnr = this->getTeam(player);

code/branches/presentation2012merge/src/orxonox/gametypes/TeamBaseMatch.h

@@ -47 +47 @@
             virtual bool allowPawnDamage(Pawn* victim, Pawn* originator);
 
-            virtual void playerScored(PlayerInfo* player);
+            virtual void playerScored(PlayerInfo* player, int score = 1);
             virtual void showPoints();
             virtual void endGame();

code/branches/presentation2012merge/src/orxonox/gametypes/TeamDeathmatch.cc

@@ -113 +113 @@
     }
 
-    void TeamDeathmatch::playerScored(PlayerInfo* player)
+    void TeamDeathmatch::playerScored(PlayerInfo* player, int score)
     {
-        TeamGametype::playerScored(player);
+        TeamGametype::playerScored(player, score);
 
         if (player)

code/branches/presentation2012merge/src/orxonox/gametypes/TeamDeathmatch.h

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