summaryrefslogtreecommitdiff
path: root/src/resources/loaders
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2018-11-26 00:51:57 +0300
committerAndrei Karas <akaras@inbox.ru>2018-11-27 20:33:15 +0300
commit0c20db8d108c4123fcc3ecb343759e68567a4d4e (patch)
treef577edeae7b4866d68c084a1eaa229e98c80ea8f /src/resources/loaders
parent2be4fc5b4eee97938657c9c8be73c4b91c8b9826 (diff)
downloadplus-0c20db8d108c4123fcc3ecb343759e68567a4d4e.tar.gz
plus-0c20db8d108c4123fcc3ecb343759e68567a4d4e.tar.bz2
plus-0c20db8d108c4123fcc3ecb343759e68567a4d4e.tar.xz
plus-0c20db8d108c4123fcc3ecb343759e68567a4d4e.zip
Remove extra ; from different code.
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.cpp4
-rw-r--r--src/resources/loaders/imagesetloader.cpp2
-rw-r--r--src/resources/loaders/musicloader.cpp2
-rw-r--r--src/resources/loaders/rescaledloader.cpp2
-rw-r--r--src/resources/loaders/shaderloader.cpp2
-rw-r--r--src/resources/loaders/shaderprogramloader.cpp2
-rw-r--r--src/resources/loaders/soundloader.cpp4
-rw-r--r--src/resources/loaders/subimageloader.cpp2
-rw-r--r--src/resources/loaders/walklayerloader.cpp2
11 files changed, 13 insertions, 13 deletions
diff --git a/src/resources/loaders/atlasloader.cpp b/src/resources/loaders/atlasloader.cpp
index aa2585b27..fd435e57f 100644
--- a/src/resources/loaders/atlasloader.cpp
+++ b/src/resources/loaders/atlasloader.cpp
@@ -47,7 +47,7 @@ struct AtlasLoader final
AtlasResource *const resource = AtlasManager::loadTextureAtlas(
rl->name, *rl->files);
if (resource == nullptr)
- reportAlways("Atlas creation error: %s", rl->name.c_str());
+ reportAlways("Atlas creation error: %s", rl->name.c_str())
return resource;
}
};
diff --git a/src/resources/loaders/emptyatlasloader.cpp b/src/resources/loaders/emptyatlasloader.cpp
index b3d943075..71ea865e9 100644
--- a/src/resources/loaders/emptyatlasloader.cpp
+++ b/src/resources/loaders/emptyatlasloader.cpp
@@ -48,7 +48,7 @@ struct EmptyAtlasLoader final
AtlasResource *const resource = AtlasManager::loadEmptyAtlas(
rl->name, *rl->files);
if (resource == nullptr)
- reportAlways("Empty atlas creation error: %s", rl->name.c_str());
+ reportAlways("Empty atlas creation error: %s", rl->name.c_str())
return resource;
}
};
diff --git a/src/resources/loaders/imageloader.cpp b/src/resources/loaders/imageloader.cpp
index 2c619a4b8..4c573e98d 100644
--- a/src/resources/loaders/imageloader.cpp
+++ b/src/resources/loaders/imageloader.cpp
@@ -67,7 +67,7 @@ namespace
if (rw == nullptr)
{
delete d;
- reportAlways("Image loading error: %s", path1.c_str());
+ reportAlways("Image loading error: %s", path1.c_str())
BLOCK_END("DyedImageLoader::load")
return nullptr;
}
@@ -75,7 +75,7 @@ namespace
: imageHelper->load(rw);
delete d;
if (res == nullptr)
- reportAlways("Image loading error: %s", path1.c_str());
+ reportAlways("Image loading error: %s", path1.c_str())
BLOCK_END("DyedImageLoader::load")
return res;
}
diff --git a/src/resources/loaders/imagesetloader.cpp b/src/resources/loaders/imagesetloader.cpp
index 4fbcc2fc2..d62d3727b 100644
--- a/src/resources/loaders/imagesetloader.cpp
+++ b/src/resources/loaders/imagesetloader.cpp
@@ -53,7 +53,7 @@ struct ImageSetLoader final
Image *const img = Loader::getImage(rl->path);
if (img == nullptr)
{
- reportAlways("Image loading error: %s", rl->path.c_str());
+ reportAlways("Image loading error: %s", rl->path.c_str())
return nullptr;
}
ImageSet *const res = new ImageSet(img, rl->w, rl->h, 0, 0);
diff --git a/src/resources/loaders/musicloader.cpp b/src/resources/loaders/musicloader.cpp
index 6bd906490..97b5ceb73 100644
--- a/src/resources/loaders/musicloader.cpp
+++ b/src/resources/loaders/musicloader.cpp
@@ -51,7 +51,7 @@ namespace
if (rw == nullptr)
{
reportAlways("Error loading resource: %s",
- rl->path.c_str());
+ rl->path.c_str())
return nullptr;
}
if (Mix_Music *const music = SDL::LoadMUSOgg_RW(rw))
diff --git a/src/resources/loaders/rescaledloader.cpp b/src/resources/loaders/rescaledloader.cpp
index 085614870..8f872943b 100644
--- a/src/resources/loaders/rescaledloader.cpp
+++ b/src/resources/loaders/rescaledloader.cpp
@@ -53,7 +53,7 @@ namespace
if (rescaled == nullptr)
{
reportAlways("Rescale image failed: %s",
- rl->image->mIdPath.c_str());
+ rl->image->mIdPath.c_str())
return nullptr;
}
return rescaled;
diff --git a/src/resources/loaders/shaderloader.cpp b/src/resources/loaders/shaderloader.cpp
index 5f1edd3a7..ca3cd6a13 100644
--- a/src/resources/loaders/shaderloader.cpp
+++ b/src/resources/loaders/shaderloader.cpp
@@ -51,7 +51,7 @@ namespace
= static_cast<const ShaderLoader *>(v);
Shader *const resource = shaders.createShader(rl->type, rl->name);
if (resource == nullptr)
- reportAlways("Shader creation error: %s", rl->name.c_str());
+ reportAlways("Shader creation error: %s", rl->name.c_str())
return resource;
}
};
diff --git a/src/resources/loaders/shaderprogramloader.cpp b/src/resources/loaders/shaderprogramloader.cpp
index d0c6f1f41..2f981f590 100644
--- a/src/resources/loaders/shaderprogramloader.cpp
+++ b/src/resources/loaders/shaderprogramloader.cpp
@@ -55,7 +55,7 @@ namespace
rl->fragment,
rl->isNewShader);
if (resource == nullptr)
- reportAlways("Shader program creation error");
+ reportAlways("Shader program creation error")
return resource;
}
};
diff --git a/src/resources/loaders/soundloader.cpp b/src/resources/loaders/soundloader.cpp
index 96c90d4b4..f8550f631 100644
--- a/src/resources/loaders/soundloader.cpp
+++ b/src/resources/loaders/soundloader.cpp
@@ -50,7 +50,7 @@ namespace
if (rw == nullptr)
{
reportAlways("Error loading resource: %s",
- rl->path.c_str());
+ rl->path.c_str())
return nullptr;
}
// Load the music data and free the RWops structure
@@ -61,7 +61,7 @@ namespace
return new SoundEffect(tmpSoundEffect, rl->path);
}
reportAlways("Error, failed to load sound effect: %s",
- SDL_GetError());
+ SDL_GetError())
return nullptr;
}
};
diff --git a/src/resources/loaders/subimageloader.cpp b/src/resources/loaders/subimageloader.cpp
index 3b8672821..6abba11c9 100644
--- a/src/resources/loaders/subimageloader.cpp
+++ b/src/resources/loaders/subimageloader.cpp
@@ -57,7 +57,7 @@ namespace
if (res == nullptr)
{
reportAlways("SubImage loading error: %s",
- rl->parent->mSource.c_str());
+ rl->parent->mSource.c_str())
}
return res;
}
diff --git a/src/resources/loaders/walklayerloader.cpp b/src/resources/loaders/walklayerloader.cpp
index 3fcff35c2..c4bd99c44 100644
--- a/src/resources/loaders/walklayerloader.cpp
+++ b/src/resources/loaders/walklayerloader.cpp
@@ -49,7 +49,7 @@ struct WalkLayerLoader final
WalkLayerLoader *>(v);
Resource *const resource = NavigationManager::loadWalkLayer(rl->map);
if (resource == nullptr)
- reportAlways("WalkLayer creation error");
+ reportAlways("WalkLayer creation error")
return resource;
}
};