[Wesnoth-cvs-commits] wesnoth/src builder.hpp display.hpp help.cpp

[Guillaume Melquiond]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Guillaume Melquiond <address@hidden>    04/12/02 07:59:49

Modified files:
        src            : builder.hpp display.hpp help.cpp 

Log message:
        A few fixes for compiling on Irix native compiler.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/builder.hpp.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/display.hpp.diff?tr1=1.87&tr2=1.88&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/help.cpp.diff?tr1=1.56&tr2=1.57&r1=text&r2=text

Patches:
Index: wesnoth/src/builder.hpp
diff -u wesnoth/src/builder.hpp:1.25 wesnoth/src/builder.hpp:1.26
--- wesnoth/src/builder.hpp:1.25        Sat Sep 11 21:22:57 2004
+++ wesnoth/src/builder.hpp     Thu Dec  2 07:59:49 2004
@@ -1,4 +1,4 @@
-/* $Id: builder.hpp,v 1.25 2004/09/11 21:22:57 gruikya Exp $ */
+/* $Id: builder.hpp,v 1.26 2004/12/02 07:59:49 silene Exp $ */
 /*
    Copyright (C) 2004 by Philippe Plantier <address@hidden>
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -50,7 +50,7 @@
 
        //updates the animation at a given tile. returns true if something has
        //changed, and must be redrawn.
-       bool terrain_builder::update_animation(const gamemap::location &loc);
+       bool update_animation(const gamemap::location &loc);
 
        // regenerate the generated content at the given
        // location. Currently: set the image at that location to the
Index: wesnoth/src/display.hpp
diff -u wesnoth/src/display.hpp:1.87 wesnoth/src/display.hpp:1.88
--- wesnoth/src/display.hpp:1.87        Sat Nov 27 09:31:06 2004
+++ wesnoth/src/display.hpp     Thu Dec  2 07:59:49 2004
@@ -1,4 +1,4 @@
-/* $Id: display.hpp,v 1.87 2004/11/27 09:31:06 silene Exp $ */
+/* $Id: display.hpp,v 1.88 2004/12/02 07:59:49 silene Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -55,7 +55,7 @@
        display(unit_map& units, CVideo& video,
                        const gamemap& map, const gamestatus& status,
                        const std::vector<team>& t, const config& theme_cfg,
-                       const config& config, const config& level);
+                       const config& cfg, const config& level);
        ~display();
 
        Uint32 rgb(Uint8 red, Uint8 green, Uint8 blue);
Index: wesnoth/src/help.cpp
diff -u wesnoth/src/help.cpp:1.56 wesnoth/src/help.cpp:1.57
--- wesnoth/src/help.cpp:1.56   Mon Nov 22 23:48:55 2004
+++ wesnoth/src/help.cpp        Thu Dec  2 07:59:49 2004
@@ -1446,7 +1446,7 @@
 }
 
 help_menu::help_menu(display &disp, section const &toplevel, int max_height)
-       : menu(disp, empty_string_vector, false, max_height),
+       : gui::menu(disp, empty_string_vector, false, max_height),
          toplevel_(toplevel), chosen_topic_(NULL), selected_item_(&toplevel, 
"") {
        update_visible_items(toplevel_);
        display_visible_items();