[Wesnoth-cvs-commits] wesnoth/src multiplayer_lobby.cpp widgets/menu.cpp

[Guillaume Melquiond]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Guillaume Melquiond <address@hidden>    04/11/12 19:35:16

Modified files:
        src            : multiplayer_lobby.cpp 
        src/widgets    : menu.cpp 

Log message:
        64bit compilation fix. See patch #3517.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_lobby.cpp.diff?tr1=1.49&tr2=1.50&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/widgets/menu.cpp.diff?tr1=1.72&tr2=1.73&r1=text&r2=text

Patches:
Index: wesnoth/src/multiplayer_lobby.cpp
diff -u wesnoth/src/multiplayer_lobby.cpp:1.49 
wesnoth/src/multiplayer_lobby.cpp:1.50
--- wesnoth/src/multiplayer_lobby.cpp:1.49      Wed Nov  3 21:46:58 2004
+++ wesnoth/src/multiplayer_lobby.cpp   Fri Nov 12 19:35:15 2004
@@ -119,7 +119,7 @@
        
                                                //generate a unique id to show 
the map as
                                                char buf[50];
-                                               sprintf(buf,"addr 
%d",(int)(SDL_Surface*)mini);
+                                               sprintf(buf,"addr %p", 
(SDL_Surface*)mini);
        
                                                image::register_image(buf,mini);
        
Index: wesnoth/src/widgets/menu.cpp
diff -u wesnoth/src/widgets/menu.cpp:1.72 wesnoth/src/widgets/menu.cpp:1.73
--- wesnoth/src/widgets/menu.cpp:1.72   Sat Nov  6 20:26:14 2004
+++ wesnoth/src/widgets/menu.cpp        Fri Nov 12 19:35:16 2004
@@ -262,8 +262,8 @@
                        x = event.button.x;
                        y = event.button.y;
                } else {
-                       x = (int)event.user.data1;
-                       y = (int)event.user.data2;
+                       x = (long)event.user.data1;
+                       y = (long)event.user.data2;
                }
 
                const int item = hit(x,y);