mail[Wesnoth-commits] r44250 - in /trunk/src: display.hpp game_display.cpp game_display.hpp


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

Header


Content

Posted by alinktomine on July 17, 2010 - 15:30:
Author: alink
Date: Sat Jul 17 15:30:37 2010
New Revision: 44250

URL: http://svn.gna.org/viewcvs/wesnoth?rev=44250&view=rev
Log:
Fix constness of display::get_time_of_day and make it public

Modified:
    trunk/src/display.hpp
    trunk/src/game_display.cpp
    trunk/src/game_display.hpp

Modified: trunk/src/display.hpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/display.hpp?rev=44250&r1=44249&r2=44250&view=diff
==============================================================================
--- trunk/src/display.hpp (original)
+++ trunk/src/display.hpp Sat Jul 17 15:30:37 2010
@@ -478,6 +478,8 @@
        void set_report_content(const reports::TYPE which_report, const 
std::string &content);
        std::map<reports::TYPE, std::string> get_report_contents() const 
{return report_;};
 
+       virtual const time_of_day get_time_of_day(const map_location& 
/*loc*/) const {return time_of_day();}
+
 protected:
        /** Clear the screen contents */
        void clear_screen();
@@ -514,7 +516,6 @@
         */
        virtual void draw_hex(const map_location& loc);
 
-       virtual const time_of_day get_time_of_day(const map_location& 
/*loc*/) {return time_of_day();}
        /**
         * @returns the image type to be used for the passed hex
         * (mostly to do with brightening like for mouseover)

Modified: trunk/src/game_display.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/game_display.cpp?rev=44250&r1=44249&r2=44250&view=diff
==============================================================================
--- trunk/src/game_display.cpp (original)
+++ trunk/src/game_display.cpp Sat Jul 17 15:30:37 2010
@@ -412,7 +412,7 @@
        //simulate_delay += 1;
 }
 
-const time_of_day game_display::get_time_of_day(const map_location& loc)
+const time_of_day game_display::get_time_of_day(const map_location& loc) 
const
 {
        return tod_manager_.get_time_of_day(0,loc);
 }

Modified: trunk/src/game_display.hpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/game_display.hpp?rev=44250&r1=44249&r2=44250&view=diff
==============================================================================
--- trunk/src/game_display.hpp (original)
+++ trunk/src/game_display.hpp Sat Jul 17 15:30:37 2010
@@ -143,6 +143,8 @@
        /** Same as invalidate_unit() if moving the displayed unit. */
        void invalidate_unit_after_move(const map_location& src, const 
map_location& dst);
 
+       const time_of_day get_time_of_day(const map_location& loc) const;
+
 protected:
        /**
         * game_display pre_draw does specific things related e.g. to unit 
rendering
@@ -159,8 +161,6 @@
        void post_commit();
 
        void draw_hex(const map_location& loc);
-
-       const time_of_day get_time_of_day(const map_location& loc);
 
        /**
         * Animated hex invalidation specific to gameplay




Related Messages


Powered by MHonArc, Updated Sat Jul 17 15:40:18 2010