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

[Ivo Danihelka]

CVSROOT:        /cvsroot/netpanzer
Module name:    netpanzer
Branch:         
Changes by:     Ivo Danihelka <address@hidden>  03/11/07 19:13:18

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

Log message:
        Fixed broken mouse controls

Patches:
Index: netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.cpp
diff -u netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.cpp:1.22 
netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.cpp:1.23
--- netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.cpp:1.22     Fri Nov 
 7 04:38:40 2003
+++ netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.cpp  Fri Nov  7 
19:13:18 2003
@@ -559,7 +559,7 @@
 
     while( !MouseInterface::event_queue.empty() ) {
         MouseEvent event = MouseInterface::event_queue.front();
-        MouseInterface::event_queue.pop();
+        MouseInterface::event_queue.pop_front();
 
         if( event.button == MouseInterface::left_button )
             evalLeftMButtonEvents( event );
Index: netpanzer/src/NetPanzer/Interfaces/MouseInterface.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/MouseInterface.cpp:1.18 
netpanzer/src/NetPanzer/Interfaces/MouseInterface.cpp:1.19
--- netpanzer/src/NetPanzer/Interfaces/MouseInterface.cpp:1.18  Fri Nov  7 
04:38:40 2003
+++ netpanzer/src/NetPanzer/Interfaces/MouseInterface.cpp       Fri Nov  7 
19:13:18 2003
@@ -127,7 +127,7 @@
     event.button = left_button;
     event.event = MouseEvent::EVENT_DOWN;
     event.down_pos = left_button_down_pos;
-    event_queue.push(event);
+    event_queue.push_back(event);
 }
 
 void MouseInterface::setLeftButtonUp()
@@ -150,10 +150,10 @@
         event.event  = MouseEvent::EVENT_CLICK;
 
     event.down_pos = left_button_down_pos;
-    event_queue.push(event);
+    event_queue.push_back(event);
 
     event.event = MouseEvent::EVENT_UP;
-    event_queue.push(event);
+    event_queue.push_back(event);
 }
 
 void MouseInterface::setLeftButtonDoubleDown()
@@ -180,7 +180,7 @@
     event.button = right_button;
     event.event = MouseEvent::EVENT_DOWN;
     event.down_pos = right_button_down_pos;
-    event_queue.push( event );
+    event_queue.push_back( event );
 }
 
 void MouseInterface::setRightButtonUp( void )
@@ -203,10 +203,10 @@
         event.event  = MouseEvent::EVENT_CLICK;
 
     event.down_pos = right_button_down_pos;
-    event_queue.push( event );
+    event_queue.push_back( event );
 
     event.event = MouseEvent::EVENT_UP;
-    event_queue.push( event );
+    event_queue.push_back( event );
 }
 
 void MouseInterface::setRightButtonDoubleDown()
@@ -233,7 +233,7 @@
     event.button = middle_button;
     event.event = MouseEvent::EVENT_DOWN;
     event.down_pos = middle_button_down_pos;
-    event_queue.push( event );
+    event_queue.push_back( event );
 }
 
 void MouseInterface::setMiddleButtonUp()
@@ -256,10 +256,10 @@
         event.event  = MouseEvent::EVENT_CLICK;
 
     event.down_pos = middle_button_down_pos;
-    event_queue.push( event );
+    event_queue.push_back( event );
 
     event.event = MouseEvent::EVENT_UP;
-    event_queue.push( event );
+    event_queue.push_back( event );
 }
 
 void MouseInterface::setMiddleButtonDoubleDown()
Index: netpanzer/src/NetPanzer/Interfaces/MouseInterface.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/MouseInterface.hpp:1.11 
netpanzer/src/NetPanzer/Interfaces/MouseInterface.hpp:1.12
--- netpanzer/src/NetPanzer/Interfaces/MouseInterface.hpp:1.11  Fri Nov  7 
04:38:40 2003
+++ netpanzer/src/NetPanzer/Interfaces/MouseInterface.hpp       Fri Nov  7 
19:13:17 2003
@@ -20,7 +20,7 @@
 
 #include <string>
 #include <map>
-#include <queue>
+#include <deque>
 
 #include "Surface.hpp"
 
@@ -45,7 +45,7 @@
     iXY   up_pos;
 };
 
-typedef std::queue<MouseEvent> MouseEventQueue;
+typedef std::deque<MouseEvent> MouseEventQueue;
 
 class MouseInterface
 {
Index: netpanzer/src/NetPanzer/Views/Game/GameView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/GameView.cpp:1.12 
netpanzer/src/NetPanzer/Views/Game/GameView.cpp:1.13
--- netpanzer/src/NetPanzer/Views/Game/GameView.cpp:1.12        Fri Nov  7 
04:38:40 2003
+++ netpanzer/src/NetPanzer/Views/Game/GameView.cpp     Fri Nov  7 19:13:18 2003
@@ -118,7 +118,7 @@
 void GameView::doActivate()
 {
     View::doActivate();
-    // MouseInterface::event_queue.clear();
+    MouseInterface::event_queue.clear();
     MouseInterface::resetButtonHoldStatus();
     COMMAND_PROCESSOR.inFocus();