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

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/modules

Files:

• gametypes/RaceCheckPoint.cc (modified) (6 diffs)
• gametypes/SpaceRace.cc (modified) (6 diffs)
• overlays/hud/ChatOverlay.cc (modified) (1 diff)

code/branches/output/src/modules/gametypes/RaceCheckPoint.cc

@@ -29 +29 @@
 #include "RaceCheckPoint.h"
 
+#include "util/Convert.h"
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
+#include "network/Host.h"
 #include "SpaceRace.h"
-#include "util/Convert.h"
 
 namespace orxonox
 {
     CreateFactory(RaceCheckPoint);
-    
+
     RaceCheckPoint::RaceCheckPoint(BaseObject* creator): DistanceTrigger(creator), RadarViewable(creator, static_cast<WorldEntity*>(this))
     {
@@ -50 +51 @@
         this->setRadarVisibility(false);
     }
-    
+
     RaceCheckPoint::~RaceCheckPoint()
     {
     }
-    
+
     void RaceCheckPoint::tick(float dt)
     {
@@ -66 +67 @@
     }
 
-    
+
     void RaceCheckPoint::XMLPort(Element& xmlelement, XMLPort::Mode mode)
     {
@@ -75 +76 @@
         XMLPortParam(RaceCheckPoint, "timelimit", setTimelimit, getTimeLimit, xmlelement, mode).defaultValues(0);
     }
-    
+
     void RaceCheckPoint::triggered(bool bIsTriggered)
     {
@@ -99 +100 @@
         }
     }
-    
+
     void RaceCheckPoint::setTimelimit(float timeLimit)
     {
@@ -110 +111 @@
                 const std::string& message =  "You have " + multi_cast<std::string>(this->bTimeLimit_)
                             + " seconds to reach the check point " + multi_cast<std::string>(this->bCheckpointIndex_+1);
-                orxout(level::message) << message << endl;
                 const_cast<GametypeInfo*>(gametype->getGametypeInfo())->sendAnnounceMessage(message);
+                Host::Broadcast(message);
             }
         }
     }
-    
+
 }

code/branches/output/src/modules/gametypes/SpaceRace.cc

@@ -38 +38 @@
 {
     CreateUnloadableFactory(SpaceRace);
-    
+
     SpaceRace::SpaceRace(BaseObject* creator) : Gametype(creator)
     {
@@ -46 +46 @@
         this->numberOfBots_ = 0;
     }
-    
+
     void SpaceRace::end()
     {
         this->Gametype::end();
-          
+
         if (this->bTimeIsUp_)
         {
@@ -59 +59 @@
                         + "You didn't reach the check point " + multi_cast<std::string>(this->bCheckpointsReached_+1)
                         + " before the time limit. You lose!";
-            orxout(level::message) << message << endl;
             const_cast<GametypeInfo*>(this->getGametypeInfo())->sendAnnounceMessage(message);
             Host::Broadcast(message);
@@ -70 +69 @@
             const std::string& message = "You win!! You have reached the last check point after "+ multi_cast<std::string>(s)
                         + "." + multi_cast<std::string>(ms) + " seconds.";
-            orxout(level::message) << message << endl;
             const_cast<GametypeInfo*>(this->getGametypeInfo())->sendAnnounceMessage(message);
             Host::Broadcast(message);
+/*
             float time = this->clock_.getSecondsPrecise();
             this->scores_.insert(time);
             std::set<float>::iterator it;
             for (it=this->scores_.begin(); it!=this->scores_.end(); it++)
-            orxout(level::message) << multi_cast<std::string>(*it) << endl;
+                orxout(level::message) << multi_cast<std::string>(*it) << endl;
+*/
         }
     }
@@ -86 +86 @@
 
         std::string message("The match has started! Reach the check points as quickly as possible!");
-        orxout(level::message) << message << endl;
         Host::Broadcast(message);
     }
-    
+
     void SpaceRace::newCheckpointReached()
     {
@@ -99 +98 @@
                         + " reached after " + multi_cast<std::string>(s) + "." + multi_cast<std::string>(ms)
                         + " seconds.";
-        orxout(level::message) << message << endl;
         const_cast<GametypeInfo*>(this->getGametypeInfo())->sendAnnounceMessage(message);
         Host::Broadcast(message);

code/branches/output/src/modules/overlays/hud/ChatOverlay.cc

@@ -87 +87 @@
 
         this->messages_.push_back(multi_cast<Ogre::DisplayString>(text));
-        orxout(level::message) << "Chat: " << text << endl;
 
         Timer* timer = new Timer();