summaryrefslogtreecommitdiff
path: root/src/resources/resourcemanager.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2008-06-05 07:33:12 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2008-06-05 07:33:12 +0000
commit9f35cb7602c55d43ab598145cfcd0703ec1c5059 (patch)
tree2ed8b59c11557289bfe06479687971ea6781c43a /src/resources/resourcemanager.cpp
parentef11f1b7f9c1ce48df0eff7acd3886768886449a (diff)
downloadMana-9f35cb7602c55d43ab598145cfcd0703ec1c5059.tar.gz
Mana-9f35cb7602c55d43ab598145cfcd0703ec1c5059.tar.bz2
Mana-9f35cb7602c55d43ab598145cfcd0703ec1c5059.tar.xz
Mana-9f35cb7602c55d43ab598145cfcd0703ec1c5059.zip
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.
Diffstat (limited to 'src/resources/resourcemanager.cpp')
-rw-r--r--src/resources/resourcemanager.cpp3
1 files changed, 1 insertions, 2 deletions
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;