[Wesnoth-cvs-commits] wesnoth ./changelog src/display.cpp

[ott]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     ott <address@hidden>    05/04/22 19:19:21

Modified files:
        .              : changelog 
        src            : display.cpp 

Log message:
        Fixed excess space in /me multiplayer emotes.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/changelog.diff?tr1=1.611&tr2=1.612&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/display.cpp.diff?tr1=1.317&tr2=1.318&r1=text&r2=text

Patches:
Index: wesnoth/changelog
diff -u wesnoth/changelog:1.611 wesnoth/changelog:1.612
--- wesnoth/changelog:1.611     Fri Apr 22 09:28:50 2005
+++ wesnoth/changelog   Fri Apr 22 19:19:20 2005
@@ -7,6 +7,7 @@
    * fixed bug #12654 causing prestart events to be shown to the player
    * fixed bug #12758: gendered unit types repeated in attack type tooltip
    * fixed bug #12612: no description in help for units at first encounter as 
upgrade
+   * fixed excess space in MP "/me " emotes
  * campaign improvements:
    * fixed bug in Northern Winter (HttT) where the Orcs attack each other
    * fixed the 'knockback' for WML Plague in TRoW
Index: wesnoth/src/display.cpp
diff -u wesnoth/src/display.cpp:1.317 wesnoth/src/display.cpp:1.318
--- wesnoth/src/display.cpp:1.317       Sun Apr 17 20:59:32 2005
+++ wesnoth/src/display.cpp     Fri Apr 22 19:19:21 2005
@@ -1,4 +1,4 @@
-/* $Id: display.cpp,v 1.317 2005/04/17 20:59:32 gruikya Exp $ */
+/* $Id: display.cpp,v 1.318 2005/04/22 19:19:21 ott Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -2295,22 +2295,23 @@
        SDL_Color message_colour = chat_message_colour;
        std::stringstream str;
        std::stringstream message_str;
-       message_str << msg;
        if(type == MESSAGE_PUBLIC) {
                if(action) {
-                       str << "<" << speaker;
-                       message_str << ">";
+                       str << "<" << speaker << " " << msg << ">";
                        message_colour = speaker_colour;
+                       message_str << " ";
                } else {
                        str << "<" << speaker << ">";
+                       message_str << msg;
                }
        } else {
                if(action) {
-                       str << "*" << speaker;
-                       message_str << "*";
+                       str << "*" << speaker << " " << msg << "*";
                        message_colour = speaker_colour;
+                       message_str << " ";
                } else {
                        str << "*" << speaker << "*";
+                       message_str << msg;
                }
        }