mail[Wesnoth-commits] r24821 - in /trunk/src: game_display.hpp unit_animation.hpp


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

Header


Content

Posted by bruno on March 19, 2008 - 16:41:
Author: brunowolff
Date: Wed Mar 19 16:41:16 2008
New Revision: 24821

URL: http://svn.gna.org/viewcvs/wesnoth?rev=24821&view=rev
Log:
Silence gcc 4.3 warnings about const return types.

Modified:
    trunk/src/game_display.hpp
    trunk/src/unit_animation.hpp

Modified: trunk/src/game_display.hpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/game_display.hpp?rev=24821&r1=24820&r2=24821&view=diff
==============================================================================
--- trunk/src/game_display.hpp (original)
+++ trunk/src/game_display.hpp Wed Mar 19 16:41:16 2008
@@ -158,7 +158,7 @@
        //! set_playing_team sets the team whose turn it currently is
        void set_team(size_t team, bool observe=false);
        void set_playing_team(size_t team);
-       const size_t get_playing_team() const {return activeTeam_;};
+       size_t get_playing_team() const {return activeTeam_;};
        const std::vector<team>& get_teams() {return teams_;};
 
        unit_map& get_units() {return units_;};

Modified: trunk/src/unit_animation.hpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/unit_animation.hpp?rev=24821&r1=24820&r2=24821&view=diff
==============================================================================
--- trunk/src/unit_animation.hpp (original)
+++ trunk/src/unit_animation.hpp Wed Mar 19 16:41:16 2008
@@ -53,7 +53,7 @@
                int get_animation_time() const{ return 
unit_anim_.get_animation_time() ; };
                int get_animation_time_potential() const{ return 
unit_anim_.get_animation_time_potential() ; };
                void start_animation(int start_time,const gamemap::location 
&src = gamemap::location::null_location, const gamemap::location &dst = 
gamemap::location::null_location , bool cycles=false, const std::string 
text="", const Uint32 text_color=0,const bool accelerate = true);
-               const int get_current_frame_begin_time() const{ return 
unit_anim_.get_current_frame_begin_time() ; };
+               int get_current_frame_begin_time() const{ return 
unit_anim_.get_current_frame_begin_time() ; };
                void redraw();
 
        friend class unit;




Related Messages


Powered by MHonArc, Updated Wed Mar 19 17:02:14 2008