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

[Guillaume Melquiond]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Guillaume Melquiond <address@hidden>    04/11/27 09:31:06

Modified files:
        src            : display.cpp display.hpp 

Log message:
        Remove unused parameters.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/display.cpp.diff?tr1=1.278&tr2=1.279&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/display.hpp.diff?tr1=1.86&tr2=1.87&r1=text&r2=text

Patches:
Index: wesnoth/src/display.cpp
diff -u wesnoth/src/display.cpp:1.278 wesnoth/src/display.cpp:1.279
--- wesnoth/src/display.cpp:1.278       Sat Nov 27 09:05:11 2004
+++ wesnoth/src/display.cpp     Sat Nov 27 09:31:06 2004
@@ -1,4 +1,4 @@
-/* $Id: display.cpp,v 1.278 2004/11/27 09:05:11 silene Exp $ */
+/* $Id: display.cpp,v 1.279 2004/11/27 09:31:06 silene Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -723,12 +723,12 @@
        }
 
        if(invalidateGameStatus_) {
-               
draw_game_status(mapx()+SideBarGameStatus_x,SideBarGameStatus_y);
+               draw_game_status();
                invalidateGameStatus_ = false;
        }
 }
 
-void display::draw_game_status(int x, int y)
+void display::draw_game_status()
 {
        if(teams_.empty())
                return;
@@ -738,7 +738,7 @@
        }       
 }
 
-void display::draw_image_for_report(surface& img, surface& surf, SDL_Rect& 
rect)
+void display::draw_image_for_report(surface& img, SDL_Rect& rect)
 {
        SDL_Rect visible_area = get_non_transperant_portion(img);
        SDL_Rect target = rect;
@@ -864,7 +864,7 @@
                                        area.y = y;
                                        area.w = minimum<int>(rect.w + rect.x - 
x, img->w);
                                        area.h = minimum<int>(rect.h + rect.y - 
y, img->h);
-                                       draw_image_for_report(img,surf,area);
+                                       draw_image_for_report(img, area);
 
                                        if(area.h > tallest) tallest = area.h;
                                        x += area.w;
Index: wesnoth/src/display.hpp
diff -u wesnoth/src/display.hpp:1.86 wesnoth/src/display.hpp:1.87
--- wesnoth/src/display.hpp:1.86        Sat Nov 27 09:05:11 2004
+++ wesnoth/src/display.hpp     Sat Nov 27 09:31:06 2004
@@ -1,4 +1,4 @@
-/* $Id: display.hpp,v 1.86 2004/11/27 09:05:11 silene Exp $ */
+/* $Id: display.hpp,v 1.87 2004/11/27 09:31:06 silene Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -365,14 +365,13 @@
 
        void draw_sidebar();
        void draw_minimap(int x, int y, int w, int h);
-       void draw_game_status(int x, int y);
+       void draw_game_status();
 
        SDL_Rect gameStatusRect_;
        SDL_Rect unitDescriptionRect_;
        SDL_Rect unitProfileRect_;
 
-       void draw_image_for_report(surface& img, 
-                       surface& surf, SDL_Rect& rect);
+       void draw_image_for_report(surface& img, SDL_Rect& rect);
        void draw_report(reports::TYPE report_num);
        SDL_Rect reportRects_[reports::NUM_REPORTS];
        surface reportSurfaces_[reports::NUM_REPORTS];