[PlaneShift-svn] SF.net SVN: planeshift:[6735] trunk

[<wel...@us...>]

Revision: 6735
          http://planeshift.svn.sourceforge.net/planeshift/?rev=6735&view=rev
Author:   weltall2
Date:     2011-01-09 12:07:24 +0000 (Sun, 09 Jan 2011)

Log Message:
-----------
removed spaces at the end of the bracket string

Modified Paths:
--------------
    trunk/data/options/chat_def.xml
    trunk/src/client/gui/chatwindow.cpp

Modified: trunk/data/options/chat_def.xml
===================================================================
--- trunk/data/options/chat_def.xml	2011-01-09 11:57:35 UTC (rev 6734)
+++ trunk/data/options/chat_def.xml	2011-01-09 12:07:24 UTC (rev 6735)
@@ -7,32 +7,32 @@
         <loose value="0" />
         <defaultlastchat value="0" />
         <chatWidget value="chat_basic.xml" />
-        <CHAT_SYSTEM log="0" file="system.txt" />
-        <CHAT_COMBAT log="0" file="system.txt" />
-        <CHAT_SAY log="1" file="chat.txt" />
-        <CHAT_TELL log="1" file="chat.txt" />
-        <CHAT_GROUP log="1" file="chat.txt" />
-        <CHAT_GUILD log="1" file="chat.txt" />
-        <CHAT_ALLIANCE log="1" file="chat.txt" />
-        <CHAT_AUCTION log="1" file="chat.txt" />
-        <CHAT_SHOUT log="1" file="chat.txt" />
-        <CHAT_CHANNEL log="1" file="chat.txt" />
-        <CHAT_TELLSELF log="1" file="chat.txt" />
-        <CHAT_REPORT log="1" file="chat.txt" />
-        <CHAT_ADVISOR log="1" file="chat.txt" />
-        <CHAT_ADVICE log="1" file="chat.txt" />
-        <CHAT_ADVICE_LIST log="1" file="chat.txt" />
-        <CHAT_SERVER_TELL log="1" file="chat.txt" />
-        <CHAT_GM log="1" file="chat.txt" />
-        <CHAT_SERVER_INFO log="0" file="system.txt" />
-        <CHAT_NPC log="1" file="chat.txt" />
-        <CHAT_NPCINTERNAL log="1" file="chat.txt" />
-        <CHAT_SYSTEM_BASE log="0" file="system.txt" />
-        <CHAT_PET_ACTION log="1" file="chat.txt" />
-        <CHAT_NPC_ME log="1" file="chat.txt" />
-        <CHAT_NPC_MY log="1" file="chat.txt" />
-        <CHAT_NPC_NARRATE log="1" file="chat.txt" />
-        <CHAT_AWAY log="1" file="chat.txt" />
+        <CHAT_SYSTEM log="0" file="chat.txt" bracket="" />
+        <CHAT_COMBAT log="0" file="chat.txt" bracket="" />
+        <CHAT_SAY log="1" file="chat.txt" bracket="" />
+        <CHAT_TELL log="1" file="chat.txt" bracket="[Tell]" />
+        <CHAT_GROUP log="1" file="chat.txt" bracket="[Group]" />
+        <CHAT_GUILD log="1" file="chat.txt" bracket="[Guild]" />
+        <CHAT_ALLIANCE log="1" file="chat.txt" bracket="[Alliance]" />
+        <CHAT_AUCTION log="1" file="chat.txt" bracket="[Auction]" />
+        <CHAT_SHOUT log="1" file="chat.txt" bracket="" />
+        <CHAT_CHANNEL log="1" file="chat.txt" bracket="[Channel]" />
+        <CHAT_TELLSELF log="1" file="chat.txt" bracket="[Tell]" />
+        <CHAT_REPORT log="1" file="chat.txt" bracket="" />
+        <CHAT_ADVISOR log="1" file="chat.txt" bracket="[Help]" />
+        <CHAT_ADVICE log="1" file="chat.txt" bracket="[Help]" />
+        <CHAT_ADVICE_LIST log="1" file="chat.txt" bracket="[Help]" />
+        <CHAT_SERVER_TELL log="1" file="chat.txt" bracket="" />
+        <CHAT_GM log="1" file="chat.txt" bracket="" />
+        <CHAT_SERVER_INFO log="1" file="chat.txt" bracket="" />
+        <CHAT_NPC log="1" file="chat.txt" bracket="[NPC]" />
+        <CHAT_NPCINTERNAL log="1" file="chat.txt" bracket="[NPC]" />
+        <CHAT_SYSTEM_BASE log="0" file="chat.txt" bracket="" />
+        <CHAT_PET_ACTION log="1" file="chat.txt" bracket="" />
+        <CHAT_NPC_ME log="1" file="chat.txt" bracket="[NPC]" />
+        <CHAT_NPC_MY log="1" file="chat.txt" bracket="[NPC]" />
+        <CHAT_NPC_NARRATE log="1" file="chat.txt" bracket="[NPC]" />
+        <CHAT_AWAY log="1" file="chat.txt" bracket="[Tell]" />
     </chatoptions>
     <bindings>
     <listener name="subMainText">

Modified: trunk/src/client/gui/chatwindow.cpp
===================================================================
--- trunk/src/client/gui/chatwindow.cpp	2011-01-09 11:57:35 UTC (rev 6734)
+++ trunk/src/client/gui/chatwindow.cpp	2011-01-09 12:07:24 UTC (rev 6735)
@@ -964,9 +964,11 @@
         strftime(buf, 32, "(%H:%M:%S)", newtime);
         csString buffer;
         #ifdef _WIN32
-        buffer.Format("%s %s%s\r\n", buf, settings.channelBracket[type].GetDataSafe(), message);
+        buffer.Format("%s %s%s%s\r\n", buf, settings.channelBracket[type].GetDataSafe(),
+                       settings.channelBracket[type].Length() ? " " :"", message);
         #else
-        buffer.Format("%s %s%s\n", buf, settings.channelBracket[type].GetDataSafe(), message);
+        buffer.Format("%s %s%s%s\n", buf, settings.channelBracket[type].GetDataSafe(),
+                       settings.channelBracket[type].Length() ? " " :"", message);
         #endif
         logFile[type]->Write(buffer.GetData(), buffer.Length());
         logFile[type]->Flush();
@@ -2319,27 +2321,27 @@
         case CHAT_TELL:
         case CHAT_AWAY:
         case CHAT_TELLSELF:
-            return "[Tell] ";
+            return "[Tell]";
         case CHAT_GUILD:
-            return "[Guild] ";
+            return "[Guild]";
         case CHAT_ALLIANCE:
-            return "[Alliance] ";
+            return "[Alliance]";
         case CHAT_GROUP:
-            return "[Group] ";
+            return "[Group]";
         case CHAT_AUCTION:
-            return "[Auction] ";
+            return "[Auction]";
         case CHAT_ADVISOR:
         case CHAT_ADVICE:
         case CHAT_ADVICE_LIST:
-            return "[Help] ";
+            return "[Help]";
         case CHAT_NPC:
         case CHAT_NPC_ME:
         case CHAT_NPC_MY:
         case CHAT_NPC_NARRATE:
         case CHAT_NPCINTERNAL:
-            return "[NPC] ";
+            return "[NPC]";
         case CHAT_CHANNEL:
-            return "[Channel] ";
+            return "[Channel]";
     }
     return "";
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.