mail[Wesnoth-commits] r33825 - /trunk/src/playmp_controller.cpp


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

Header


Content

Posted by shadowm2006 on March 18, 2009 - 14:51:
Author: shadowmaster
Date: Wed Mar 18 14:51:07 2009
New Revision: 33825

URL: http://svn.gna.org/viewcvs/wesnoth?rev=33825&view=rev
Log:
Oops. The mp_countdown attribute is internal to the MP protocol.
Reverting r33823 and r33824.

Modified:
    trunk/src/playmp_controller.cpp

Modified: trunk/src/playmp_controller.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/playmp_controller.cpp?rev=33825&r1=33824&r2=33825&view=diff
==============================================================================
--- trunk/src/playmp_controller.cpp (original)
+++ trunk/src/playmp_controller.cpp Wed Mar 18 14:51:07 2009
@@ -243,7 +243,7 @@
                        throw e;
                }
 
-               if (!linger_ && (current_team().countdown_time() > 0) && 
utils::string_bool(level_["mp_countdown"])) {
+               if (!linger_ && (current_team().countdown_time() > 0) && 
(level_["mp_countdown"] == "yes")) {
                        SDL_Delay(1);
                        const int ticks = SDL_GetTicks();
                        int new_time = 
current_team().countdown_time()-std::max<int>(1,(ticks - cur_ticks));
@@ -427,7 +427,7 @@
 }
 
 void playmp_controller::after_human_turn(){
-       if ( utils::string_bool(level_["mp_countdown"]) ){
+       if ( level_["mp_countdown"] == "yes" ){
                const int action_increment = 
lexical_cast_default<int>(level_["mp_countdown_action_bonus"],0);
                const int maxtime = 
lexical_cast_default<int>(level_["mp_countdown_reservoir_time"],0);
                int secs = (current_team().countdown_time() / 1000) + 
lexical_cast_default<int>(level_["mp_countdown_turn_bonus"],0);




Related Messages


Powered by MHonArc, Updated Wed Mar 18 15:00:19 2009