summaryrefslogtreecommitdiff
path: root/src/gui/windows/updaterwindow.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-05-28 20:31:09 +0300
committerAndrei Karas <akaras@inbox.ru>2014-05-28 20:31:09 +0300
commitbb87f2911b63eaf80e49d689bf52ecf2042ae098 (patch)
tree0778087134ec3c5a2370d417bcadb64a1dc6a9bc /src/gui/windows/updaterwindow.cpp
parent4415cb66734e67dfcdf8924d354107d27fb70fee (diff)
downloadmanaverse-bb87f2911b63eaf80e49d689bf52ecf2042ae098.tar.gz
manaverse-bb87f2911b63eaf80e49d689bf52ecf2042ae098.tar.bz2
manaverse-bb87f2911b63eaf80e49d689bf52ecf2042ae098.tar.xz
manaverse-bb87f2911b63eaf80e49d689bf52ecf2042ae098.zip
Move from resourcemanager functions related to files into other files.
Diffstat (limited to 'src/gui/windows/updaterwindow.cpp')
-rw-r--r--src/gui/windows/updaterwindow.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp
index 45c18b21b..49b2e986f 100644
--- a/src/gui/windows/updaterwindow.cpp
+++ b/src/gui/windows/updaterwindow.cpp
@@ -46,6 +46,8 @@
#include "resources/db/moddb.h"
#include "utils/delete2.h"
+#include "utils/files.h"
+#include "utils/physfstools.h"
#include "utils/gettext.h"
#include "utils/mkdir.h"
#include "utils/paths.h"
@@ -1020,8 +1022,7 @@ bool UpdaterWindow::validateFile(const std::string &filePath,
unsigned long UpdaterWindow::getFileHash(const std::string &filePath)
{
int size = 0;
- char *const buf = static_cast<char*>(ResourceManager::loadFile(
- filePath, size));
+ char *const buf = static_cast<char*>(PhysFs::loadFile(filePath, size));
if (!buf)
return 0;
return Net::Download::adlerBuffer(buf, size);
@@ -1042,8 +1043,7 @@ void UpdaterWindow::loadFile(std::string file)
trim(file);
StringVect lines;
- const ResourceManager *const resman = ResourceManager::getInstance();
- resman->loadTextFileLocal(mUpdatesDir + "/local/help/news.txt", lines);
+ Files::loadTextFileLocal(mUpdatesDir + "/local/help/news.txt", lines);
for (size_t i = 0, sz = lines.size(); i < sz; ++i)
mBrowserBox->addRow(lines[i]);