Changeset 8822 for code/branches/output/src/libraries/network

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

File:

• code/branches/output/src/libraries/network/Host.cc (modified) (2 diffs)

code/branches/output/src/libraries/network/Host.cc

@@ -91 +91 @@
   void Host::Chat(const std::string& message)
   {
-    if(instances_s.size()==0)
+    for (ObjectList<ChatListener>::iterator it = ObjectList<ChatListener>::begin(); it != ObjectList<ChatListener>::end(); ++it)
+      it->incomingChat(message, 0);
+
+    bool result = true;
+    for( std::vector<Host*>::iterator it = instances_s.begin(); it!=instances_s.end(); ++it )
     {
-      for (ObjectList<ChatListener>::iterator it = ObjectList<ChatListener>::begin(); it != ObjectList<ChatListener>::end(); ++it)
-        it->incomingChat(message, 0);
-//      return true;
+      if( (*it)->isActive() )
+      {
+        if( !(*it)->chat(message) )
+          result = false;
+      }
     }
-    else
-    {
-      bool result = true;
-      for( std::vector<Host*>::iterator it = instances_s.begin(); it!=instances_s.end(); ++it )
-      {
-        if( (*it)->isActive() )
-        {
-          if( !(*it)->chat(message) )
-            result = false;
-        }
-      }
-//      return result;
-    }
+//    return result;
   }
 
   bool Host::Broadcast(const std::string& message)
   {
-    if(instances_s.size()==0)
+    for (ObjectList<ChatListener>::iterator it = ObjectList<ChatListener>::begin(); it != ObjectList<ChatListener>::end(); ++it)
+      it->incomingChat(message, NETWORK_PEER_ID_BROADCAST);
+
+    bool result = true;
+    for( std::vector<Host*>::iterator it = instances_s.begin(); it!=instances_s.end(); ++it )
     {
-      for (ObjectList<ChatListener>::iterator it = ObjectList<ChatListener>::begin(); it != ObjectList<ChatListener>::end(); ++it)
-        it->incomingChat(message, NETWORK_PEER_ID_BROADCAST);
-      return true;
+      if( (*it)->isActive() )
+      {
+        if( !(*it)->broadcast(message) )
+          result = false;
+      }
     }
-    else
-    {
-      bool result = true;
-      for( std::vector<Host*>::iterator it = instances_s.begin(); it!=instances_s.end(); ++it )
-      {
-        if( (*it)->isActive() )
-        {
-          if( !(*it)->broadcast(message) )
-            result = false;
-        }
-      }
-      return result;
-    }
+    return result;
   }
 
@@ -161 +149 @@
     return false;
   }
-  
+
   Host* Host::getActiveInstance()
   {