Changeset 8822 for code/branches/output/src/orxonox

Timestamp:

Aug 4, 2011, 12:45:06 AM (13 years ago)

Author:

landauf

Message:

Chat works again
Removed console output for almost all gameplay messages (use chat/notifications instead)
Deathmatch level now actually uses Deathmatch gametype

Location:

code/branches/output/src/orxonox/gametypes

Files:

• Asteroids.cc (modified) (2 diffs)
• Deathmatch.cc (modified) (7 diffs)
• Dynamicmatch.cc (modified) (7 diffs)
• LastManStanding.cc (modified) (7 diffs)
• LastTeamStanding.cc (modified) (1 diff)
• UnderAttack.cc (modified) (3 diffs)

code/branches/output/src/orxonox/gametypes/Asteroids.cc

@@ -74 +74 @@
 
         std::string message("The match has started! Reach the first chekpoint within 15 seconds! But be aware, there may be pirates around...");
-        orxout(level::message) << message << endl;
         Host::Broadcast(message);
 
@@ -84 +83 @@
 
         std::string message("The match has ended.");
-        orxout(level::message) << message << endl;
         Host::Broadcast(message);
     }

code/branches/output/src/orxonox/gametypes/Deathmatch.cc

@@ -48 +48 @@
 
         std::string message("The match has started!");
-        orxout(level::message) << message << endl;
         Host::Broadcast(message);
     }
@@ -57 +56 @@
 
         std::string message("The match has ended.");
-        orxout(level::message) << message << endl;
         Host::Broadcast(message);
     }
@@ -66 +64 @@
 
         const std::string& message = player->getName() + " entered the game";
-        orxout(level::message) << message << endl;
         Host::Broadcast(message);
     }
@@ -77 +74 @@
         {
             const std::string& message = player->getName() + " left the game";
-            orxout(level::message) << message << endl;
             Host::Broadcast(message);
         }
@@ -91 +87 @@
         {
             const std::string& message = player->getOldName() + " changed name to " + player->getName();
-            orxout(level::message) << message << endl;
             Host::Broadcast(message);
         }
@@ -113 +108 @@
                 message = victim->getPlayer()->getName() + " died";
 
-            orxout(level::message) << message << endl;
             Host::Broadcast(message);
         }
@@ -127 +121 @@
         {
             const std::string& message = player->getName() + " scores!";
-            orxout(level::message) << message << endl;
             Host::Broadcast(message);
         }

code/branches/output/src/orxonox/gametypes/Dynamicmatch.cc

@@ -343 +343 @@
         Gametype::playerEntered(player);
         const std::string& message = player->getName() + " entered the game";
-        orxout(level::message) << message << endl;
         Host::Broadcast(message);
     }
@@ -359 +358 @@
             }
             const std::string& message = player->getName() + " left the game";
-            orxout(level::message) << message << endl;
             Host::Broadcast(message);
             //remove player from map
@@ -617 +615 @@
         {
             const std::string& message = player->getOldName() + " changed name to " + player->getName();
-            orxout(level::message) << message << endl;
             Host::Broadcast(message);
         }
@@ -630 +627 @@
         {
             std::string message("Dynamicmatch started!");
-            orxout(level::message) << message << endl;
             Host::Broadcast(message);
         }
@@ -647 +643 @@
     {
         std::string message("Earn points:\n\n\n\tIf you're red: Chase the blue player!\n\n\tIf you're blue shoot at a red player or hide.\n\n\tIf you're green: You've got the licence to kill red players!");
-        orxout(level::message) << message << endl;
         Host::Broadcast(message);
         callInstructions_.setTimer(10, false, createExecutor(createFunctor(&Dynamicmatch::furtherInstructions, this)));
@@ -655 +650 @@
     {
         std::string message("After 3 Minutes the game is over.");
-        orxout(level::message) << message << endl;
         Host::Broadcast(message);
     }*/
@@ -663 +657 @@
 
         std::string message("Time out. Press F2 to see the points you scored.");
-        orxout(level::message) << message << endl;
         Host::Broadcast(message);
     }

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

@@ -90 +90 @@
                 const std::string& message = ""; // resets Camper-Warning-message
                 this->gtinfo_->sendFadingMessage(message,it->first->getClientID());
-            }    
+            }
         }
         return true;
@@ -105 +105 @@
             this->playersAlive--;
             const std::string& message = victim->getPlayer()->getName() + " has lost all lives";
-            orxout(level::message) << message << endl;
             Host::Broadcast(message);
         }
@@ -128 +127 @@
     {
         Gametype::end();
-        
+
         for (std::map<PlayerInfo*, int>::iterator it = this->playerLives_.begin(); it != this->playerLives_.end(); ++it)
         {
@@ -148 +147 @@
             return 0;
     }
-    
+
     int LastManStanding::getNumPlayersAlive() const
     {
@@ -190 +189 @@
         this->timeToAct_[player]=timeRemaining+3.0f+respawnDelay;//reset timer
         this->playerDelayTime_[player]=respawnDelay;
-        
+
         std::map<PlayerInfo*, Player>::iterator it = this->players_.find(player);
         if (it != this->players_.end())
@@ -198 +197 @@
             const std::string& message = ""; // resets Camper-Warning-message
             this->gtinfo_->sendFadingMessage(message,it->first->getClientID());
-        }  
+        }
     }
 
@@ -239 +238 @@
             }
             for (std::map<PlayerInfo*, float>::iterator it = this->timeToAct_.begin(); it != this->timeToAct_.end(); ++it)
-            {   
+            {
                 if (playerGetLives(it->first)<=0)//Players without lives shouldn't be affected by time.
-                    continue;     
+                    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. 
+                if (!inGame_[it->first])//Manages respawn delay - player is forced to respawn after the delaytime is used up.
                 {
                     playerDelayTime_[it->first]-=dt;

code/branches/output/src/orxonox/gametypes/LastTeamStanding.cc

@@ -119 +119 @@
                 this->teamsAlive--;
             const std::string& message = victim->getPlayer()->getName() + " has lost all lives";
-            orxout(level::message) << message << endl;
             Host::Broadcast(message);
         }

code/branches/output/src/orxonox/gametypes/UnderAttack.cc

@@ -70 +70 @@
         this->end(); //end gametype
         std::string message("Ship destroyed! Team 0 has won!");
-        orxout(level::message) << message << endl;
         Host::Broadcast(message);
         this->gameEnded_ = true;
@@ -153 +152 @@
                 this->end();
                 std::string message("Time is up! Team 1 has won!");
-                orxout(level::message) << message << endl;
                 Host::Broadcast(message);
 
@@ -173 +171 @@
                 const std::string& message = multi_cast<std::string>(timesequence_) + " seconds left!";
 /*
-                orxout(level::message) << message << endl;
                 Host::Broadcast(message);
 */