[Wesnoth-cvs-commits] wesnoth/src display.cpp display.hpp playturn.cp...

[Guillaume Melquiond]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Guillaume Melquiond <address@hidden>    04/11/22 21:39:14

Modified files:
        src            : display.cpp display.hpp playturn.cpp 
        src/editor     : editor.cpp 

Log message:
        Remove three unused parameters.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/display.cpp.diff?tr1=1.276&tr2=1.277&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/display.hpp.diff?tr1=1.84&tr2=1.85&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/playturn.cpp.diff?tr1=1.295&tr2=1.296&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/editor/editor.cpp.diff?tr1=1.86&tr2=1.87&r1=text&r2=text

Patches:
Index: wesnoth/src/display.cpp
diff -u wesnoth/src/display.cpp:1.276 wesnoth/src/display.cpp:1.277
--- wesnoth/src/display.cpp:1.276       Thu Nov 18 22:00:12 2004
+++ wesnoth/src/display.cpp     Mon Nov 22 21:39:13 2004
@@ -1,4 +1,4 @@
-/* $Id: display.cpp,v 1.276 2004/11/18 22:00:12 ydirson Exp $ */
+/* $Id: display.cpp,v 1.277 2004/11/22 21:39:13 silene Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -2153,7 +2153,7 @@
        return theme_;
 }
 
-const theme::menu* display::menu_pressed(int mousex, int mousey, bool 
button_pressed)
+const theme::menu* display::menu_pressed()
 {
 
        for(std::vector<gui::button>::iterator i = buttons_.begin(); i != 
buttons_.end(); ++i) {
Index: wesnoth/src/display.hpp
diff -u wesnoth/src/display.hpp:1.84 wesnoth/src/display.hpp:1.85
--- wesnoth/src/display.hpp:1.84        Thu Oct  7 18:42:59 2004
+++ wesnoth/src/display.hpp     Mon Nov 22 21:39:13 2004
@@ -1,4 +1,4 @@
-/* $Id: display.hpp,v 1.84 2004/10/07 18:42:59 silene Exp $ */
+/* $Id: display.hpp,v 1.85 2004/11/22 21:39:13 silene Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -302,7 +302,7 @@
 
        const theme& get_theme() const;
 
-       const theme::menu* menu_pressed(int mousex, int mousey, bool 
button_pressed);
+       const theme::menu* menu_pressed();
 
        void add_observer(const std::string& name);
        void remove_observer(const std::string& name);
Index: wesnoth/src/editor/editor.cpp
diff -u wesnoth/src/editor/editor.cpp:1.86 wesnoth/src/editor/editor.cpp:1.87
--- wesnoth/src/editor/editor.cpp:1.86  Sun Oct 31 20:42:17 2004
+++ wesnoth/src/editor/editor.cpp       Mon Nov 22 21:39:14 2004
@@ -1201,8 +1201,7 @@
                        update_mouse_over_hexes(cur_hex);
                        last_brush_size = brush_.selected_brush_size();
                }
-               const theme::menu* const m = gui_.menu_pressed(mousex, mousey,
-                                                                               
                           mouse_flags & SDL_BUTTON_LMASK);
+               const theme::menu* const m = gui_.menu_pressed();
                if (m != NULL) {
                        const SDL_Rect& menu_loc = 
m->location(gui_.screen_area());
                        const int x = menu_loc.x + 1;
Index: wesnoth/src/playturn.cpp
diff -u wesnoth/src/playturn.cpp:1.295 wesnoth/src/playturn.cpp:1.296
--- wesnoth/src/playturn.cpp:1.295      Sun Nov 21 22:08:27 2004
+++ wesnoth/src/playturn.cpp    Mon Nov 22 21:39:13 2004
@@ -1,4 +1,4 @@
-/* $Id: playturn.cpp,v 1.295 2004/11/21 22:08:27 silene Exp $ */
+/* $Id: playturn.cpp,v 1.296 2004/11/22 21:39:13 silene Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -158,7 +158,7 @@
 
        int mousex, mousey;
        const int mouse_flags = SDL_GetMouseState(&mousex,&mousey);
-       const theme::menu* const m = gui_.menu_pressed(mousex,mousey,true);
+       const theme::menu* const m = gui_.menu_pressed();
        if(m != NULL) {
                const SDL_Rect& menu_loc = m->location(gui_.screen_area());
                show_menu(m->items(),menu_loc.x+1,menu_loc.y + menu_loc.h + 
1,false);