Changeset 6921 for code/branches/dynamicmatch/src/orxonox/gametypes/Dynamicmatch.h

Timestamp:

May 17, 2010, 5:01:54 PM (14 years ago)

Author:

jo

Message:

With additional tutorial messages in order to explain how the gametype works

File:

• code/branches/dynamicmatch/src/orxonox/gametypes/Dynamicmatch.h (modified) (3 diffs)

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

@@ -47 +47 @@
             bool notEnoughKillers;
             bool notEnoughChasers;
+
+            //three different parties   
+            int chaser;
+            int piggy;
+            int killer;
+
             virtual void evaluatePlayerParties();
             int getParty(PlayerInfo* player);
             void setPlayerColour(PlayerInfo* player);//own function
             void setConfigValues();//done
+            
+            bool friendlyfire; //goal: player can switch it on/off
+            bool tutorial; //goal: new players recieve messages how the new gametype works - later it can be switched off.
+            
             virtual bool allowPawnDamage(Pawn* victim, Pawn* originator = 0); //ok - score function and management of parties
             virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = 0); //ok - simple
@@ -59 +69 @@
             virtual bool playerLeft(PlayerInfo* player);
             virtual bool playerChangedName(PlayerInfo* player);//unchanged
-            virtual void instructions();
-            virtual void furtherInstructions();
+            
+            /*virtual void instructions();
+            virtual void furtherInstructions();*/
             virtual void rewardPig();
             void resetSpeedFactor(WeakPtr<Engine>* ptr);  
             void tick (float dt);// used to end the game
             SpawnPoint* getBestSpawnPoint(PlayerInfo* player) const;
-            //three different parties   
-            int chaser;
-            int piggy;
-            int killer;
-                
-            bool friendlyfire; //goal: player can switch it on/off
-            bool tutorial; //goal: new players recieve messages how the new gametype works - later it can be switched off.
+            
         protected:
-                  
-                  
+
             std::map< PlayerInfo*, int > playerParty_; //player's parties are recorded here
             std::vector<ColourValue> partyColours_; //aus TeamDeathmatch
@@ -82 +86 @@
             bool gameEnded_; // true if game is over
             int timesequence_; //used for countdown
-            Timer callInstructions_;
+            //Timer callInstructions_;
     };
 }