From b55f95d6868a6f8247e0133245dd17aaafafdaa4 Mon Sep 17 00:00:00 2001 From: Jon Bergli Heier Date: Sun, 5 Jun 2011 18:20:42 +0200 Subject: Don't check console->showing(), dialog is explicitly set to true. --- scene.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scene.cpp b/scene.cpp index fa012a3..a2b802b 100644 --- a/scene.cpp +++ b/scene.cpp @@ -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; } -- cgit v1.2.3