diff options
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/popupmenu.cpp | 11 | ||||
| -rw-r--r-- | src/gui/updatewindow.cpp | 6 |
2 files changed, 6 insertions, 11 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 diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp index fe410ece..cd26aca9 100644 --- a/src/gui/updatewindow.cpp +++ b/src/gui/updatewindow.cpp @@ -85,11 +85,7 @@ UpdaterWindow::UpdaterWindow(): mCancelButton->requestFocus(); setLocationRelativeTo(getParent()); - // That commented line causes problems if the client had a false value for an update host - // in its config file. - // The update host, unlike the home dir, isn't dynamically set at the start of the client. - // mUpdateHost = config.getValue("updatehost", "themanaworld.org/files"); - mUpdateHost = "themanaworld.org/files"; + mUpdateHost = config.getValue("updatehost", "themanaworld.org/files"); mBasePath = config.getValue("homeDir", "."); // Try to download the updates list |