Changeset 1534 for code/trunk/src/network/Client.cc

Timestamp:

Jun 4, 2008, 8:53:10 PM (16 years ago)

Author:

rgrieder

Message:

merged network branch back to trunk

File:

• code/trunk/src/network/Client.cc (modified) (3 diffs)

code/trunk/src/network/Client.cc

@@ -42 +42 @@
 #include "Synchronisable.h"
 #include "core/CoreIncludes.h"
+#include "core/ConsoleCommand.h"
+#include "Server.h"
 
 namespace network
 {
+  SetConsoleCommandShortcut(Client, Chat);
+  
   Client* Client::_sClient = 0;
   
@@ -142 +146 @@
   
 
+  void Client::Chat( std::string message ){
+    if(Client::getSingleton())
+      Client::getSingleton()->sendChat(message);
+    else if(Server::getSingleton())
+      Server::getSingleton()->sendChat(message);
+    else
+      COUT(1) << "do you want to monologize ??" << std::endl;
+  }
   
 
@@ -224 +236 @@
   }
 
-  void Client::processChat( chat *data){
-    COUT(0) << "Server: " << data->message << std::endl;
+  void Client::processChat( chat *data, int clientId){
+    COUT(1) << data->message << std::endl;
     delete[] data->message;
     delete data;