Changeset 7600

Timestamp:

Oct 28, 2010, 11:53:27 PM (14 years ago)

Author:

jo

Message:

New functionality successfully added. No bugs found so far. Only the delaytimer is running a little bit too fast.

Location:

code/branches/lastmanstanding

Files:

• data/levels/gametype_lastmanstanding.oxw (modified) (1 diff)
• src/orxonox/gametypes/LastManStanding.cc (modified) (5 diffs)

code/branches/lastmanstanding/data/levels/gametype_lastmanstanding.oxw

@@ -61 +61 @@
 j = math.random()
 ?>
+
+
+    <!--SpawnPoint team=0 position="<?lua print(y*1.4) ?>,0,<?lua print(z*1.4) ?>" spawnclass=SpaceShip pawndesign=spaceshipassff /-->
 
     <StaticEntity position="<?lua print(y) ?>,0,<?lua print(z) ?>" scale=<?lua print(j * 2) ?> collisionType=static >

code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.cc

@@ -46 +46 @@
         this->lives=4;
         this->playersAlive=0;
-        this->timeRemaining=20.0f;
+        this->timeRemaining=10.0f;
         this->respawnDelay=4.0f;
         this->setHUDTemplate("LastmanstandingHUD");
@@ -64 +64 @@
                 {
                     if (it->first->getClientID()== CLIENTID_UNKNOWN)
-                        return;
+                        continue;
                     const std::string& message = "Respawn in " +multi_cast<std::string>(respawnDelay)+ " seconds." ;
                     this->gtinfo_->sendFadingMessage(message,it->first->getClientID());
@@ -71 +71 @@
                 {
                     if (it->first->getClientID()== CLIENTID_UNKNOWN)
-                        return;
+                        continue;
                     const std::string& message2 = "You have lost all " +multi_cast<std::string>(lives)+ " lives." ;
                     this->gtinfo_->sendFadingMessage(message2,it->first->getClientID());
@@ -236 +236 @@
             {   
                 if (playerGetLives(it->first)<=0)//Players without lives shouldn't be affected by time.
-                    return;     
+                    continue;     
                 it->second-=dt;//Decreases punishment time.
                 if (!inGame_[it->first])//Manages respawn delay - player is forced to respawn after the delaytime is used up. 
@@ -253 +253 @@
                 {
                     if (it->first->getClientID()== CLIENTID_UNKNOWN)
-                        return;
+                        continue;
                     const std::string& message = "Camper Warning! Don't forget to shoot.";
                     this->gtinfo_->sendFadingMessage(message,it->first->getClientID());