Changeset 6693

Timestamp:

Apr 12, 2010, 4:06:46 PM (14 years ago)

Author:

smerkli

Message:

questions resolved, ready for in-game testing.

Location:

code/branches/chat/src/orxonox

Files:

• ChatHistory.cc (modified) (3 diffs)
• ChatHistory.h (modified) (2 diffs)

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

@@ -33 +33 @@
 {
 #endif
-  /* QUESTION */
-  /* is this necessary? if yes uncomment please :P */
-  //CreateFactory(ChatHistory);
 
   /* constructor */
-  #ifndef TEST
+#ifndef TEST
   ChatHistory(BaseObject* creator) : BaseObject(creator) 
-  #else
+#else
   ChatHistory::ChatHistory()
-  #endif
+#endif
   {
     /* register the object */
-    #ifndef TEST
+#ifndef TEST
     RegisterObject(ChatHistory);
-    #endif
+#endif
 
     this->hist_log_enabled = true;
@@ -76 +73 @@
     unsigned int senderID)
   {
-    /* QUESTION */
-    /* sanity - check for valid senderID */
+    /* --> a) look up the actual name of the sender */
+    std::string text;
 
-    /* TODO make a correct name */
-    std::string name = "" + senderID; /* NOTE to be changed */
+#ifndef TEST
+    if (senderID != CLIENTID_UNKNOWN)
+    {
+       std::string name = "unknown";
+       PlayerInfo* player = PlayerManager::getInstance().getClient(senderID);
+       if (player)
+         name = player->getName();
 
-    /* TODO */
-    /* QUESTION */
-    /* --> a) look up the actual name of the sender */
-    /* --> b) add sender name and string up with a separator
-     *    to make up the actual message
-     */
+         text = name + ": " + message;
+    }
+    else
+      text = message;
+#else
+    text = message;
+#endif
 
     /* add the line to the history */
-    this->chat_hist_addline( name + ": " + message );
+    this->chat_hist_addline( text );
 
     /* add the line to the log */
-    this->chat_hist_logline( name + ": " + message );
+    this->chat_hist_logline( text );
   } 
 
@@ -125 +128 @@
   int ChatHistory::chat_hist_openlog()
   {
-    /* QUESTION */
     /* TODO: find out the name of the file to log to via settings 
      *       and set the this->hist_logfile_path variable to it
      */
-    this->hist_logfile.open( "/tmp/setsomepath.txt", 
+#ifndef TEST
+    this->hist_logfile.open( PathConfig::getInstance().getLogPathString() +
+      "chatlog.log",
       std::fstream::out | std::fstream::app );
+#else
+    this->hist_logfile.open( "/tmp/chatlog.log",
+      std::fstream::out | std::fstream::app );
+#endif
 
-    /* QUESTION */
     /* TODO check whether this works (not sure how you'd like it?) */
+    if( !this->hist_logfile )
+    { this->hist_log_enabled = false;
+#ifndef TEST
+      COUT(2) << "Warning: Could not open logfile." << std::endl;
+#endif
+    }
 
     /* if it worked */

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

@@ -33 +33 @@
 
 /* define this if you're unit testing */
-#define TEST 0
+#define TEST 1
 
 #ifndef TEST
 #include <core/BaseObject.h>
+#include <core/PathConfig.h>
 #endif
 
@@ -50 +51 @@
 
   /* constructor */
-  #ifndef TEST
+#ifndef TEST
   class _OrxonoxExport ChatHistory : public BaseObject, public ChatListener
-  #else
+#else
   class ChatHistory 
-  #endif
+#endif
   {
     public:
       /* constructors, destructors */
-      #ifndef TEST
+#ifndef TEST
       ChatHistory(BaseObject* creator);
-      #else
+#else
       ChatHistory();
-      #endif
+#endif
       virtual ~ChatHistory();