summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/actionmanager.cpp14
1 files changed, 9 insertions, 5 deletions
diff --git a/src/actionmanager.cpp b/src/actionmanager.cpp
index dd9239c12..f41a9269c 100644
--- a/src/actionmanager.cpp
+++ b/src/actionmanager.cpp
@@ -227,8 +227,11 @@ impHandler(shortcut)
const int num = itemShortcutWindow->getTabIndex();
if (num >= 0 && num < static_cast<int>(SHORTCUT_TABS))
{
- itemShortcut[num]->useItem(event.action
- - Input::KEY_SHORTCUT_1);
+ if (itemShortcut[num])
+ {
+ itemShortcut[num]->useItem(event.action
+ - Input::KEY_SHORTCUT_1);
+ }
}
return true;
}
@@ -237,7 +240,7 @@ impHandler(shortcut)
impHandler0(toggleChat)
{
- return chatWindow->requestChatFocus();
+ return chatWindow ? chatWindow->requestChatFocus() : false;
}
impHandler0(prevChatTab)
@@ -970,8 +973,9 @@ impHandler0(attack)
{
if (player_node)
{
- if (player_node->getTarget())
- player_node->attack(player_node->getTarget(), true);
+ Being *const target = player_node->getTarget();
+ if (target)
+ player_node->attack(target, true);
return true;
}
return false;