Changeset 7903 for code/branches/lastmanstanding3/src/orxonox

Timestamp:

Feb 16, 2011, 11:17:30 AM (14 years ago)

Author:

scheusso

Message:

Merge branch 'jo-test' into lms3

Location:

code/branches/lastmanstanding3/src/orxonox

Files:

• OrxonoxPrereqs.h (modified) (1 diff)
• gametypes/CMakeLists.txt (modified) (1 diff)
• gametypes/Gametype.h (modified) (1 diff)
• gametypes/LastTeamStanding.cc (added)
• gametypes/LastTeamStanding.h (added)

code/branches/lastmanstanding3/src/orxonox/OrxonoxPrereqs.h

@@ -96 +96 @@
     class Gametype;
     class LastManStanding;
+    class LastTeamStanding;
     class TeamBaseMatch;
     class TeamDeathmatch;

code/branches/lastmanstanding3/src/orxonox/gametypes/CMakeLists.txt

@@ -8 +8 @@
   Dynamicmatch.cc
   LastManStanding.cc
+  LastTeamStanding.cc
 )

code/branches/lastmanstanding3/src/orxonox/gametypes/Gametype.h

@@ -150 +150 @@
               { this->timeLimit_ = t; }
 
+            //inline bool getForceSpawn()
+            //  { return this->bForceSpawn_; }       
+
             virtual void resetTimer();
             virtual void resetTimer(float t);