Changeset 6698 for code/branches/chat/src/orxonox/ChatHistory.cc

Timestamp:

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

Author:

smerkli

Message:

ChatHistory is not being constructed, no idea why.

File:

• code/branches/chat/src/orxonox/ChatHistory.cc (modified) (10 diffs)

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

@@ -28 +28 @@
 
 #include "ChatHistory.h"
+#include "core/ScopedSingletonManager.h"
 
-#ifndef TEST
+#ifndef CHATTEST
 namespace orxonox
 {
+  /* singleton */
+  ManageScopedSingleton( ChatHistory, ScopeID::Root, false );
 #endif
 
   /* constructor */
-#ifndef TEST
+#ifndef CHATTEST
   ChatHistory(BaseObject* creator) : BaseObject(creator) 
 #else
@@ -42 +45 @@
   {
     /* register the object */
-#ifndef TEST
+#ifndef CHATTEST
     RegisterObject(ChatHistory);
 #endif
@@ -55 +58 @@
       this->chat_hist_logline( "--- Logfile opened ---" );
     }
+
+    assert(0);
 
     /* Read setting for maximum number of lines and set limit */
@@ -76 +81 @@
     std::string text;
 
-#ifndef TEST
+    COUT(0) << "Meow.\n";
+
+#ifndef CHATTEST
     if (senderID != CLIENTID_UNKNOWN)
     {
@@ -104 +111 @@
     //if( this->hist_logfile )
       //this->hist_logfile.sync();
+    return 0;
   }
 
@@ -115 +123 @@
     /* push to the front of the history */
     this->hist_buffer.push_back( toadd );
+    return 0;
   }
 
@@ -123 +132 @@
     if( this->hist_log_enabled )
       this->hist_logfile << toadd << std::endl;
+    return 0;
   }
 
@@ -131 +141 @@
      *       and set the this->hist_logfile_path variable to it
      */
-#ifndef TEST
+#ifndef CHATTEST
     this->hist_logfile.open( PathConfig::getInstance().getLogPathString() +
       "chatlog.log",
@@ -143 +153 @@
     if( !this->hist_logfile )
     { this->hist_log_enabled = false;
-#ifndef TEST
+#ifndef CHATTEST
       COUT(2) << "Warning: Could not open logfile." << std::endl;
 #endif
@@ -176 +186 @@
   }
 
-#ifndef TEST
+#ifndef CHATTEST
 }
 #endif