[Wesnoth-cvs-commits] wesnoth/src multiplayer_lobby.cpp playturn.cpp ...

[Guillaume Melquiond]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Guillaume Melquiond <address@hidden>    04/11/27 10:53:22

Modified files:
        src            : multiplayer_lobby.cpp playturn.cpp tooltips.cpp 
                         tooltips.hpp 

Log message:
        Remove unused parameters and fix font drawing invokation in 
tooltips.cpp.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_lobby.cpp.diff?tr1=1.51&tr2=1.52&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/playturn.cpp.diff?tr1=1.300&tr2=1.301&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/tooltips.cpp.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/tooltips.hpp.diff?tr1=1.5&tr2=1.6&r1=text&r2=text

Patches:
Index: wesnoth/src/multiplayer_lobby.cpp
diff -u wesnoth/src/multiplayer_lobby.cpp:1.51 
wesnoth/src/multiplayer_lobby.cpp:1.52
--- wesnoth/src/multiplayer_lobby.cpp:1.51      Thu Nov 18 04:08:32 2004
+++ wesnoth/src/multiplayer_lobby.cpp   Sat Nov 27 10:53:22 2004
@@ -265,11 +265,8 @@
                        }
 
                        int mousex, mousey;
-                       const int mouse_flags = 
SDL_GetMouseState(&mousex,&mousey);
-
-                       const bool left_button = mouse_flags&SDL_BUTTON_LMASK;
-
-                       tooltips::process(mousex,mousey,left_button);
+                       SDL_GetMouseState(&mousex,&mousey);
+                       tooltips::process(mousex, mousey);
 
                        if(dlg != NULL) {
                                const RESULT res = dlg->process();
Index: wesnoth/src/playturn.cpp
diff -u wesnoth/src/playturn.cpp:1.300 wesnoth/src/playturn.cpp:1.301
--- wesnoth/src/playturn.cpp:1.300      Sat Nov 27 08:41:49 2004
+++ wesnoth/src/playturn.cpp    Sat Nov 27 10:53:22 2004
@@ -1,4 +1,4 @@
-/* $Id: playturn.cpp,v 1.300 2004/11/27 08:41:49 silene Exp $ */
+/* $Id: playturn.cpp,v 1.301 2004/11/27 10:53:22 silene Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -156,8 +156,6 @@
        events::raise_process_event();
        events::raise_draw_event();
 
-       int mousex, mousey;
-       const int mouse_flags = SDL_GetMouseState(&mousex,&mousey);
        const theme::menu* const m = gui_.menu_pressed();
        if(m != NULL) {
                const SDL_Rect& menu_loc = m->location(gui_.screen_area());
@@ -165,7 +163,9 @@
                return;
        }
 
-       tooltips::process(mousex,mousey,mouse_flags & SDL_BUTTON_LMASK);
+       int mousex, mousey;
+       SDL_GetMouseState(&mousex,&mousey);
+       tooltips::process(mousex, mousey);
 
        const int scroll_threshold = 5;
 
Index: wesnoth/src/tooltips.cpp
diff -u wesnoth/src/tooltips.cpp:1.18 wesnoth/src/tooltips.cpp:1.19
--- wesnoth/src/tooltips.cpp:1.18       Thu Nov 18 04:08:32 2004
+++ wesnoth/src/tooltips.cpp    Sat Nov 27 10:53:22 2004
@@ -137,7 +137,7 @@
        current_tooltip = tips.end();
 }
 
-void process(int mousex, int mousey, bool lbutton)
+void process(int mousex, int mousey)
 {
        for(std::vector<tooltip>::const_iterator i = tips.begin(); i != 
tips.end(); ++i) {
                if(mousex > i->rect.x && mousey > i->rect.y &&
@@ -157,9 +157,9 @@
 
 SDL_Rect draw_text(display* gui, const SDL_Rect& area, int size,
                    const SDL_Color& colour, const std::string& text,
-                   int x, int y, surface bg)
+                   int x, int y)
 {
-       return font::draw_text(gui,area,size,colour,text,x,y,bg,true);
+       return font::draw_text(gui, area, size, colour, text, x, y, true);
 }
 
 }
Index: wesnoth/src/tooltips.hpp
diff -u wesnoth/src/tooltips.hpp:1.5 wesnoth/src/tooltips.hpp:1.6
--- wesnoth/src/tooltips.hpp:1.5        Tue Jul 20 11:56:58 2004
+++ wesnoth/src/tooltips.hpp    Sat Nov 27 10:53:22 2004
@@ -17,14 +17,14 @@
 void clear_tooltips();
 void clear_tooltips(const SDL_Rect& rect);
 void add_tooltip(const SDL_Rect& rect, const std::string& message);
-void process(int mousex, int mousey, bool lbutton);
+void process(int mousex, int mousey);
 
 
 //a function exactly the same as font::draw_text, but will also register
 //a tooltip
 SDL_Rect draw_text(display* gui, const SDL_Rect& area, int size,
                    const SDL_Color& colour, const std::string& text,
-                   int x, int y, surface bg=NULL);
+                   int x, int y);
 
 }