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

[Philippe Plantier]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Philippe Plantier <address@hidden>      05/04/13 18:47:20

Modified files:
        src            : display.cpp display.hpp theme.cpp video.cpp 
                         video.hpp 

Log message:
        Fixed bug #12386: Background glitch when changing from windowed to 
fullscreen mode and vice versa.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/display.cpp.diff?tr1=1.314&tr2=1.315&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/display.hpp.diff?tr1=1.101&tr2=1.102&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/theme.cpp.diff?tr1=1.36&tr2=1.37&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/video.cpp.diff?tr1=1.63&tr2=1.64&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/video.hpp.diff?tr1=1.34&tr2=1.35&r1=text&r2=text

Patches:
Index: wesnoth/src/display.cpp
diff -u wesnoth/src/display.cpp:1.314 wesnoth/src/display.cpp:1.315
--- wesnoth/src/display.cpp:1.314       Wed Apr  6 21:35:39 2005
+++ wesnoth/src/display.cpp     Wed Apr 13 18:47:20 2005
@@ -1,4 +1,4 @@
-/* $Id: display.cpp,v 1.314 2005/04/06 21:35:39 gruikya Exp $ */
+/* $Id: display.cpp,v 1.315 2005/04/13 18:47:20 gruikya Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -968,6 +968,7 @@
        }
 }
 
+#if 0
 void display::draw_unit_details(int x, int y, const gamemap::location& loc,
          const unit& u, SDL_Rect& description_rect, int profilex, int profiley,
          SDL_Rect* clip_rect)
@@ -1102,6 +1103,7 @@
                update_rect(profilex,profiley,profilew,profileh);
        }
 }
+#endif
 
 void display::draw_minimap(int x, int y, int w, int h)
 {
Index: wesnoth/src/display.hpp
diff -u wesnoth/src/display.hpp:1.101 wesnoth/src/display.hpp:1.102
--- wesnoth/src/display.hpp:1.101       Thu Mar 24 21:35:50 2005
+++ wesnoth/src/display.hpp     Wed Apr 13 18:47:20 2005
@@ -1,4 +1,4 @@
-/* $Id: display.hpp,v 1.101 2005/03/24 21:35:50 ydirson Exp $ */
+/* $Id: display.hpp,v 1.102 2005/04/13 18:47:20 gruikya Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -240,6 +240,7 @@
        //function to serialize overlay data
        void write_overlays(config& cfg) const;
 
+#if 0
        //function which draws the details of the unit at the given location, at
        //(x,y) on-screen. xprofile and yprofile are the size of the unit's 
image.
        //this function is suitable for drawing a unit's details on the sidebar,
@@ -248,6 +249,7 @@
        void draw_unit_details(int x, int y, const gamemap::location& loc,
                               const unit& u, SDL_Rect& description_rect,
                               int xprofile,int yprofile,SDL_Rect* 
clip_rect=NULL);
+#endif
 
        //function which copies the backbuffer to the framebuffer.
        void update_display();
Index: wesnoth/src/theme.cpp
diff -u wesnoth/src/theme.cpp:1.36 wesnoth/src/theme.cpp:1.37
--- wesnoth/src/theme.cpp:1.36  Sun Mar 27 23:06:17 2005
+++ wesnoth/src/theme.cpp       Wed Apr 13 18:47:20 2005
@@ -434,7 +434,8 @@
 
        const config::child_list& resolutions = cfg_.get_children("resolution");
        int current_rating = 1000000;
-       config::child_list::const_iterator i, current = resolutions.end();
+       config::child_list::const_iterator i;
+       config::child_list::const_iterator current = resolutions.end();
        for(i = resolutions.begin(); i != resolutions.end(); ++i) {
                const int width = atoi((**i)["width"].c_str());
                const int height = atoi((**i)["height"].c_str());
Index: wesnoth/src/video.cpp
diff -u wesnoth/src/video.cpp:1.63 wesnoth/src/video.cpp:1.64
--- wesnoth/src/video.cpp:1.63  Sat Mar 26 17:10:32 2005
+++ wesnoth/src/video.cpp       Wed Apr 13 18:47:20 2005
@@ -1,4 +1,4 @@
-/* $Id: video.cpp,v 1.63 2005/03/26 17:10:32 silene Exp $ */
+/* $Id: video.cpp,v 1.64 2005/04/13 18:47:20 gruikya Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -120,9 +120,9 @@
        return frameBuffer;
 }
 
-const SDL_Rect& screen_area()
+SDL_Rect screen_area()
 {
-       static const SDL_Rect res = {0,0,frameBuffer->w,frameBuffer->h};
+       const SDL_Rect res = {0,0,frameBuffer->w,frameBuffer->h};
        return res;
 }
 
Index: wesnoth/src/video.hpp
diff -u wesnoth/src/video.hpp:1.34 wesnoth/src/video.hpp:1.35
--- wesnoth/src/video.hpp:1.34  Thu Mar 24 21:35:52 2005
+++ wesnoth/src/video.hpp       Wed Apr 13 18:47:20 2005
@@ -1,4 +1,4 @@
-/* $Id: video.hpp,v 1.34 2005/03/24 21:35:52 ydirson Exp $ */
+/* $Id: video.hpp,v 1.35 2005/04/13 18:47:20 gruikya Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -23,7 +23,7 @@
 
 surface display_format_alpha(surface surf);
 surface get_video_surface();
-const SDL_Rect& screen_area();
+SDL_Rect screen_area();
 
 bool non_interactive();