summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorPhilipp Sehmisch <crush@themanaworld.org>2009-04-16 20:55:59 +0200
committerPhilipp Sehmisch <crush@themanaworld.org>2009-04-16 21:14:40 +0200
commitdac1c9d9b9558053ab9fc96eac8772604b8eedf2 (patch)
tree7077f0300e6ae39d7de27aae29eb0c4bb06069b5 /src/resources
parent255c491375005abb1d2de22fa5aa1a821ac3a4f6 (diff)
downloadMana-dac1c9d9b9558053ab9fc96eac8772604b8eedf2.tar.gz
Mana-dac1c9d9b9558053ab9fc96eac8772604b8eedf2.tar.bz2
Mana-dac1c9d9b9558053ab9fc96eac8772604b8eedf2.tar.xz
Mana-dac1c9d9b9558053ab9fc96eac8772604b8eedf2.zip
Added support for playing music in zip files.
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/resourcemanager.cpp26
-rw-r--r--src/resources/resourcemanager.h11
2 files changed, 37 insertions, 0 deletions
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index 33d5e3e5..e24ebafb 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -419,6 +419,32 @@ void *ResourceManager::loadFile(const std::string &fileName, int &fileSize)
return buffer;
}
+bool ResourceManager::moveFile(const std::string &src, const std::string &dst)
+{
+ PHYSFS_file *srcFile = PHYSFS_openRead(src.c_str());
+ if (!srcFile)
+ {
+ logger->log("Read error: %s", PHYSFS_getLastError());
+ return false;
+ }
+ PHYSFS_file *dstFile = PHYSFS_openWrite(dst.c_str());
+ if (!dstFile)
+ {
+ logger->log("Write error: %s", PHYSFS_getLastError());
+ PHYSFS_close(srcFile);
+ return false;
+ }
+
+ int fileSize = PHYSFS_fileLength(srcFile);
+ void *buf = malloc(fileSize);
+ PHYSFS_read(srcFile, buf, 1, fileSize);
+ PHYSFS_write(dstFile, buf, 1, fileSize);
+
+ PHYSFS_close(srcFile);
+ PHYSFS_close(dstFile);
+ return true;
+}
+
std::vector<std::string> ResourceManager::loadTextFile(const std::string &fileName)
{
int contentsLength;
diff --git a/src/resources/resourcemanager.h b/src/resources/resourcemanager.h
index ec60fa9a..19c0cb61 100644
--- a/src/resources/resourcemanager.h
+++ b/src/resources/resourcemanager.h
@@ -125,6 +125,17 @@ class ResourceManager
Resource *load(const std::string &path, loader fun);
/**
+ * Copies a file from one place to another (useful for extracting
+ * raw files from a zip archive, for example)
+ *
+ * @param src Source file name
+ * @param dst Destination file name
+ * @return true on success, false on failure. An error message should be
+ * in the log file.
+ */
+ bool moveFile(const std::string &src, const std::string &dst);
+
+ /**
* Convenience wrapper around ResourceManager::get for loading
* images.
*/