[PlaneShift-svn] SF.net SVN: planeshift:[2150] personal/Acissej

[<mr...@us...>]

Revision: 2150
          http://planeshift.svn.sourceforge.net/planeshift/?rev=2150&view=rev
Author:   mr_dave
Date:     2008-09-03 09:03:15 +0000 (Wed, 03 Sep 2008)

Log Message:
-----------
Merged r2143-2144 from trunk

Modified Paths:
--------------
    personal/Acissej/docs/history.txt
    personal/Acissej/src/client/gui/chatwindow.cpp
    personal/Acissej/src/server/Jamfile

Modified: personal/Acissej/docs/history.txt
===================================================================
--- personal/Acissej/docs/history.txt	2008-09-03 01:28:17 UTC (rev 2149)
+++ personal/Acissej/docs/history.txt	2008-09-03 09:03:15 UTC (rev 2150)
@@ -1,6 +1,10 @@
 *** 2008-09-02 by Dave Bentham
 - Minigames moved to own database table. DB VER BUMPED to 1194.
 
+*** 2008-09-01 by Steven Patrick
+- Fix for FS#2207 - Doing actions with /shout /me does not work, patch by
+  Caarrie.
+
 *** 2008-08-31 by Dave Bentham
 - WRITEABLE flag used in Maps.
 

Modified: personal/Acissej/src/client/gui/chatwindow.cpp
===================================================================
--- personal/Acissej/src/client/gui/chatwindow.cpp	2008-09-03 01:28:17 UTC (rev 2149)
+++ personal/Acissej/src/client/gui/chatwindow.cpp	2008-09-03 09:03:15 UTC (rev 2150)
@@ -1286,7 +1286,12 @@
         }
         case CHAT_SHOUT:
         {
-            buff.Format(PawsManager::GetSingleton().Translate("%s shouts: %s"),
+            if ( msg.sText.StartsWith("/me ") )
+                buff.Format("*%s %s*", (const char *)msg.sPerson, ((const char *)msg.sText)+4);
+            else if ( msg.sText.StartsWith("/my ") )
+                buff.Format("*%s's %s*", (const char *)msg.sPerson, ((const char *)msg.sText)+4);
+            else
+                buff.Format(PawsManager::GetSingleton().Translate("%s shouts: %s"),
                         (const char *)msg.sPerson, (const char *)msg.sText);
             colour = settings.shoutColor;
             break;
@@ -1314,7 +1319,12 @@
 
         case CHAT_AUCTION:
         {
-            buff.Format(PawsManager::GetSingleton().Translate("%s from %s: %s"), pType,
+            if ( msg.sText.StartsWith("/me ") )
+                buff.Format("*%s %s*", (const char *)msg.sPerson, ((const char *)msg.sText)+4);
+            else if ( msg.sText.StartsWith("/my ") )
+                buff.Format("*%s's %s*", (const char *)msg.sPerson, ((const char *)msg.sText)+4);
+            else
+                buff.Format(PawsManager::GetSingleton().Translate("%s from %s: %s"), pType,
                         (const char *)msg.sPerson, (const char *)msg.sText);
             colour = settings.auctionColor;
             break;

Modified: personal/Acissej/src/server/Jamfile
===================================================================
--- personal/Acissej/src/server/Jamfile	2008-09-03 01:28:17 UTC (rev 2149)
+++ personal/Acissej/src/server/Jamfile	2008-09-03 09:03:15 UTC (rev 2150)
@@ -16,7 +16,7 @@
 SubVariant static ;
 Application psserver_static : [ Wildcard *.cpp *.h ] $(extrafiles) : console independent noinstall nohelp ;
 CFlags psserver_static : [ FDefines CS_STATIC_LINKED ] ;
-LFlags psserver_static : -lcrystalspace_staticplugins-1.3 ;
+LFlags psclient_static : -lcrystalspace_staticplugins-$(CRYSTAL.VERSION)
 MsvcDefine psserver_static : CS_STATIC_LINKED ;
 LinkWith psserver_static : dbmysqlstatic bulkobjects fparser psnet psengine psutil psrpgrules ;
 


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