summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/game.cpp7
-rw-r--r--src/gui/buddywindow.cpp2
2 files changed, 7 insertions, 2 deletions
diff --git a/src/game.cpp b/src/game.cpp
index 9e9b0da9..bde34a7c 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -623,7 +623,12 @@ void do_input()
if (keys[SDLK_LCTRL])
{
Being *monster = attack(x, y, player_node->direction);
- if (keys[SDLK_LSHIFT]) {
+ if (monster == NULL && autoTarget != NULL)
+ {
+ attack(autoTarget);
+ }
+ else if (keys[SDLK_LSHIFT])
+ {
autoTarget = monster;
}
}
diff --git a/src/gui/buddywindow.cpp b/src/gui/buddywindow.cpp
index f559d625..f587e020 100644
--- a/src/gui/buddywindow.cpp
+++ b/src/gui/buddywindow.cpp
@@ -34,7 +34,7 @@ BuddyWindow::BuddyWindow():
setContentSize(124, 202);
listbox = new gcn::ListBox();
- listbox->setListModel(dynamic_cast<ListModel*>(this));
+ listbox->setListModel(this);
scrollArea = new ScrollArea(listbox);
scrollArea->setDimension(gcn::Rectangle(