Context Navigation

Changeset 9340 for code/branches/presentation2012merge/src

Timestamp:

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

Author:

Message:

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

Location:

code/branches/presentation2012merge/src

Files:

-                      r9258
+                      r9340
         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.

r9258	r9340
73	73	virtual void spawnPlayer(PlayerInfo* player); //!< Spawns the input player.
74	74
75		virtual void playerScored(PlayerInfo* player); //!< Is called when the player scored.
	75	virtual void playerScored(PlayerInfo* player, int score = 1); //!< Is called when the player scored.
76	76
77	77	/**

r9330	r9340
26	26	*
27	27	*
28		*BUG c) destroying the old stones causes segfault -> WeakPointer as solution ?
29		*BUG d) wrong collision detection: sometimes stones "bounce off"
30	28	*
31	29	*

r8858	r9340
114	114	}
115	115
116		void Deathmatch::playerScored(PlayerInfo* player)
	116	void Deathmatch::playerScored(PlayerInfo* player, int score)
117	117	{
118		Gametype::playerScored(player);
	118	Gametype::playerScored(player, score);
119	119
120	120	if (player)

r5781	r9340
48	48
49	49	virtual void pawnKilled(Pawn* victim, Pawn* killer = 0);
50		virtual void playerScored(PlayerInfo* player);
	50	virtual void playerScored(PlayerInfo* player, int score = 1);
51	51	};
52	52	}

-                      r9339
+                      r9340
         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);
 …
+        }
         //killers: every 4th player is a killer
         if (getPlayerCount()/4 > (int)numberOf[killer])
+        if ( static_cast<unsigned int>(getPlayerCount()/4) > numberOf[killer])
+        {
             notEnoughKillers=true;

r8952	r9340
128	128
129	129	// collect Points for killing oppenents
130		void TeamBaseMatch::playerScored(PlayerInfo* player)
	130	void TeamBaseMatch::playerScored(PlayerInfo* player, int score)
131	131	{
132	132	int teamnr = this->getTeam(player);

r5929	r9340
47	47	virtual bool allowPawnDamage(Pawn* victim, Pawn* originator);
48	48
49		virtual void playerScored(PlayerInfo* player);
	49	virtual void playerScored(PlayerInfo* player, int score = 1);
50	50	virtual void showPoints();
51	51	virtual void endGame();

r9286	r9340
113	113	}
114	114
115		void TeamDeathmatch::playerScored(PlayerInfo* player)
	115	void TeamDeathmatch::playerScored(PlayerInfo* player, int score)
116	116	{
117		TeamGametype::playerScored(player);
	117	TeamGametype::playerScored(player, score);
118	118
119	119	if (player)

r9286	r9340
48	48
49	49	virtual void pawnKilled(Pawn* victim, Pawn* killer = 0);
50		virtual void playerScored(PlayerInfo* player);
	50	virtual void playerScored(PlayerInfo* player, int score = 1);
51	51	};
52	52	}

Note: See TracChangeset for help on using the changeset viewer.