Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

scrolling stops when entering chat mode and holding down cursor keys, but scrolling with mouse is still possible.

This commit is contained in:
Titus Tscharntke 2012-09-01 19:18:31 +00:00
parent 2bdc487cce
commit b2e869acc3
1 changed files with 11 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
source/glest_game/game/game.cpp
View File

@ -2721,18 +2721,6 @@ void Game::mouseMove(int x, int y, const MouseState *ms) {
}
}
else {
//main window
if(isInSpecialKeyCaptureEvent() == true &&
gameCamera.isMoving() == true) {
camUpButtonDown= false;
camDownButtonDown = false;
camLeftButtonDown = false;
camRightButtonDown = false;
gameCamera.stopMove();
}
//if(Window::isKeyDown() == false)
if(!camLeftButtonDown && !camRightButtonDown && !camUpButtonDown && !camDownButtonDown)
{
@ -2758,7 +2746,7 @@ void Game::mouseMove(int x, int y, const MouseState *ms) {
}
else {
bool mouseMoveScrollsWorld = Config::getInstance().getBool("MouseMoveScrollsWorld","true");
if(mouseMoveScrollsWorld == true && isInSpecialKeyCaptureEvent() == false) {
if(mouseMoveScrollsWorld == true) {
if (y < 10) {
gameCamera.setMoveZ(-scrollSpeed);
}
@ -2888,10 +2876,19 @@ void Game::keyDown(SDL_KeyboardEvent key) {
}
Lang &lang= Lang::getInstance();
bool formerChatState=chatManager.getEditEnabled();
//send key to the chat manager
chatManager.keyDown(key);
if( formerChatState==false && chatManager.getEditEnabled()) {
camUpButtonDown= false;
camDownButtonDown = false;
camLeftButtonDown = false;
camRightButtonDown = false;
gameCamera.stopMove();
}
//printf("GAME KEYDOWN #1\n");
if(chatManager.getEditEnabled() == false) {
@ -3116,17 +3113,6 @@ void Game::keyDown(SDL_KeyboardEvent key) {
saveGame();
}
}
else if(isInSpecialKeyCaptureEvent() == true &&
gameCamera.isMoving() == true) {
camUpButtonDown= false;
camDownButtonDown = false;
camLeftButtonDown = false;
camRightButtonDown = false;
gameCamera.stopMove();
}
//throw megaglest_runtime_error("Test Error!");
}
@ -3163,17 +3149,6 @@ void Game::keyUp(SDL_KeyboardEvent key) {
}
if(chatManager.getEditEnabled()) {
if(isInSpecialKeyCaptureEvent() == true &&
gameCamera.isMoving() == true) {
camUpButtonDown= false;
camDownButtonDown = false;
camLeftButtonDown = false;
camRightButtonDown = false;
gameCamera.stopMove();
}
//send key to the chat manager
chatManager.keyUp(key);
}