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

[Cedric Duval]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Cedric Duval <[EMAIL PROTECTED]>        04/09/23 12:54:55

Modified files:
        src            : dialogs.cpp 

Log message:
        Eradicated C style cast.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/dialogs.cpp.diff?tr1=1.56&tr2=1.57&r1=text&r2=text

Patches:
Index: wesnoth/src/dialogs.cpp
diff -u wesnoth/src/dialogs.cpp:1.56 wesnoth/src/dialogs.cpp:1.57
--- wesnoth/src/dialogs.cpp:1.56        Wed Sep 22 00:05:33 2004
+++ wesnoth/src/dialogs.cpp     Thu Sep 23 12:54:54 2004
@@ -1,4 +1,4 @@
-/* $Id: dialogs.cpp,v 1.56 2004/09/22 00:05:33 cedricd Exp $ */
+/* $Id: dialogs.cpp,v 1.57 2004/09/23 12:54:54 cedricd Exp $ */
 /*
    Copyright (C) 2003 by David White <[EMAIL PROTECTED]>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -807,8 +807,8 @@
                int max_height = area.h-(txt_area.h+txt_area.y-area.y);
 
                src_rect.x = src_rect.y = 0;
-               src_rect.w = minimum((int)area.w,img->w);
-               src_rect.h = minimum(max_height,img->h);
+               src_rect.w = minimum<int>(area.w,img->w);
+               src_rect.h = minimum<int>(max_height,img->h);
                dst_rect.x = area.x+(area.w-src_rect.w)/2;
                dst_rect.y = txt_area.y+(max_height-src_rect.h)/2;