summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-03-29 22:41:26 +0300
committerAndrei Karas <akaras@inbox.ru>2017-03-29 22:41:26 +0300
commit8f95378c3be89c06c722da03ddbd3641c4fc2323 (patch)
tree4f1c14fb0ba57793f8979df43ffd293533606e1b /src/resources
parentfc31f1003bec7e0117421a8c58668e61849eeba5 (diff)
downloadplus-8f95378c3be89c06c722da03ddbd3641c4fc2323.tar.gz
plus-8f95378c3be89c06c722da03ddbd3641c4fc2323.tar.bz2
plus-8f95378c3be89c06c722da03ddbd3641c4fc2323.tar.xz
plus-8f95378c3be89c06c722da03ddbd3641c4fc2323.zip
Move rwops code into virtfs namespace.
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/atlas/atlasmanager.cpp2
-rw-r--r--src/resources/loaders/imageloader.cpp2
-rw-r--r--src/resources/loaders/musicloader.cpp2
-rw-r--r--src/resources/loaders/soundloader.cpp2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/resources/atlas/atlasmanager.cpp b/src/resources/atlas/atlasmanager.cpp
index 249900c56..b9107a757 100644
--- a/src/resources/atlas/atlasmanager.cpp
+++ b/src/resources/atlas/atlasmanager.cpp
@@ -149,7 +149,7 @@ void AtlasManager::loadImages(const StringVect &files,
path = path.substr(0, p);
}
- SDL_RWops *const rw = VirtFs::RWopsOpenRead(path);
+ SDL_RWops *const rw = VirtFs::rwopsOpenRead(path);
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 1a1805330..2bfba2706 100644
--- a/src/resources/loaders/imageloader.cpp
+++ b/src/resources/loaders/imageloader.cpp
@@ -63,7 +63,7 @@ namespace
d = new Dye(path1.substr(p + 1));
path1 = path1.substr(0, p);
}
- SDL_RWops *const rw = VirtFs::RWopsOpenRead(path1);
+ SDL_RWops *const rw = VirtFs::rwopsOpenRead(path1);
if (!rw)
{
delete d;
diff --git a/src/resources/loaders/musicloader.cpp b/src/resources/loaders/musicloader.cpp
index f1114b210..f23a9fc70 100644
--- a/src/resources/loaders/musicloader.cpp
+++ b/src/resources/loaders/musicloader.cpp
@@ -46,7 +46,7 @@ namespace
return nullptr;
const ResourceLoader *const
rl = static_cast<const ResourceLoader *const>(v);
- SDL_RWops *const rw = VirtFs::RWopsOpenRead(rl->path);
+ SDL_RWops *const rw = VirtFs::rwopsOpenRead(rl->path);
if (!rw)
{
reportAlways("Error loading resource: %s",
diff --git a/src/resources/loaders/soundloader.cpp b/src/resources/loaders/soundloader.cpp
index b3429b20e..be71a5ddb 100644
--- a/src/resources/loaders/soundloader.cpp
+++ b/src/resources/loaders/soundloader.cpp
@@ -46,7 +46,7 @@ namespace
return nullptr;
const ResourceLoader *const
rl = static_cast<const ResourceLoader *const>(v);
- SDL_RWops *const rw = VirtFs::RWopsOpenRead(rl->path);
+ SDL_RWops *const rw = VirtFs::rwopsOpenRead(rl->path);
if (!rw)
{
reportAlways("Error loading resource: %s",