Changeset 6699

Timestamp:

Apr 12, 2010, 5:32:12 PM (14 years ago)

Author:

smerkli

Message:

shit works xD

Location:

code/branches/chat/src

Files:

• libraries/network/ChatListener.cc (modified) (1 diff)
• orxonox/ChatHistory.cc (modified) (4 diffs)
• orxonox/ChatHistory.h (modified) (3 diffs)

code/branches/chat/src/libraries/network/ChatListener.cc

@@ -37 +37 @@
     }
 
-    void ChatListener::incomingChat( const std::string& message,
-      unsigned int senderID )
-    {
-      COUT(0) << "Chat: \"" << message << "\"\n";
+    //void ChatListener::incomingChat( const std::string& message,
+      //unsigned int senderID )
+    //{
+      //COUT(0) << "Chat: \"" << message << "\"\n";
 
 
-    }
+    //}
 
 

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

@@ -28 +28 @@
 
 #include "ChatHistory.h"
-#include "core/ScopedSingletonManager.h"
+#include <core/ScopedSingletonManager.h>
 
 #ifndef CHATTEST
@@ -39 +39 @@
   /* constructor */
 #ifndef CHATTEST
-  ChatHistory(BaseObject* creator) : BaseObject(creator) 
+  //ChatHistory::ChatHistory( BaseObject* creator ) : BaseObject(creator) 
+  ChatHistory::ChatHistory() 
 #else
   ChatHistory::ChatHistory()
@@ -58 +59 @@
       this->chat_hist_logline( "--- Logfile opened ---" );
     }
-
-    assert(0);
 
     /* Read setting for maximum number of lines and set limit */
@@ -142 +141 @@
      */
 #ifndef CHATTEST
-    this->hist_logfile.open( PathConfig::getInstance().getLogPathString() +
-      "chatlog.log",
+    this->hist_logfile.open( (PathConfig::getInstance().getLogPathString() +
+      "chatlog.log").c_str(),
       std::fstream::out | std::fstream::app );
 #else

code/branches/chat/src/orxonox/ChatHistory.h

@@ -34 +34 @@
 
 /* define this if you're unit testing */
-#define CHATTEST 0
+//#define CHATTEST 
 
 #ifndef CHATTEST
+#include <OrxonoxPrereqs.h>
+#include <PlayerManager.h>
+#include <infos/PlayerInfo.h>
 #include <core/BaseObject.h>
+#include <network/ChatListener.h>
 #include <core/PathConfig.h>
-#include <Singleton.h>
+#include <util/Singleton.h>
 #endif
 
@@ -54 +58 @@
   /* constructor */
 #ifndef CHATTEST
-  class _OrxonoxExport ChatHistory : public BaseObject, public ChatListener,
+  class _OrxonoxExport ChatHistory : public ChatListener,
     public Singleton<ChatHistory>
 
@@ -64 +68 @@
       /* constructors, destructors */
 #ifndef CHATTEST
-      ChatHistory(BaseObject* creator);
+      ChatHistory();
       friend class Singleton<ChatHistory>;
 #else