diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2008-11-04 21:50:17 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2008-11-04 21:50:17 +0000 |
| commit | 222db257d7de12f1077eb43d448d6b357d4642e7 (patch) | |
| tree | ef76d759d93e60a0f66ab7c2a26117a02964f149 /src/resources/resourcemanager.cpp | |
| parent | a9a59f28594b87c8ac29e6739e34decd79f2fd2a (diff) | |
| download | mana-222db257d7de12f1077eb43d448d6b357d4642e7.tar.gz mana-222db257d7de12f1077eb43d448d6b357d4642e7.tar.bz2 mana-222db257d7de12f1077eb43d448d6b357d4642e7.tar.xz mana-222db257d7de12f1077eb43d448d6b357d4642e7.zip | |
Merged revisions 4332 via svnmerge from
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/branches/0.0
........
r4332 | b_lindeijer | 2008-06-05 09:33:12 +0200 (Thu, 05 Jun 2008) | 5 lines
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.cpp | 3 |
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; |