diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-02-10 21:57:08 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-02-10 23:23:35 +0300 |
| commit | 4d3c700bf736def3c55f7e03c175e2e43ed3db02 (patch) | |
| tree | ac8330eeda18c938a5e685940fbfa4ec289bce7b /src/resources | |
| parent | c6277401fb4dafbe08bac534e0de7796f70a0d19 (diff) | |
| download | manaverse-4d3c700bf736def3c55f7e03c175e2e43ed3db02.tar.gz manaverse-4d3c700bf736def3c55f7e03c175e2e43ed3db02.tar.bz2 manaverse-4d3c700bf736def3c55f7e03c175e2e43ed3db02.tar.xz manaverse-4d3c700bf736def3c55f7e03c175e2e43ed3db02.zip | |
Rename physfsrwops into virtfsrwops.
Diffstat (limited to 'src/resources')
| -rw-r--r-- | src/resources/atlas/atlasmanager.cpp | 4 | ||||
| -rw-r--r-- | src/resources/loaders/imageloader.cpp | 4 | ||||
| -rw-r--r-- | src/resources/loaders/musicloader.cpp | 4 | ||||
| -rw-r--r-- | src/resources/loaders/soundloader.cpp | 4 | ||||
| -rw-r--r-- | src/resources/resourcemanager/resourcemanager.cpp | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/src/resources/atlas/atlasmanager.cpp b/src/resources/atlas/atlasmanager.cpp index 7299e76d3..e3c6e685b 100644 --- a/src/resources/atlas/atlasmanager.cpp +++ b/src/resources/atlas/atlasmanager.cpp @@ -30,7 +30,7 @@ #include "utils/mathutils.h" #include "utils/physfscheckutils.h" -#include "utils/physfsrwops.h" +#include "utils/virtfsrwops.h" #include "utils/sdlcheckutils.h" #include "resources/openglimagehelper.h" @@ -149,7 +149,7 @@ void AtlasManager::loadImages(const StringVect &files, path = path.substr(0, p); } - SDL_RWops *const rw = MPHYSFSRWOPS_openRead(path.c_str()); + SDL_RWops *const rw = VirtFs::RWopsOpenRead(path.c_str()); if (rw) { Image *const image = d ? surfaceImageHelper->load(rw, *d) diff --git a/src/resources/loaders/imageloader.cpp b/src/resources/loaders/imageloader.cpp index 4fada1f44..54f987bab 100644 --- a/src/resources/loaders/imageloader.cpp +++ b/src/resources/loaders/imageloader.cpp @@ -31,7 +31,7 @@ #include "resources/dye/dye.h" #include "utils/checkutils.h" -#include "utils/physfsrwops.h" +#include "utils/virtfsrwops.h" #include "debug.h" @@ -62,7 +62,7 @@ namespace d = new Dye(path1.substr(p + 1)); path1 = path1.substr(0, p); } - SDL_RWops *const rw = MPHYSFSRWOPS_openRead(path1.c_str()); + SDL_RWops *const rw = VirtFs::RWopsOpenRead(path1.c_str()); if (!rw) { delete d; diff --git a/src/resources/loaders/musicloader.cpp b/src/resources/loaders/musicloader.cpp index 7b0cda647..c22843d39 100644 --- a/src/resources/loaders/musicloader.cpp +++ b/src/resources/loaders/musicloader.cpp @@ -27,7 +27,7 @@ #include "resources/resourcemanager/resourcemanager.h" #include "utils/checkutils.h" -#include "utils/physfsrwops.h" +#include "utils/virtfsrwops.h" #include "debug.h" @@ -45,7 +45,7 @@ namespace return nullptr; const ResourceLoader *const rl = static_cast<const ResourceLoader *const>(v); - SDL_RWops *const rw = MPHYSFSRWOPS_openRead(rl->path.c_str()); + SDL_RWops *const rw = VirtFs::RWopsOpenRead(rl->path.c_str()); if (!rw) { reportAlways("Physfs error: %s", VirtFs::getLastError()); diff --git a/src/resources/loaders/soundloader.cpp b/src/resources/loaders/soundloader.cpp index 569d2dfbe..71ceca8bd 100644 --- a/src/resources/loaders/soundloader.cpp +++ b/src/resources/loaders/soundloader.cpp @@ -27,7 +27,7 @@ #include "resources/resourcemanager/resourcemanager.h" #include "utils/checkutils.h" -#include "utils/physfsrwops.h" +#include "utils/virtfsrwops.h" #include "debug.h" @@ -45,7 +45,7 @@ namespace return nullptr; const ResourceLoader *const rl = static_cast<const ResourceLoader *const>(v); - SDL_RWops *const rw = MPHYSFSRWOPS_openRead(rl->path.c_str()); + SDL_RWops *const rw = VirtFs::RWopsOpenRead(rl->path.c_str()); if (!rw) { reportAlways("Physfs error: %s", VirtFs::getLastError()); diff --git a/src/resources/resourcemanager/resourcemanager.cpp b/src/resources/resourcemanager/resourcemanager.cpp index 8b51b1ec2..2a2fa42e2 100644 --- a/src/resources/resourcemanager/resourcemanager.cpp +++ b/src/resources/resourcemanager/resourcemanager.cpp @@ -36,7 +36,7 @@ #include "utils/checkutils.h" #include "utils/delete2.h" -#include "utils/physfsrwops.h" +#include "utils/virtfsrwops.h" #ifndef USE_OPENGL #include <SDL_image.h> |