Changeset 7062 for code/branches/presentation3/src/orxonox/infos

Timestamp:

May 31, 2010, 4:55:05 PM (14 years ago)

Author:

jo

Message:

coloured messages, different spaceships in one level, with bug

Location:

code/branches/presentation3/src/orxonox/infos

Files:

• GametypeInfo.cc (modified) (2 diffs)
• GametypeInfo.h (modified) (2 diffs)

code/branches/presentation3/src/orxonox/infos/GametypeInfo.cc

@@ -112 +112 @@
     }
 
-    void GametypeInfo::sendStaticMessage(const std::string& message, unsigned int clientID)
+    void GametypeInfo::sendStaticMessage(const std::string& message, unsigned int clientID, const ColourValue& colour)
     {
         if (GameMode::isMaster())
         {
             if (clientID == CLIENTID_SERVER)
-                this->dispatchStaticMessage(message);
+                this->dispatchStaticMessage(message, colour);
             else
-                callMemberNetworkFunction(GametypeInfo, dispatchStaticMessage, this->getObjectID(), clientID, message);
+                callMemberNetworkFunction(GametypeInfo, dispatchStaticMessage, this->getObjectID(), clientID, message, colour);
         }
     }
@@ -152 +152 @@
     }
 
-     void GametypeInfo::dispatchStaticMessage(const std::string& message)
+     void GametypeInfo::dispatchStaticMessage(const std::string& message, const ColourValue& colour)
     {
         for (ObjectList<GametypeMessageListener>::iterator it = ObjectList<GametypeMessageListener>::begin(); it != ObjectList<GametypeMessageListener>::end(); ++it)
-            it->staticmessage(this, message);
+            it->staticmessage(this, message, colour);
     }
     

code/branches/presentation3/src/orxonox/infos/GametypeInfo.h

@@ -64 +64 @@
             void sendKillMessage(const std::string& message, unsigned int clientID);
             void sendDeathMessage(const std::string& message, unsigned int clientID);
-            void sendStaticMessage(const std::string& message, unsigned int clientID);
+            void sendStaticMessage(const std::string& message, unsigned int clientID, const ColourValue& colour);
             void sendFadingMessage(const std::string& message, unsigned int clientID);
 
@@ -70 +70 @@
             void dispatchKillMessage(const std::string& message);
             void dispatchDeathMessage(const std::string& message);
-            void dispatchStaticMessage(const std::string& message);
+            void dispatchStaticMessage(const std::string& message,const ColourValue& colour);
             void dispatchFadingMessage(const std::string& message);