From 27d5346e9faf183f5bf9c8a92a47897998c9d60c Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Mon, 19 Sep 2005 12:34:18 +0000
Subject: 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.

---
 src/gui/popupmenu.cpp    | 11 +++++------
 src/gui/updatewindow.cpp |  6 +-----
 2 files changed, 6 insertions(+), 11 deletions(-)

(limited to 'src/gui')

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
-- 
cgit v1.2.3-70-g09d2