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


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

Header


Content

Posted by esr on August 20, 2008 - 16:37:
Author: esr
Date: Wed Aug 20 16:37:02 2008
New Revision: 28789

URL: http://svn.gna.org/viewcvs/wesnoth?rev=28789&view=rev
Log:
Address incorrect use of carryover bonus in bug #11607.

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=28789&r1=28788&r2=28789&view=diff
==============================================================================
--- trunk/src/playsingle_controller.cpp (original)
+++ trunk/src/playsingle_controller.cpp Wed Aug 20 16:37:02 2008
@@ -443,7 +443,7 @@
                                                 map_.villages().size() * 
game_config::village_income +
                                                 game_config::base_income;
                                const int turns_left = 
maximum<int>(0,status_.number_of_turns() - status_.turn());
-                               const int finishing_bonus = 
end_level.gold_bonus ?
+                               const int finishing_bonus = 
(end_level.gold_bonus && (turns_left > -1)) ?
                                                 (finishing_bonus_per_turn * 
turns_left) : 0;
 
                                for(i=teams_.begin(); i!=teams_.end(); ++i) {




Related Messages


Powered by MHonArc, Updated Wed Aug 20 17:41:19 2008