Added command line argument to specify the update host (-H). Also, to avoid

problems when files with the same name are served by different update hosts,
the updates are now stored in an update host specific directory. Based on a
patch by Sanga.

3 files changed, 6 insertions, 5 deletions

diff --git a/src/resources/buddylist.cpp b/src/resources/buddylist.cpp
index 2f85825a..32d8d9f4 100644
--- a/src/resources/buddylist.cpp
+++ b/src/resources/buddylist.cpp
@@ -33,8 +33,12 @@
 
 BuddyList::BuddyList()
 {
+    // TODO: A buddy list would have to use the Configuration class to store
+    //       the buddies. Also, there is now a player relationship manager
+    //       which probably makes this buddy list kind of obsolete.
+
     // Find saved buddy list file
-    mFilename = config.getValue("homeDir", "") + "/buddy.txt";
+    //mFilename = homeDir + "/buddy.txt";
 
     // Load buddy from file
     loadFile();
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index 59202ad8..9c109257 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -446,9 +446,8 @@ ResourceManager::loadTextFile(const std::string &fileName)
     std::istringstream iss(std::string(fileContents, contentsLength));
     std::string line;
 
-    while (getline(iss, line, '\n')) {
+    while (getline(iss, line))
         lines.push_back(line);
-    }
 
     free(fileContents);
     return lines;
diff --git a/src/resources/spritedef.cpp b/src/resources/spritedef.cpp
index 3f95b3ec..334474d7 100644
--- a/src/resources/spritedef.cpp
+++ b/src/resources/spritedef.cpp
@@ -51,8 +51,6 @@ SpriteDef::getAction(SpriteAction action) const
 
 SpriteDef *SpriteDef::load(std::string const &animationFile, int variant)
 {
-    ResourceManager *resman = ResourceManager::getInstance();
-
     std::string::size_type pos = animationFile.find('|');
     std::string palettes;
     if (pos != std::string::npos)