summaryrefslogtreecommitdiff
path: root/src/input
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-02-16 21:28:08 +0300
committerAndrei Karas <akaras@inbox.ru>2014-02-16 21:28:08 +0300
commit82ac4641828ec7387863bb18cf4493190c4cc68f (patch)
tree54fa2aeeff83109ca289894bf08bc767084050a3 /src/input
parent07e8275965ccb989e3bcc288e2440bffcbca4a8e (diff)
downloadplus-82ac4641828ec7387863bb18cf4493190c4cc68f.tar.gz
plus-82ac4641828ec7387863bb18cf4493190c4cc68f.tar.bz2
plus-82ac4641828ec7387863bb18cf4493190c4cc68f.tar.xz
plus-82ac4641828ec7387863bb18cf4493190c4cc68f.zip
Remove Exception class.
Diffstat (limited to 'src/input')
-rw-r--r--src/input/inputmanager.cpp29
1 files changed, 6 insertions, 23 deletions
diff --git a/src/input/inputmanager.cpp b/src/input/inputmanager.cpp
index 7243bbf97..46494532a 100644
--- a/src/input/inputmanager.cpp
+++ b/src/input/inputmanager.cpp
@@ -51,7 +51,6 @@
#include "utils/timer.h"
-#include "gui/base/exception.hpp"
#include "gui/base/focushandler.hpp"
#include <algorithm>
@@ -549,18 +548,10 @@ bool InputManager::handleEvent(const SDL_Event &event)
if (quitDialog || TextDialog::isActive() ||
NpcPostDialog::isActive())
{
- try
- {
- if (guiInput)
- guiInput->pushInput(event);
- if (gui)
- gui->handleInput();
- }
- catch(const gcn::Exception &e)
- {
- const char *const err = e.getMessage().c_str();
- logger->log("Warning: guichan input exception: %s", err);
- }
+ if (guiInput)
+ guiInput->pushInput(event);
+ if (gui)
+ gui->handleInput();
return true;
}
break;
@@ -605,16 +596,8 @@ bool InputManager::handleEvent(const SDL_Event &event)
break;
}
- try
- {
- if (guiInput)
- guiInput->pushInput(event);
- }
- catch(const gcn::Exception &e)
- {
- const char *const err = e.getMessage().c_str();
- logger->log("Warning: guichan input exception: %s", err);
- }
+ if (guiInput)
+ guiInput->pushInput(event);
if (gui)
{
const bool res = gui->handleInput();