diff options
author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2005-09-19 12:34:18 +0000 |
---|---|---|
committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2005-09-19 12:34:18 +0000 |
commit | 27d5346e9faf183f5bf9c8a92a47897998c9d60c (patch) | |
tree | 514bbdc7cdf07cde8ed50160226c776e360d270e /src/gui/popupmenu.cpp | |
parent | 2c4d4ecc19fc8308b2772e4ffe6570ca362264d1 (diff) | |
download | mana-27d5346e9faf183f5bf9c8a92a47897998c9d60c.tar.gz mana-27d5346e9faf183f5bf9c8a92a47897998c9d60c.tar.bz2 mana-27d5346e9faf183f5bf9c8a92a47897998c9d60c.tar.xz mana-27d5346e9faf183f5bf9c8a92a47897998c9d60c.zip |
Mostly code cleanups related to commits in past two days.
* Replaced custom function FIND_PATH with AC_PATH_PROG, used for finding sdl-config.
* Removed -lphysfs from Makefile.am which should be added automatically already.
* Actually show the overweight message, and only show it once for each time weight
goes above half the max weight.
* Surfaces passed to SDL_BlitSurface shouldn't be locked according to the manual.
* Minimal fps limit is now 10 fps.
* Reverted change by Bertram that hardcoded the updatehost value.
Diffstat (limited to 'src/gui/popupmenu.cpp')
-rw-r--r-- | src/gui/popupmenu.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp index 7f72702e..feb287eb 100644 --- a/src/gui/popupmenu.cpp +++ b/src/gui/popupmenu.cpp @@ -46,6 +46,7 @@ #include "../resources/iteminfo.h" #include "../resources/itemmanager.h" +extern Being* autoTarget; PopupMenu::PopupMenu(): Window() @@ -148,15 +149,14 @@ void PopupMenu::handleLink(const std::string& link) //tradePartner << "Trade: You and " << being->name<< ""; tradePartnerName = being->getName(); } - + // Attack action else if ((link == "attack") && being && being->getType() == Being::PLAYER) { - - autoTarget = being; + autoTarget = being; attack(being); - } - + } + /* // Follow Player action else if (link == "follow") @@ -215,7 +215,6 @@ void PopupMenu::handleLink(const std::string& link) { // do nothing for now, I need to write // a window for the description first - ; } // Unknown actions |