Added logic to NOT trigger camera mousemove if keyboard has a key pressed so you can scroll with keys and still move mouse simultaneously

source/glest_game/game/game.cpp

@@ -437,24 +437,26 @@ void Game::mouseMove(int x, int y, const MouseState *ms){
 	}
 	else {
 		//main window
-		if (y < 10) {
+		if(Window::isKeyDown() == false) {
-			gameCamera.setMoveZ(-scrollSpeed);
+			if (y < 10) {
-		}
+				gameCamera.setMoveZ(-scrollSpeed);
-		else if (y > metrics.getVirtualH() - 10) {
+			}
-			gameCamera.setMoveZ(scrollSpeed);
+			else if (y > metrics.getVirtualH() - 10) {
-		}
+				gameCamera.setMoveZ(scrollSpeed);
-		else {
+			}
-			gameCamera.setMoveZ(0);
+			else {
-		}
+				gameCamera.setMoveZ(0);
+			}
 
-		if (x < 10) {
+			if (x < 10) {
-			gameCamera.setMoveX(-scrollSpeed);
+				gameCamera.setMoveX(-scrollSpeed);
-		}
+			}
-		else if (x > metrics.getVirtualW() - 10) {
+			else if (x > metrics.getVirtualW() - 10) {
-			gameCamera.setMoveX(scrollSpeed);
+				gameCamera.setMoveX(scrollSpeed);
-		}
+			}
-		else {
+			else {
-			gameCamera.setMoveX(0);
+				gameCamera.setMoveX(0);
+			}
 		}
 
 		if (mainMessageBox.getEnabled()) {

source/shared_lib/include/platform/sdl/window.h

@@ -111,6 +111,7 @@ private:
     static unsigned int lastMouseEvent;	/** for use in mouse hover calculations */
     static MouseState mouseState;
     static Vec2i mousePos;
+    static bool isKeyPressedDown;
 
     static void setLastMouseEvent(unsigned int lastMouseEvent)	{Window::lastMouseEvent = lastMouseEvent;}
     static unsigned int getLastMouseEvent() 				    {return Window::lastMouseEvent;}
@@ -127,6 +128,7 @@ protected:
 public:
 	static bool handleEvent();
 	static void revertMousePos();
+	static bool isKeyDown() { return isKeyPressedDown; }
 	
 
 	Window();

source/shared_lib/include/platform/win32/window.h

@@ -110,7 +110,8 @@ private:
 
     static unsigned int lastMouseEvent;	/** for use in mouse hover calculations */
     static MouseState mouseState;
-    static Vec2i mousePos;
+    static Vec2i mousePos;
+    static bool isKeyPressedDown;
 
     static void setLastMouseEvent(unsigned int lastMouseEvent)	{Window::lastMouseEvent = lastMouseEvent;}
     static unsigned int getLastMouseEvent() 				    {return Window::lastMouseEvent;}
@@ -119,7 +120,7 @@ private:
     static void setMouseState(MouseButton b, bool state)		{Window::mouseState.set(b, state);}
 
     static const Vec2i &getMousePos() 					        {return Window::mousePos;}
-    static void setMousePos(const Vec2i &mousePos)				{Window::mousePos = mousePos;}
+    static void setMousePos(const Vec2i &mousePos)				{Window::mousePos = mousePos;}
 
 protected:
 	WindowHandle handle;
@@ -137,6 +138,7 @@ protected:
 public:
 	static bool handleEvent();
 	static void revertMousePos();
+	static bool isKeyDown() { return isKeyPressedDown; }
 
 	//contructor & destructor
 	Window();

source/shared_lib/sources/platform/sdl/window.cpp

@@ -36,7 +36,7 @@ static int oldX=0,oldY=0;
 unsigned int Window::lastMouseEvent = 0;	/** for use in mouse hover calculations */
 Vec2i Window::mousePos;
 MouseState Window::mouseState;
-
+bool Window::isKeyPressedDown = false;
 
 // ========== PUBLIC ==========
 
@@ -59,6 +59,7 @@ Window::~Window() {
 bool Window::handleEvent() {
 	SDL_Event event;
 	SDL_GetMouseState(&oldX,&oldY);
+
 	while(SDL_PollEvent(&event)) {
 		try {
 		    //printf("START [%d]\n",event.type);
@@ -69,8 +70,8 @@ bool Window::handleEvent() {
                 case SDL_MOUSEMOTION:
 
                     //printf("In [%s::%s] Line :%d\n",__FILE__,__FUNCTION__,__LINE__);
-                    setLastMouseEvent(Chrono::getCurMillis());
+               		setLastMouseEvent(Chrono::getCurMillis());
-                    setMousePos(Vec2i(event.button.x, event.button.y));
+               		setMousePos(Vec2i(event.button.x, event.button.y));
                     break;
             }
 
@@ -106,13 +107,14 @@ bool Window::handleEvent() {
                     setMouseState(mbCenter, event.motion.state & SDL_BUTTON_MMASK);
 
 					if(global_window) {
-                        global_window->eventMouseMove(event.motion.x, event.motion.y, &getMouseState()); //&ms);
+						global_window->eventMouseMove(event.motion.x, event.motion.y, &getMouseState()); //&ms);
 					}
 					break;
 				}
 				case SDL_KEYDOWN:
                     //printf("In [%s::%s] Line :%d\n",__FILE__,__FUNCTION__,__LINE__);
 
+					Window::isKeyPressedDown = true;
 					/* handle ALT+Return */
 					if(event.key.keysym.sym == SDLK_RETURN
 							&& (event.key.keysym.mod & (KMOD_LALT | KMOD_RALT))) {
@@ -125,6 +127,9 @@ bool Window::handleEvent() {
 					break;
 				case SDL_KEYUP:
                     //printf("In [%s::%s] Line :%d\n",__FILE__,__FUNCTION__,__LINE__);
+
+					Window::isKeyPressedDown = false;
+
                     if(global_window) {
                         global_window->eventKeyUp(getKey(event.key.keysym));
                     }

source/shared_lib/sources/platform/win32/window.cpp

@@ -1,7 +1,7 @@
 // ==============================================================
 //	This file is part of Glest Shared Library (www.glest.org)
 //
-//	Copyright (C) 2001-2008 Martiño Figueroa
+//	Copyright (C) 2001-2008 Martio Figueroa
 //
 //	You can redistribute this code and/or modify it under
 //	the terms of the GNU General Public License as published
@@ -38,6 +38,7 @@ unsigned int Window::lastMouseEvent = 0;	/** for use in mouse hover calculations
 static int oldX=0,oldY=0;
 Vec2i Window::mousePos;
 MouseState Window::mouseState;
+bool Window::isKeyPressedDown = false;
 
 // ===================== PUBLIC ========================
 
@@ -381,6 +382,8 @@ LRESULT CALLBACK Window::eventRouter(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 		}
 
 	case WM_KEYDOWN: {
+
+			Window::isKeyPressedDown = true;
 
 			eventWindow->eventKeyDown(static_cast<char>(wParam));
 			break;
@@ -398,7 +401,9 @@ LRESULT CALLBACK Window::eventRouter(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 		}
 
 	case WM_KEYUP: {
-			
+			
+			Window::isKeyPressedDown = false;
+
 			eventWindow->eventKeyUp(static_cast<char>(wParam));
 			break;