[Wesnoth-cvs-commits] wesnoth/src dialogs.cpp display.cpp image.cpp i...

[Guillaume Melquiond]

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

Modified files:
        src            : dialogs.cpp display.cpp image.cpp image.hpp 

Log message:
        Remove unused parameters from image.cpp.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/dialogs.cpp.diff?tr1=1.72&tr2=1.73&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/display.cpp.diff?tr1=1.279&tr2=1.280&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/image.cpp.diff?tr1=1.66&tr2=1.67&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/image.hpp.diff?tr1=1.31&tr2=1.32&r1=text&r2=text

Patches:
Index: wesnoth/src/dialogs.cpp
diff -u wesnoth/src/dialogs.cpp:1.72 wesnoth/src/dialogs.cpp:1.73
--- wesnoth/src/dialogs.cpp:1.72        Sun Nov 21 21:15:56 2004
+++ wesnoth/src/dialogs.cpp     Sat Nov 27 09:49:44 2004
@@ -1,4 +1,4 @@
-/* $Id: dialogs.cpp,v 1.72 2004/11/21 21:15:56 silene Exp $ */
+/* $Id: dialogs.cpp,v 1.73 2004/11/27 09:49:44 silene Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -325,7 +325,7 @@
                        try {
                                map_->read(map_data);
 
-                               map_surf = 
image::getMinimap(100,100,*map_,0,NULL);
+                               map_surf = image::getMinimap(100, 100, *map_);
                                if(map_surf != NULL) {
                                        
map_cache_.insert(std::pair<std::string,surface>(map_data,surface(map_surf)));
                                }
Index: wesnoth/src/display.cpp
diff -u wesnoth/src/display.cpp:1.279 wesnoth/src/display.cpp:1.280
--- wesnoth/src/display.cpp:1.279       Sat Nov 27 09:31:06 2004
+++ wesnoth/src/display.cpp     Sat Nov 27 09:49:44 2004
@@ -1,4 +1,4 @@
-/* $Id: display.cpp,v 1.279 2004/11/27 09:31:06 silene Exp $ */
+/* $Id: display.cpp,v 1.280 2004/11/27 09:49:44 silene Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -1770,9 +1770,8 @@
        }
 
        if(minimap_ == NULL) {
-               minimap_ = image::getMinimap(w,h,map_,
-                               status_.get_time_of_day().lawful_bonus,
-                               team_valid() ? &teams_[currentTeam_] : NULL);
+               minimap_ = image::getMinimap(w, h, map_,
+                                            team_valid() ? 
&teams_[currentTeam_] : NULL);
        }
 
        return minimap_;
Index: wesnoth/src/image.cpp
diff -u wesnoth/src/image.cpp:1.66 wesnoth/src/image.cpp:1.67
--- wesnoth/src/image.cpp:1.66  Thu Nov 18 04:08:32 2004
+++ wesnoth/src/image.cpp       Sat Nov 27 09:49:44 2004
@@ -400,7 +400,7 @@
        }
 }
 
-surface get_unmasked(const locator i_locator, COLOUR_ADJUSTMENT adj)
+surface get_unmasked(const locator i_locator)
 {
        surface image(get_image(i_locator, UNSCALED));
 
@@ -511,7 +511,7 @@
                        res = get_scaled(i_locator, adj);
                        break;
                case UNMASKED:
-                       res = get_unmasked(i_locator, adj);
+                       res = get_unmasked(i_locator);
                        break;
                case GREYED:
                        res = get_greyed(i_locator, adj);
@@ -626,8 +626,7 @@
        return ret;
 }
 
-surface getMinimap(int w, int h, const gamemap& map, 
-               int lawful_bonus, const team* tm)
+surface getMinimap(int w, int h, const gamemap& map, const team* tm)
 {
        const int scale = 8;
 
Index: wesnoth/src/image.hpp
diff -u wesnoth/src/image.hpp:1.31 wesnoth/src/image.hpp:1.32
--- wesnoth/src/image.hpp:1.31  Sun Sep 19 03:50:24 2004
+++ wesnoth/src/image.hpp       Sat Nov 27 09:49:44 2004
@@ -185,7 +185,7 @@
 
        ///function to create the minimap for a given map
        ///the surface returned must be freed by the user
-       surface getMinimap(int w, int h, const gamemap& map_, int lawful_bonus, 
const team* tm=NULL);
+       surface getMinimap(int w, int h, const gamemap& map_, const team* 
tm=NULL);
 }
 
 #endif