Changeset 8826 for code/branches

Timestamp:

Aug 6, 2011, 3:40:37 PM (13 years ago)

Author:

landauf

Message:

display chat messages without sender without name (currently used for gameplay messages)

Location:

code/branches/output/src

Files:

• modules/overlays/hud/ChatOverlay.cc (modified) (1 diff)
• orxonox/ChatHistory.cc (modified) (2 diffs)
• orxonox/ChatInputHandler.cc (modified) (3 diffs)

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

@@ -69 +69 @@
     void ChatOverlay::incomingChat(const std::string& message, unsigned int senderID)
     {
-        std::string text;
+        std::string text = message;
 
         if (senderID != NETWORK_PEER_ID_UNKNOWN)
         {
-            std::string name = "unknown";
-
             PlayerInfo* player = PlayerManager::getInstance().getClient(senderID);
             if (player)
-                name = player->getName();
-
-            text = name + ": " + message;
-        }
-        else
-        {
-            text = message;
+                text = player->getName() + ": " + message;
         }
 

code/branches/output/src/orxonox/ChatHistory.cc

@@ -78 +78 @@
   {
     /* --> a) look up the actual name of the sender */
-    std::string text;
+    std::string text = message;
 
 #ifndef CHATTEST
@@ -84 +84 @@
     if (senderID != NETWORK_PEER_ID_UNKNOWN)
     {
-      /* if we can't find anything, use "unknown" as default */
-      std::string name = "unknown";
-
       PlayerInfo* player = PlayerManager::getInstance().getClient(senderID);
       if (player)
-        name = player->getName();
-
-      text = name + ": " + message;
+        text = player->getName() + ": " + message;
     }
-    else
-      text = message;
-#else
-    text = message;
 #endif
 

code/branches/output/src/orxonox/ChatInputHandler.cc

@@ -217 +217 @@
   {
     /* look up the actual name of the sender */
-    std::string text, name = "unknown";
+    std::string text = message;
+    std::string name = "";
 
     /* setup player name info */
@@ -224 +225 @@
        PlayerInfo* player = PlayerManager::getInstance().getClient(senderID);
        if (player)
+       {
          name = player->getName();
-    }
-
-    /* assemble the text */
-    text = name + ": " + message;
+         text = name + ": " + message;
+       }
+    }
 
     /* create item */
@@ -234 +235 @@
 
     /* setup colors */
-    sub_setcolor( toadd, name );
+    if (name != "")
+      sub_setcolor( toadd, name );
 
     /* now add */