diff options
author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2006-09-09 18:34:41 +0000 |
---|---|---|
committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2006-09-09 18:34:41 +0000 |
commit | 89be648c4f5292dc22eb774afda599d48626f1d8 (patch) | |
tree | e2446cced31dd8ff615a5d0da3b88df71f324821 | |
parent | 2b99e70a462ce87d643c19a0c48c812ad6c98d67 (diff) | |
download | mana-89be648c4f5292dc22eb774afda599d48626f1d8.tar.gz mana-89be648c4f5292dc22eb774afda599d48626f1d8.tar.bz2 mana-89be648c4f5292dc22eb774afda599d48626f1d8.tar.xz mana-89be648c4f5292dc22eb774afda599d48626f1d8.zip |
Removed easy targeting functionality since it interferes with walking around
too much. Targeting can still be rather conveniently done with 'a' or the
middle mouse button.
-rw-r--r-- | ChangeLog | 14 | ||||
-rw-r--r-- | src/gui/gui.cpp | 5 |
2 files changed, 13 insertions, 6 deletions
@@ -1,3 +1,9 @@ +2006-09-09 Bjørn Lindeijer <bjorn@lindeijer.nl> + + * src/gui/gui.cpp: Removed easy targeting functionality since it + interferes with walking around too much. Targeting can still be rather + conveniently done with 'a' or the middle mouse button. + 2006-09-07 Björn Steinbrink <B.Steinbrink@gmx.de> * src/resources/image.cpp: Fixed a typo. @@ -60,7 +66,7 @@ * src/game.cpp, src/beingmanager.h, src/gui/gui.cpp, src/beingmanager.cpp, src/localplayer.h, README, - data/help/commands.txt, NEWS: Added targetting nearest monster with + data/help/commands.txt, NEWS: Added targeting nearest monster with either keyboard or mouse. Also made clicking beings in general a bit easier (patch applied by Bjørn Lindeijer). @@ -236,13 +242,13 @@ * src/itemmanager.cpp, data/items.xml: Replaced indices on the item spriteset with filenames. added names and descriptions for all missing items. Changed names and dascriptions of some items. - * src/engine.cpp: removed global item spriteset. + * src/engine.cpp: Removed global item spriteset. * src/floor_item.cpp, src/floor_item.h, src/iteminfo.cpp, src/iteminfo.h, src/equipmentwindow.cpp, src/equipmentwindow.h, - src/itemcontainer.cpp, src/itemcontainer.h: the iteminfo class now + src/itemcontainer.cpp, src/itemcontainer.h: The iteminfo class now provides a pointer to the item icon image instead of providing the index on the item spriteset. - * data/graphics/tiles/trans_desert-woodland.png: added transmission + * data/graphics/tiles/trans_desert-woodland.png: Added transmission tileset between desert and woodland. 2006-08-13 Eugenio Favalli <elvenprogrammer@gmail.com> diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index 74197a14..d44325d3 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -253,7 +253,8 @@ Gui::mousePress(int mx, int my, int button) Being *being; FloorItem *floorItem; - if ((being = beingManager->findBeing(tilex, tiley)) && being->getType() != Being::LOCALPLAYER) + if ((being = beingManager->findBeing(tilex, tiley)) && + being->getType() != Being::LOCALPLAYER) { showPopup(mx, my, being); return; @@ -280,7 +281,7 @@ Gui::mousePress(int mx, int my, int button) FloorItem *item; // Interact with some being - if ((being = beingManager->findNearestLivingBeing(tilex, tiley, 1))) + if ((being = beingManager->findBeing(tilex, tiley))) { switch (being->getType()) { |