Changeset 11032 for code/branches/presentationHS15/src/orxonox/gametypes/Dynamicmatch.h

Timestamp:

Jan 4, 2016, 12:07:42 AM (8 years ago)

Author:

landauf

Message:

fixed another situation where a timer may keep existing after the level was unloaded.
there is, however, yet another bug in this piece of code (marked with a TODO): a spaceship can be destroyed before the timer is executed which leads to a crash.

File:

• code/branches/presentationHS15/src/orxonox/gametypes/Dynamicmatch.h (modified) (4 diffs)

code/branches/presentationHS15/src/orxonox/gametypes/Dynamicmatch.h

@@ -33 +33 @@
 
 #include <map>
+#include <set>
 #include <vector>
 
@@ -45 +46 @@
         public:
             Dynamicmatch(Context* context);
-            virtual ~Dynamicmatch() {}
+            virtual ~Dynamicmatch();
 
             bool notEnoughPigs;
@@ -77 +78 @@
             virtual void rewardPig();
             void grantPigBoost(SpaceShip* spaceship); // Grant the piggy a boost.
-            void resetSpeedFactor(SpaceShip* spaceship);
+            void resetSpeedFactor(SpaceShip* spaceship, Timer* timer);
             void tick (float dt);// used to end the game
             SpawnPoint* getBestSpawnPoint(PlayerInfo* player) const;
@@ -88 +89 @@
             std::map< PlayerInfo*, int > playerParty_; //player's parties are recorded here
             std::vector<ColourValue> partyColours_; //aus TeamDeathmatch
+            std::set<Timer*> piggyTimers_;
             unsigned int numberOf[3]; //array to count number of chasers, pigs, killers
             float pointsPerTime;