summaryrefslogtreecommitdiff
path: root/src/resources/loaders
diff options
context:
space:
mode:
Diffstat (limited to 'src/resources/loaders')
-rw-r--r--src/resources/loaders/atlasloader.cpp2
-rw-r--r--src/resources/loaders/emptyatlasloader.cpp2
-rw-r--r--src/resources/loaders/imageloader.cpp2
-rw-r--r--src/resources/loaders/imagesetloader.cpp2
-rw-r--r--src/resources/loaders/musicloader.cpp2
-rw-r--r--src/resources/loaders/rescaledloader.cpp4
-rw-r--r--src/resources/loaders/shaderloader.cpp2
-rw-r--r--src/resources/loaders/shaderprogramloader.cpp2
-rw-r--r--src/resources/loaders/soundloader.cpp2
-rw-r--r--src/resources/loaders/spritedefloader.cpp2
-rw-r--r--src/resources/loaders/subimageloader.cpp2
-rw-r--r--src/resources/loaders/subimagesetloader.cpp2
-rw-r--r--src/resources/loaders/walklayerloader.cpp2
-rw-r--r--src/resources/loaders/xmlloader.cpp2
14 files changed, 15 insertions, 15 deletions
diff --git a/src/resources/loaders/atlasloader.cpp b/src/resources/loaders/atlasloader.cpp
index 1faa98b44..d3e2e276f 100644
--- a/src/resources/loaders/atlasloader.cpp
+++ b/src/resources/loaders/atlasloader.cpp
@@ -43,7 +43,7 @@ struct AtlasLoader final
if (!v)
return nullptr;
- const AtlasLoader *const rl = static_cast<const AtlasLoader *const>(v);
+ const AtlasLoader *const rl = static_cast<const AtlasLoader *>(v);
AtlasResource *const resource = AtlasManager::loadTextureAtlas(
rl->name, *rl->files);
if (!resource)
diff --git a/src/resources/loaders/emptyatlasloader.cpp b/src/resources/loaders/emptyatlasloader.cpp
index 6fe2f1463..24c73ac21 100644
--- a/src/resources/loaders/emptyatlasloader.cpp
+++ b/src/resources/loaders/emptyatlasloader.cpp
@@ -44,7 +44,7 @@ struct EmptyAtlasLoader final
return nullptr;
const EmptyAtlasLoader *const rl =
- static_cast<const EmptyAtlasLoader *const>(v);
+ static_cast<const EmptyAtlasLoader *>(v);
AtlasResource *const resource = AtlasManager::loadEmptyAtlas(
rl->name, *rl->files);
if (!resource)
diff --git a/src/resources/loaders/imageloader.cpp b/src/resources/loaders/imageloader.cpp
index 268466654..5a1830e15 100644
--- a/src/resources/loaders/imageloader.cpp
+++ b/src/resources/loaders/imageloader.cpp
@@ -53,7 +53,7 @@ namespace
}
const DyedImageLoader *const rl
- = static_cast<const DyedImageLoader *const>(v);
+ = static_cast<const DyedImageLoader *>(v);
std::string path1 = rl->path;
const size_t p = path1.find('|');
diff --git a/src/resources/loaders/imagesetloader.cpp b/src/resources/loaders/imagesetloader.cpp
index 468b97120..342b26d9a 100644
--- a/src/resources/loaders/imagesetloader.cpp
+++ b/src/resources/loaders/imagesetloader.cpp
@@ -48,7 +48,7 @@ struct ImageSetLoader final
return nullptr;
const ImageSetLoader *const
- rl = static_cast<const ImageSetLoader *const>(v);
+ rl = static_cast<const ImageSetLoader *>(v);
Image *const img = Loader::getImage(rl->path);
if (!img)
diff --git a/src/resources/loaders/musicloader.cpp b/src/resources/loaders/musicloader.cpp
index 3c6c7e1c2..23a994e1b 100644
--- a/src/resources/loaders/musicloader.cpp
+++ b/src/resources/loaders/musicloader.cpp
@@ -45,7 +45,7 @@ namespace
if (!v)
return nullptr;
const ResourceLoader *const
- rl = static_cast<const ResourceLoader *const>(v);
+ rl = static_cast<const ResourceLoader *>(v);
SDL_RWops *const rw = VirtFs::rwopsOpenRead(rl->path);
if (!rw)
{
diff --git a/src/resources/loaders/rescaledloader.cpp b/src/resources/loaders/rescaledloader.cpp
index 8f77103ff..c6a70f969 100644
--- a/src/resources/loaders/rescaledloader.cpp
+++ b/src/resources/loaders/rescaledloader.cpp
@@ -45,7 +45,7 @@ namespace
if (!v)
return nullptr;
const RescaledLoader *const rl
- = static_cast<const RescaledLoader *const>(v);
+ = static_cast<const RescaledLoader *>(v);
if (!rl->image)
return nullptr;
Image *const rescaled = rl->image->SDLgetScaledImage(
@@ -71,7 +71,7 @@ Image *Loader::getRescaled(const Image *const image,
const std::string idPath = image->mIdPath + strprintf(
"_rescaled%dx%d", width, height);
const RescaledLoader rl = { image, width, height };
- Image *const img = static_cast<Image *const>(
+ Image *const img = static_cast<Image *>(
ResourceManager::get(idPath, RescaledLoader::load, &rl));
return img;
}
diff --git a/src/resources/loaders/shaderloader.cpp b/src/resources/loaders/shaderloader.cpp
index d2ffba348..5d5b70869 100644
--- a/src/resources/loaders/shaderloader.cpp
+++ b/src/resources/loaders/shaderloader.cpp
@@ -48,7 +48,7 @@ namespace
return nullptr;
const ShaderLoader *const rl
- = static_cast<const ShaderLoader *const>(v);
+ = static_cast<const ShaderLoader *>(v);
Shader *const resource = shaders.createShader(rl->type, rl->name);
if (!resource)
reportAlways("Shader creation error: %s", rl->name.c_str());
diff --git a/src/resources/loaders/shaderprogramloader.cpp b/src/resources/loaders/shaderprogramloader.cpp
index 763536a6c..2f73cb5a8 100644
--- a/src/resources/loaders/shaderprogramloader.cpp
+++ b/src/resources/loaders/shaderprogramloader.cpp
@@ -49,7 +49,7 @@ namespace
return nullptr;
const ShaderProgramLoader *const rl
- = static_cast<const ShaderProgramLoader *const>(v);
+ = static_cast<const ShaderProgramLoader *>(v);
ShaderProgram *const resource = shaders.createProgram(
rl->vertex,
rl->fragment,
diff --git a/src/resources/loaders/soundloader.cpp b/src/resources/loaders/soundloader.cpp
index bbab6d6ee..f5e7f1058 100644
--- a/src/resources/loaders/soundloader.cpp
+++ b/src/resources/loaders/soundloader.cpp
@@ -45,7 +45,7 @@ namespace
if (!v)
return nullptr;
const ResourceLoader *const
- rl = static_cast<const ResourceLoader *const>(v);
+ rl = static_cast<const ResourceLoader *>(v);
SDL_RWops *const rw = VirtFs::rwopsOpenRead(rl->path);
if (!rw)
{
diff --git a/src/resources/loaders/spritedefloader.cpp b/src/resources/loaders/spritedefloader.cpp
index cb535ca7a..69f182b89 100644
--- a/src/resources/loaders/spritedefloader.cpp
+++ b/src/resources/loaders/spritedefloader.cpp
@@ -46,7 +46,7 @@ namespace
return nullptr;
const SpriteDefLoader *const
- rl = static_cast<const SpriteDefLoader *const>(v);
+ rl = static_cast<const SpriteDefLoader *>(v);
return SpriteDef::load(rl->path,
rl->variant,
settings.uselonglivesprites);
diff --git a/src/resources/loaders/subimageloader.cpp b/src/resources/loaders/subimageloader.cpp
index c63bf74d6..f340f69c9 100644
--- a/src/resources/loaders/subimageloader.cpp
+++ b/src/resources/loaders/subimageloader.cpp
@@ -48,7 +48,7 @@ namespace
return nullptr;
const SubImageLoader *const
- rl = static_cast<const SubImageLoader *const>(v);
+ rl = static_cast<const SubImageLoader *>(v);
if (!rl->parent)
return nullptr;
diff --git a/src/resources/loaders/subimagesetloader.cpp b/src/resources/loaders/subimagesetloader.cpp
index f721b1c2b..4aefb4c2e 100644
--- a/src/resources/loaders/subimagesetloader.cpp
+++ b/src/resources/loaders/subimagesetloader.cpp
@@ -47,7 +47,7 @@ namespace
return nullptr;
const SubImageSetLoader *const
- rl = static_cast<const SubImageSetLoader *const>(v);
+ rl = static_cast<const SubImageSetLoader *>(v);
if (!rl->parent)
return nullptr;
diff --git a/src/resources/loaders/walklayerloader.cpp b/src/resources/loaders/walklayerloader.cpp
index bfbee82ab..c5e4569c8 100644
--- a/src/resources/loaders/walklayerloader.cpp
+++ b/src/resources/loaders/walklayerloader.cpp
@@ -46,7 +46,7 @@ struct WalkLayerLoader final
return nullptr;
const WalkLayerLoader *const rl = static_cast<const
- WalkLayerLoader *const>(v);
+ WalkLayerLoader *>(v);
Resource *const resource = NavigationManager::loadWalkLayer(rl->map);
if (!resource)
reportAlways("WalkLayer creation error");
diff --git a/src/resources/loaders/xmlloader.cpp b/src/resources/loaders/xmlloader.cpp
index 776dbcf76..9cacd1c41 100644
--- a/src/resources/loaders/xmlloader.cpp
+++ b/src/resources/loaders/xmlloader.cpp
@@ -43,7 +43,7 @@ namespace
if (!v)
return nullptr;
const ResourceLoader *const
- rl = static_cast<const ResourceLoader *const>(v);
+ rl = static_cast<const ResourceLoader *>(v);
Resource *const res = new XML::Document(rl->path,
rl->useResman,
rl->skipError);