diff options
Diffstat (limited to 'src/resources/loaders')
-rw-r--r-- | src/resources/loaders/atlasloader.cpp | 2 | ||||
-rw-r--r-- | src/resources/loaders/emptyatlasloader.cpp | 2 | ||||
-rw-r--r-- | src/resources/loaders/imageloader.cpp | 2 | ||||
-rw-r--r-- | src/resources/loaders/imagesetloader.cpp | 2 | ||||
-rw-r--r-- | src/resources/loaders/musicloader.cpp | 2 | ||||
-rw-r--r-- | src/resources/loaders/rescaledloader.cpp | 2 | ||||
-rw-r--r-- | src/resources/loaders/shaderloader.cpp | 2 | ||||
-rw-r--r-- | src/resources/loaders/shaderprogramloader.cpp | 2 | ||||
-rw-r--r-- | src/resources/loaders/soundloader.cpp | 2 | ||||
-rw-r--r-- | src/resources/loaders/spritedefloader.cpp | 2 | ||||
-rw-r--r-- | src/resources/loaders/subimageloader.cpp | 2 | ||||
-rw-r--r-- | src/resources/loaders/subimagesetloader.cpp | 2 | ||||
-rw-r--r-- | src/resources/loaders/walklayerloader.cpp | 2 | ||||
-rw-r--r-- | src/resources/loaders/xmlloader.cpp | 2 |
14 files changed, 14 insertions, 14 deletions
diff --git a/src/resources/loaders/atlasloader.cpp b/src/resources/loaders/atlasloader.cpp index c5f6691a3..1faa98b44 100644 --- a/src/resources/loaders/atlasloader.cpp +++ b/src/resources/loaders/atlasloader.cpp @@ -56,7 +56,7 @@ Resource *Loader::getAtlas(const std::string &name, const StringVect &files) { AtlasLoader rl = { name, &files }; - return resourceManager->get("atlas_" + name, AtlasLoader::load, &rl); + return ResourceManager::get("atlas_" + name, AtlasLoader::load, &rl); } #endif // USE_OPENGL diff --git a/src/resources/loaders/emptyatlasloader.cpp b/src/resources/loaders/emptyatlasloader.cpp index 81d99cd51..6fe2f1463 100644 --- a/src/resources/loaders/emptyatlasloader.cpp +++ b/src/resources/loaders/emptyatlasloader.cpp @@ -57,7 +57,7 @@ Resource *Loader::getEmptyAtlas(const std::string &name, const StringVect &files) { EmptyAtlasLoader rl = { name, &files }; - return resourceManager->get("atlas_" + name, EmptyAtlasLoader::load, &rl); + return ResourceManager::get("atlas_" + name, EmptyAtlasLoader::load, &rl); } #endif // USE_OPENGL diff --git a/src/resources/loaders/imageloader.cpp b/src/resources/loaders/imageloader.cpp index 2bfba2706..5ae883886 100644 --- a/src/resources/loaders/imageloader.cpp +++ b/src/resources/loaders/imageloader.cpp @@ -85,6 +85,6 @@ namespace Image *Loader::getImage(const std::string &idPath) { DyedImageLoader rl = { idPath }; - return static_cast<Image*>(resourceManager->get(idPath, + return static_cast<Image*>(ResourceManager::get(idPath, DyedImageLoader::load, &rl)); } diff --git a/src/resources/loaders/imagesetloader.cpp b/src/resources/loaders/imagesetloader.cpp index 6ec02c699..468b97120 100644 --- a/src/resources/loaders/imagesetloader.cpp +++ b/src/resources/loaders/imagesetloader.cpp @@ -74,6 +74,6 @@ ImageSet *Loader::getImageSet(const std::string &imagePath, "x").append(toString( h)).append( "]"); - return static_cast<ImageSet*>(resourceManager->get(str, + return static_cast<ImageSet*>(ResourceManager::get(str, ImageSetLoader::load, &rl)); } diff --git a/src/resources/loaders/musicloader.cpp b/src/resources/loaders/musicloader.cpp index f23a9fc70..0d482b8a6 100644 --- a/src/resources/loaders/musicloader.cpp +++ b/src/resources/loaders/musicloader.cpp @@ -78,6 +78,6 @@ namespace SDLMusic *Loader::getMusic(const std::string &idPath) { ResourceLoader rl = { idPath }; - return static_cast<SDLMusic*>(resourceManager->get( + return static_cast<SDLMusic*>(ResourceManager::get( idPath, ResourceLoader::load, &rl)); } diff --git a/src/resources/loaders/rescaledloader.cpp b/src/resources/loaders/rescaledloader.cpp index c4c315227..e4a9112f1 100644 --- a/src/resources/loaders/rescaledloader.cpp +++ b/src/resources/loaders/rescaledloader.cpp @@ -72,6 +72,6 @@ Image *Loader::getRescaled(const Image *const image, "_rescaled%dx%d", width, height); const RescaledLoader rl = { image, width, height }; Image *const img = static_cast<Image *const>( - resourceManager->get(idPath, RescaledLoader::load, &rl)); + ResourceManager::get(idPath, RescaledLoader::load, &rl)); return img; } diff --git a/src/resources/loaders/shaderloader.cpp b/src/resources/loaders/shaderloader.cpp index f06c9d219..d2ffba348 100644 --- a/src/resources/loaders/shaderloader.cpp +++ b/src/resources/loaders/shaderloader.cpp @@ -61,7 +61,7 @@ Resource *Loader::getShader(const unsigned int type, const std::string &name) { ShaderLoader rl = { name, type }; - return resourceManager->get("shader_" + name, ShaderLoader::load, &rl); + return ResourceManager::get("shader_" + name, ShaderLoader::load, &rl); } #endif // USE_OPENGL diff --git a/src/resources/loaders/shaderprogramloader.cpp b/src/resources/loaders/shaderprogramloader.cpp index d48e1aa9f..763536a6c 100644 --- a/src/resources/loaders/shaderprogramloader.cpp +++ b/src/resources/loaders/shaderprogramloader.cpp @@ -66,7 +66,7 @@ Resource *Loader::getShaderProgram(const std::string &vertex, const bool isNewShader) { ShaderProgramLoader rl = { vertex, fragment, isNewShader }; - return resourceManager->get("program_" + vertex + " + " + fragment, + return ResourceManager::get("program_" + vertex + " + " + fragment, ShaderProgramLoader::load, &rl); } diff --git a/src/resources/loaders/soundloader.cpp b/src/resources/loaders/soundloader.cpp index be71a5ddb..bff769755 100644 --- a/src/resources/loaders/soundloader.cpp +++ b/src/resources/loaders/soundloader.cpp @@ -73,6 +73,6 @@ namespace SoundEffect *Loader::getSoundEffect(const std::string &idPath) { ResourceLoader rl = { idPath }; - return static_cast<SoundEffect*>(resourceManager->get( + return static_cast<SoundEffect*>(ResourceManager::get( idPath, ResourceLoader::load, &rl)); } diff --git a/src/resources/loaders/spritedefloader.cpp b/src/resources/loaders/spritedefloader.cpp index c140c8f73..bdc0c40f0 100644 --- a/src/resources/loaders/spritedefloader.cpp +++ b/src/resources/loaders/spritedefloader.cpp @@ -63,6 +63,6 @@ SpriteDef *Loader::getSprite(const std::string &path, "[").append(toString( variant).append( "]")); - return static_cast<SpriteDef*>(resourceManager->get(str, + return static_cast<SpriteDef*>(ResourceManager::get(str, SpriteDefLoader::load, &rl)); } diff --git a/src/resources/loaders/subimageloader.cpp b/src/resources/loaders/subimageloader.cpp index f2f7ad7de..804e957a5 100644 --- a/src/resources/loaders/subimageloader.cpp +++ b/src/resources/loaders/subimageloader.cpp @@ -85,6 +85,6 @@ Image *Loader::getSubImage(Image *const parent, "x").append( toString(height)).append( "]"); - return static_cast<Image*>(resourceManager->get(str, + return static_cast<Image*>(ResourceManager::get(str, SubImageLoader::load, &rl)); } diff --git a/src/resources/loaders/subimagesetloader.cpp b/src/resources/loaders/subimagesetloader.cpp index c8d0fba74..6ca43cb32 100644 --- a/src/resources/loaders/subimagesetloader.cpp +++ b/src/resources/loaders/subimagesetloader.cpp @@ -73,6 +73,6 @@ ImageSet *Loader::getSubImageSet(Image *const parent, "x").append(toString( height)).append( "]"); - return static_cast<ImageSet*>(resourceManager->get(str, + return static_cast<ImageSet*>(ResourceManager::get(str, SubImageSetLoader::load, &rl)); } diff --git a/src/resources/loaders/walklayerloader.cpp b/src/resources/loaders/walklayerloader.cpp index 71f94539a..99d7a251f 100644 --- a/src/resources/loaders/walklayerloader.cpp +++ b/src/resources/loaders/walklayerloader.cpp @@ -58,7 +58,7 @@ WalkLayer *Loader::getWalkLayer(const std::string &name, Map *const map) { WalkLayerLoader rl = {name, map}; - return static_cast<WalkLayer*>(resourceManager->get("map_" + name, + return static_cast<WalkLayer*>(ResourceManager::get("map_" + name, WalkLayerLoader::load, &rl)); } #else // DYECMD diff --git a/src/resources/loaders/xmlloader.cpp b/src/resources/loaders/xmlloader.cpp index ac005bc06..74dd46ef9 100644 --- a/src/resources/loaders/xmlloader.cpp +++ b/src/resources/loaders/xmlloader.cpp @@ -58,7 +58,7 @@ XML::Document *Loader::getXml(const std::string &idPath, const SkipError skipError) { ResourceLoader rl = { idPath, useResman, skipError }; - return static_cast<XML::Document*>(resourceManager->get( + return static_cast<XML::Document*>(ResourceManager::get( idPath, ResourceLoader::load, &rl)); } |