mail[Wesnoth-commits] r44449 - /trunk/src/display.hpp


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

Header


Content

Posted by alinktomine on July 20, 2010 - 21:55:
Author: alink
Date: Tue Jul 20 21:55:16 2010
New Revision: 44449

URL: http://svn.gna.org/viewcvs/wesnoth?rev=44449&view=rev
Log:
Fix a merging error in r44447

Modified:
    trunk/src/display.hpp

Modified: trunk/src/display.hpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/display.hpp?rev=44449&r1=44448&r2=44449&view=diff
==============================================================================
--- trunk/src/display.hpp (original)
+++ trunk/src/display.hpp Tue Jul 20 21:55:16 2010
@@ -468,7 +468,7 @@
         */
        void redraw_minimap() { redrawMinimap_ = true; }
 
-       virtual const time_of_day get_time_of_day(const map_location& 
/*loc*/) const {return time_of_day();}
+       virtual const time_of_day& get_time_of_day(const map_location& 
/*loc*/) const;
 
 protected:
        /** Clear the screen contents */




Related Messages


Powered by MHonArc, Updated Tue Jul 20 22:20:06 2010