mail[Wesnoth-commits] r40431 - /trunk/src/playsingle_controller.cpp


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by fabianmueller5 on December 27, 2009 - 19:50:
Author: fendrin
Date: Sun Dec 27 19:50:07 2009
New Revision: 40431

URL: http://svn.gna.org/viewcvs/wesnoth?rev=40431&view=rev
Log:
Set the amount of gold carried over to 0 in the carryover dialog if it is 
negative.
That fixes bug #14765 without a string frezze. 
I am not sure if the bug report should be closed or kept open for a 
stringchange after the release.

Modified:
    trunk/src/playsingle_controller.cpp

Modified: trunk/src/playsingle_controller.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/playsingle_controller.cpp?rev=40431&r1=40430&r2=40431&view=diff
==============================================================================
--- trunk/src/playsingle_controller.cpp (original)
+++ trunk/src/playsingle_controller.cpp Sun Dec 27 19:50:07 2009
@@ -235,7 +235,10 @@
 
        std::string goldmsg;
        utils::string_map symbols;
-       symbols["gold"] = lexical_cast_default<std::string>(player_gold);
+
+       if (player_gold < 0) { symbols["gold"] = "0"; }
+       else { symbols["gold"] = 
lexical_cast_default<std::string>(player_gold); }
+
        // Note that both strings are the same in english, but some languages 
will
        // want to translate them differently.
        if(end_level.carryover_add) {




Related Messages


Powered by MHonArc, Updated Sun Dec 27 22:20:13 2009