summaryrefslogtreecommitdiff
path: root/src/resources/resourcemanager.h
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2005-03-26 01:54:25 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2005-03-26 01:54:25 +0000
commitb40bfe580d2dc9038c00521a44fcd6edd352f239 (patch)
treeab6ca6ea7b4592bba4e10bddac773528f6467853 /src/resources/resourcemanager.h
parentaa3877cbe156b04c9194856e92ab0dbc129280c1 (diff)
downloadmana-b40bfe580d2dc9038c00521a44fcd6edd352f239.tar.gz
mana-b40bfe580d2dc9038c00521a44fcd6edd352f239.tar.bz2
mana-b40bfe580d2dc9038c00521a44fcd6edd352f239.tar.xz
mana-b40bfe580d2dc9038c00521a44fcd6edd352f239.zip
Images are now exclusively loaded through PhysFS, and Tiled maps should load
fine again.
Diffstat (limited to 'src/resources/resourcemanager.h')
-rw-r--r--src/resources/resourcemanager.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/resources/resourcemanager.h b/src/resources/resourcemanager.h
index 5c80b1a8..1933cc76 100644
--- a/src/resources/resourcemanager.h
+++ b/src/resources/resourcemanager.h
@@ -36,7 +36,7 @@ struct ResourceEntry
{
ResourceEntry();
- Resource* resource;
+ Resource *resource;
std::string filePath;
};
@@ -115,7 +115,7 @@ class ResourceManager
*
* @return The size of the file that was loaded
*/
- int loadFile(const std::string& fileName, void* buffer);
+ void *loadFile(const std::string &fileName, int &fileSize);
static ResourceManager *instance;