[netPanzer-CVS] netpanzer/src/NetPanzer Interfaces/MouseInterfa...

[Ivo Danihelka]

CVSROOT:        /cvsroot/netpanzer
Module name:    netpanzer
Branch:         
Changes by:     Ivo Danihelka <address@hidden>  03/09/22 18:21:46

Modified files:
        src/NetPanzer/Interfaces: MouseInterface.hpp 
        src/NetPanzer/Classes: WorldInputCmdProcessor.cpp 

Log message:
        Fixed strange long/int mouse bug

Patches:
Index: netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.cpp
diff -u netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.cpp:1.17 
netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.cpp:1.18
--- netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.cpp:1.17     Tue Sep 
16 16:16:11 2003
+++ netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.cpp  Mon Sep 22 
18:21:46 2003
@@ -536,11 +536,10 @@
     iXY world_pos;
     iXY mouse_pos;
 
-    MouseInterface::getMousePosition( (long *)  &mouse_pos.x, (long *) 
&mouse_pos.y );
-
+    MouseInterface::getMousePosition( &mouse_pos.x, &mouse_pos.y );
     WorldViewInterface::getViewWindow( &world_win );
-    WorldViewInterface::clientXYtoWorldXY( world_win, mouse_pos, &world_pos );
 
+    WorldViewInterface::clientXYtoWorldXY( world_win, mouse_pos, &world_pos );
     setMouseCursor( getCursorStatus( world_pos ) );
 
     //updateScrollStatus( mouse_pos );
@@ -947,7 +946,7 @@
     iXY world_pos;
     iXY mouse_pos;
 
-    MouseInterface::getMousePosition( (long *)  &mouse_pos.x, (long *) 
&mouse_pos.y );
+    MouseInterface::getMousePosition( &mouse_pos.x, &mouse_pos.y );
 
     WorldViewInterface::getViewWindow( &world_win );
     WorldViewInterface::clientXYtoWorldXY( world_win, mouse_pos, &world_pos );
@@ -963,7 +962,7 @@
     iXY mouse_pos;
 
     if ( selection_box_active == true ) {
-        MouseInterface::getMousePosition( (long *) &mouse_pos.x, (long *) 
&mouse_pos.y );
+        MouseInterface::getMousePosition( &mouse_pos.x, &mouse_pos.y );
 
         WorldViewInterface::getViewWindow( &world_win );
         WorldViewInterface::worldXYtoClientXY( world_win, box_press, 
&client_pos );
@@ -992,7 +991,7 @@
     iXY world_pos;
     iXY mouse_pos;
 
-    MouseInterface::getMousePosition( (long *)  &mouse_pos.x, (long *) 
&mouse_pos.y );
+    MouseInterface::getMousePosition( &mouse_pos.x, &mouse_pos.y );
 
     WorldViewInterface::getViewWindow( &world_win );
     WorldViewInterface::clientXYtoWorldXY( world_win, mouse_pos, &world_pos );
Index: netpanzer/src/NetPanzer/Interfaces/MouseInterface.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/MouseInterface.hpp:1.9 
netpanzer/src/NetPanzer/Interfaces/MouseInterface.hpp:1.10
--- netpanzer/src/NetPanzer/Interfaces/MouseInterface.hpp:1.9   Tue Sep 16 
16:16:12 2003
+++ netpanzer/src/NetPanzer/Interfaces/MouseInterface.hpp       Mon Sep 22 
18:21:46 2003
@@ -100,7 +100,7 @@
     static void initialize();
     static void shutdown();
 
-    static inline void getMousePosition( long *x, long *y )
+    static inline void getMousePosition( int *x, int *y )
     {
         *x = mouse_pos.x;
         *y = mouse_pos.y;