[Wesnoth-cvs-commits] wesnoth/src game.cpp show_dialog.cpp video.cpp

[Guillaume Melquiond]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Guillaume Melquiond <address@hidden>    05/06/03 05:28:48

Modified files:
        src            : game.cpp show_dialog.cpp video.cpp 

Log message:
        Fix compilation warnings.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/game.cpp.diff?tr1=1.249&tr2=1.250&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/show_dialog.cpp.diff?tr1=1.131&tr2=1.132&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/video.cpp.diff?tr1=1.65&tr2=1.66&r1=text&r2=text

Patches:
Index: wesnoth/src/game.cpp
diff -u wesnoth/src/game.cpp:1.249 wesnoth/src/game.cpp:1.250
--- wesnoth/src/game.cpp:1.249  Fri Jun  3 00:06:59 2005
+++ wesnoth/src/game.cpp        Fri Jun  3 05:28:48 2005
@@ -1,4 +1,4 @@
-/* $Id: game.cpp,v 1.249 2005/06/03 00:06:59 Sirp Exp $ */
+/* $Id: game.cpp,v 1.250 2005/06/03 05:28:48 silene Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -155,10 +155,10 @@
 };
 
 game_controller::game_controller(int argc, char** argv, bool use_sound)
-   : argc_(argc), arg_(1), argv_(argv),
+   : argc_(argc), arg_(1), argv_(argv), thread_manager(),
      sound_manager_(use_sound), test_mode_(false), multiplayer_mode_(false),
      no_gui_(false), use_caching_(true), force_bpp_(-1), disp_(NULL),
-     loaded_game_show_replay_(false), thread_manager()
+     loaded_game_show_replay_(false)
 {
        for(arg_ = 1; arg_ != argc_; ++arg_) {
                const std::string val(argv_[arg_]);
Index: wesnoth/src/show_dialog.cpp
diff -u wesnoth/src/show_dialog.cpp:1.131 wesnoth/src/show_dialog.cpp:1.132
--- wesnoth/src/show_dialog.cpp:1.131   Thu Jun  2 23:10:55 2005
+++ wesnoth/src/show_dialog.cpp Fri Jun  3 05:28:48 2005
@@ -1,4 +1,4 @@
-/* $Id: show_dialog.cpp,v 1.131 2005/06/02 23:10:55 Sirp Exp $ */
+/* $Id: show_dialog.cpp,v 1.132 2005/06/03 05:28:48 silene Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -923,7 +923,6 @@
 {
        const size_t width = 250;
        const size_t height = 20;
-       const size_t border = 20;
        const int left = disp.x()/2 - width/2;
        const int top = disp.y()/2 - height/2;
 
Index: wesnoth/src/video.cpp
diff -u wesnoth/src/video.cpp:1.65 wesnoth/src/video.cpp:1.66
--- wesnoth/src/video.cpp:1.65  Thu Jun  2 23:12:59 2005
+++ wesnoth/src/video.cpp       Fri Jun  3 05:28:48 2005
@@ -1,4 +1,4 @@
-/* $Id: video.cpp,v 1.65 2005/06/02 23:12:59 Sirp Exp $ */
+/* $Id: video.cpp,v 1.66 2005/06/03 05:28:48 silene Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -339,7 +339,6 @@
                        sum += update_rects[n].w*update_rects[n].h;
                }
 
-               const int t = SDL_GetTicks();
                const size_t redraw_whole_screen_threshold = 80;
                if(sum > ((getx()*gety())*redraw_whole_screen_threshold)/100) {
                        ::SDL_Flip(frameBuffer);