From d4c9f10efe815af146438cafb694d16da0e5650a Mon Sep 17 00:00:00 2001
From: Paul Buetow <paul@buetow.org>
Date: Sat, 6 Apr 2013 13:14:47 +0200
Subject: tagging ychat-0.7.0

---
 src/mods/commands/yc_topic.cpp | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'src/mods/commands/yc_topic.cpp')

diff --git a/src/mods/commands/yc_topic.cpp b/src/mods/commands/yc_topic.cpp
index 5541dc4..1f5587e 100755
--- a/src/mods/commands/yc_topic.cpp
+++ b/src/mods/commands/yc_topic.cpp
@@ -19,13 +19,11 @@ extern "C" {
         string s_topic;
         string s_col;
 
-        room* p_room = p_user->get_room();
-
         if ( ! params->empty() )
         {
          vector<string>::iterator iter;
 
-         s_col = "<font color=\"" + p_user->get_col1() + "\">"; 
+         s_col = "<font color=" + p_user->get_col2() + ">"; 
 
          s_msg = p_timr->get_time()
                + " "
@@ -53,26 +51,24 @@ extern "C" {
           p_user->msg_post ( &s_private_msg ); 
          }
 
-         s_topic = "( " + s_topic + ")";
-         p_room->set_topic( s_topic, p_user->get_col1() );
+         s_topic = "( " + s_col + s_topic + "</font>)<br><br>";
         } 
 
         else
         {
          s_msg = p_timr->get_time()
                + " "
-               + p_user->get_colored_bold_name()
+               + p_user->get_colored_name()
                + " "
                + p_conf->get_elem("chat.msgs.topicdelete");
-
-         p_room->set_topic( "" );
         }
 
         s_msg.append( "<script confuage='JavaScript'>parent.online.location.reload();</script><br>\n" );
 
-        p_room->msg_post ( &s_msg  );
+        room* p_room = p_user->get_room();
 
-	return 0;
+        p_room->set_topic( s_topic );
+        p_room->msg_post ( &s_msg  );
  }
 }
 
-- 
cgit v1.2.3