Changeset 6417 for code/trunk/src/orxonox/gametypes

Timestamp:

Dec 25, 2009, 10:23:58 PM (15 years ago)

Author:

rgrieder

Message:

Merged presentation2 branch back to trunk.
Major new features:

• Actual GUI with settings, etc.
• Improved space ship steering (human interaction)
• Rocket fire and more particle effects
• Advanced sound framework

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/gametypes/Asteroids.cc (modified) (2 diffs)
• src/orxonox/gametypes/Deathmatch.cc (modified) (6 diffs)
• src/orxonox/gametypes/Gametype.cc (modified) (4 diffs)
• src/orxonox/gametypes/Gametype.h (modified) (1 diff)
• src/orxonox/gametypes/TeamDeathmatch.cc (modified) (1 diff)
• src/orxonox/gametypes/UnderAttack.cc (modified) (3 diffs)

code/trunk/src/orxonox/gametypes/Asteroids.cc

@@ -72 +72 @@
         Gametype::start();
 
-        std::string message = "The match has started! Reach the first chekpoint within 15 seconds! But be aware, there may be pirates around...";
+        std::string message("The match has started! Reach the first chekpoint within 15 seconds! But be aware, there may be pirates around...");
         COUT(0) << message << std::endl;
         Host::Broadcast(message);
@@ -81 +81 @@
         Gametype::end();
 
-        std::string message = "The match has ended.";
+        std::string message("The match has ended.");
         COUT(0) << message << std::endl;
         Host::Broadcast(message);

code/trunk/src/orxonox/gametypes/Deathmatch.cc

@@ -47 +47 @@
         Gametype::start();
 
-        std::string message = "The match has started!";
+        std::string message("The match has started!");
         COUT(0) << message << std::endl;
         Host::Broadcast(message);
@@ -56 +56 @@
         Gametype::end();
 
-        std::string message = "The match has ended.";
+        std::string message("The match has ended.");
         COUT(0) << message << std::endl;
         Host::Broadcast(message);
@@ -65 +65 @@
         Gametype::playerEntered(player);
 
-        std::string message = player->getName() + " entered the game";
+        const std::string& message = player->getName() + " entered the game";
         COUT(0) << message << std::endl;
         Host::Broadcast(message);
@@ -76 +76 @@
         if (valid_player)
         {
-            std::string message = player->getName() + " left the game";
+            const std::string& message = player->getName() + " left the game";
             COUT(0) << message << std::endl;
             Host::Broadcast(message);
@@ -90 +90 @@
         if (valid_player)
         {
-            std::string message = player->getOldName() + " changed name to " + player->getName();
+            const std::string& message = player->getOldName() + " changed name to " + player->getName();
             COUT(0) << message << std::endl;
             Host::Broadcast(message);
@@ -126 +126 @@
         if (player)
         {
-            std::string message = player->getName() + " scores!";
+            const std::string& message = player->getName() + " scores!";
             COUT(0) << message << std::endl;
             Host::Broadcast(message);

code/trunk/src/orxonox/gametypes/Gametype.cc

@@ -51 +51 @@
     {
         RegisterObject(Gametype);
-        
+
         this->gtinfo_ = new GametypeInfo(creator);
 
@@ -71 +71 @@
 
         // load the corresponding score board
-        if (GameMode::showsGraphics() && this->scoreboardTemplate_ != "")
+        if (GameMode::showsGraphics() && !this->scoreboardTemplate_.empty())
         {
             this->scoreboard_ = new OverlayGroup(this);
@@ -79 +79 @@
         else
             this->scoreboard_ = 0;
-        
+
         /* HACK HACK HACK */
         this->hackAddBots_ = createConsoleCommand( createFunctor(&Gametype::addBots, this), "hackAddBots");
@@ -87 +87 @@
         /* HACK HACK HACK */
     }
-    
+
     Gametype::~Gametype()
     {

code/trunk/src/orxonox/gametypes/Gametype.h

@@ -184 +184 @@
             // Config Values
             std::string scoreboardTemplate_;
-            
+
             /* HACK HACK HACK */
             ConsoleCommand* hackAddBots_;

code/trunk/src/orxonox/gametypes/TeamDeathmatch.cc

@@ -61 +61 @@
         static std::vector<ColourValue> defaultcolours(colours, colours + sizeof(colours) / sizeof(ColourValue));
 
-        SetConfigValueVector(teamcolours_, defaultcolours);
+        SetConfigValue(teamcolours_, defaultcolours);
     }
 

code/trunk/src/orxonox/gametypes/UnderAttack.cc

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