mail[Wesnoth-commits] r44010 - in /trunk/src: game_display.cpp time_of_day.cpp time_of_day.hpp tod_manager.cpp


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

Header


Content

Posted by alinktomine on July 08, 2010 - 23:04:
Author: alink
Date: Thu Jul  8 23:04:19 2010
New Revision: 44010

URL: http://svn.gna.org/viewcvs/wesnoth?rev=44010&view=rev
Log:
Revert r43989 "Disable ToD color shift for [time_area] (where a different ToD 
is used)"
A bit ugly and doesn't work with hex highlighting

Modified:
    trunk/src/game_display.cpp
    trunk/src/time_of_day.cpp
    trunk/src/time_of_day.hpp
    trunk/src/tod_manager.cpp

Modified: trunk/src/game_display.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/game_display.cpp?rev=44010&r1=44009&r2=44010&view=diff
==============================================================================
--- trunk/src/game_display.cpp (original)
+++ trunk/src/game_display.cpp Thu Jul  8 23:04:19 2010
@@ -291,11 +291,6 @@
                        }
                }
        }
-       time_of_day tod = tod_manager_.get_time_of_day(0, loc);
-
-       if(tod.local)
-               return image::UNMASKED;
-
        return image::SCALED_TO_HEX;
 }
 

Modified: trunk/src/time_of_day.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/time_of_day.cpp?rev=44010&r1=44009&r2=44010&view=diff
==============================================================================
--- trunk/src/time_of_day.cpp (original)
+++ trunk/src/time_of_day.cpp Thu Jul  8 23:04:19 2010
@@ -21,7 +21,6 @@
 
 time_of_day::time_of_day(const config& cfg):
        lawful_bonus(cfg["lawful_bonus"]), bonus_modified(0),
-       local(false),
        image(cfg["image"]), name(cfg["name"].t_str()), id(cfg["id"]),
        image_mask(cfg["mask"]),
        red(cfg["red"]), green(cfg["green"]), blue(cfg["blue"]),
@@ -32,7 +31,6 @@
 time_of_day::time_of_day()
 : lawful_bonus(0)
 , bonus_modified(0)
-, local(false)
 , image()
 , name("NULL_TOD")
 , id("nulltod")

Modified: trunk/src/time_of_day.hpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/time_of_day.hpp?rev=44010&r1=44009&r2=44010&view=diff
==============================================================================
--- trunk/src/time_of_day.hpp (original)
+++ trunk/src/time_of_day.hpp Thu Jul  8 23:04:19 2010
@@ -45,9 +45,6 @@
        int lawful_bonus;
        int bonus_modified;
 
-       /** Indicate if it's local ToD (in a [time_area]) */
-       bool local;
-
        /** The image to be displayed in the game status. */
        std::string image;
        t_string name;

Modified: trunk/src/tod_manager.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/tod_manager.cpp?rev=44010&r1=44009&r2=44010&view=diff
==============================================================================
--- trunk/src/tod_manager.cpp (original)
+++ trunk/src/tod_manager.cpp Thu Jul  8 23:04:19 2010
@@ -129,7 +129,6 @@
                                VALIDATE(i->times.size(), _("No time of day 
has been defined."));
 
                                res = i->times[(n_turn-1)%i->times.size()];
-                               res.local = true;
                                break;
                        }
                }




Related Messages


Powered by MHonArc, Updated Thu Jul 08 23:40:08 2010