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

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/modules

Files:

• pong/Pong.cc (modified) (1 diff)
• pong/Pong.h (modified) (1 diff)
• tetris/Tetris.cc (modified) (1 diff)

code/branches/presentation2012merge/src/modules/pong/Pong.cc

@@ -256 +256 @@
         Is called when the player scored.
     */
-    void Pong::playerScored(PlayerInfo* player)
-    {
-        Deathmatch::playerScored(player);
+    void Pong::playerScored(PlayerInfo* player, int score)
+    {
+        Deathmatch::playerScored(player, score);
 
         if (this->center_ != NULL) // If there is a centerpoint.

code/branches/presentation2012merge/src/modules/pong/Pong.h

@@ -73 +73 @@
             virtual void spawnPlayer(PlayerInfo* player); //!< Spawns the input player.
 
-            virtual void playerScored(PlayerInfo* player); //!< Is called when the player scored.
+            virtual void playerScored(PlayerInfo* player, int score = 1); //!< Is called when the player scored.
 
             /**

code/branches/presentation2012merge/src/modules/tetris/Tetris.cc

@@ -26 +26 @@
  *
  *
- *BUG c) destroying the old stones causes segfault -> WeakPointer as solution ?
- *BUG d) wrong collision detection: sometimes stones "bounce off"
  *
  *