diff options
author | Jon Bergli Heier <snakebite@jvnv.net> | 2011-06-05 18:20:42 +0200 |
---|---|---|
committer | Jon Bergli Heier <snakebite@jvnv.net> | 2011-06-05 18:20:42 +0200 |
commit | b55f95d6868a6f8247e0133245dd17aaafafdaa4 (patch) | |
tree | cdefcb62016abdb626c254f2b8f5f2d9add64eaf | |
parent | 28f89254a85821d7ede5bfbb10913ddc207ed536 (diff) |
Don't check console->showing(), dialog is explicitly set to true.
-rw-r--r-- | scene.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -226,11 +226,11 @@ void Scene::events() { case SDL_MOUSEBUTTONDOWN: switch(event.button.button) { case SDL_BUTTON_LEFT: - if(dialog || console->showing()) + if(dialog) CEGUI::System::getSingleton().injectMouseButtonDown(CEGUI::LeftButton); break; case SDL_BUTTON_RIGHT: - if(dialog || console->showing()) + if(dialog) CEGUI::System::getSingleton().injectMouseButtonDown(CEGUI::RightButton); break; } @@ -238,7 +238,7 @@ void Scene::events() { case SDL_MOUSEBUTTONUP: switch(event.button.button) { case SDL_BUTTON_LEFT: - if(dialog || console->showing()) + if(dialog) CEGUI::System::getSingleton().injectMouseButtonUp(CEGUI::LeftButton); else { sx = event.button.x; @@ -247,23 +247,23 @@ void Scene::events() { } break; case SDL_BUTTON_RIGHT: - if(dialog || console->showing()) + if(dialog) CEGUI::System::getSingleton().injectMouseButtonUp(CEGUI::RightButton); else show_selection = false; break; case SDL_BUTTON_WHEELUP: - if(dialog || console->showing()) + if(dialog) CEGUI::System::getSingleton().injectMouseWheelChange(1); break; case SDL_BUTTON_WHEELDOWN: - if(dialog || console->showing()) + if(dialog) CEGUI::System::getSingleton().injectMouseWheelChange(-1); break; } break; case SDL_MOUSEMOTION: - if(dialog || console->showing()) { + if(dialog) { CEGUI::System::getSingleton().injectMousePosition(event.motion.x, event.motion.y); break; } |