summaryrefslogtreecommitdiff
path: root/src/resources/loaders
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-01-17 18:21:23 +0300
committerAndrei Karas <akaras@inbox.ru>2017-01-17 18:21:23 +0300
commit0f64a06317df182ab0ff4a0ae9fbe1aad880dcc0 (patch)
tree99d5be24dafbf05ba3b30e603296222fe7e407dc /src/resources/loaders
parent45115a07e0753fe30bcaac59ec9f3ed4da5048c2 (diff)
downloadmv-0f64a06317df182ab0ff4a0ae9fbe1aad880dcc0.tar.gz
mv-0f64a06317df182ab0ff4a0ae9fbe1aad880dcc0.tar.bz2
mv-0f64a06317df182ab0ff4a0ae9fbe1aad880dcc0.tar.xz
mv-0f64a06317df182ab0ff4a0ae9fbe1aad880dcc0.zip
Add missing A_DEFAULT_COPY / A_DELETE_COPY into resources.
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.cpp3
-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.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, 29 insertions, 0 deletions
diff --git a/src/resources/loaders/atlasloader.cpp b/src/resources/loaders/atlasloader.cpp
index c95099d0b..ec14f03ff 100644
--- a/src/resources/loaders/atlasloader.cpp
+++ b/src/resources/loaders/atlasloader.cpp
@@ -33,6 +33,8 @@
struct AtlasLoader final
{
+ A_DELETE_COPY(AtlasLoader)
+
const std::string name;
const StringVect *const files;
diff --git a/src/resources/loaders/emptyatlasloader.cpp b/src/resources/loaders/emptyatlasloader.cpp
index 410c42051..e3dfa7734 100644
--- a/src/resources/loaders/emptyatlasloader.cpp
+++ b/src/resources/loaders/emptyatlasloader.cpp
@@ -33,6 +33,8 @@
struct EmptyAtlasLoader final
{
+ A_DELETE_COPY(EmptyAtlasLoader)
+
const std::string name;
const StringVect *const files;
diff --git a/src/resources/loaders/imageloader.cpp b/src/resources/loaders/imageloader.cpp
index cf8a7ecc8..f1917d5cc 100644
--- a/src/resources/loaders/imageloader.cpp
+++ b/src/resources/loaders/imageloader.cpp
@@ -39,6 +39,8 @@ namespace
{
struct DyedImageLoader final
{
+ A_DELETE_COPY(DyedImageLoader)
+
std::string path;
static Resource *load(const void *const v)
{
diff --git a/src/resources/loaders/imagesetloader.cpp b/src/resources/loaders/imagesetloader.cpp
index cb13d1293..66a380397 100644
--- a/src/resources/loaders/imagesetloader.cpp
+++ b/src/resources/loaders/imagesetloader.cpp
@@ -39,6 +39,9 @@ struct ImageSetLoader final
const std::string path;
const int w;
const int h;
+
+ A_DELETE_COPY(ImageSetLoader)
+
static Resource *load(const void *const v)
{
if (!v)
diff --git a/src/resources/loaders/musicloader.cpp b/src/resources/loaders/musicloader.cpp
index 27b15c1c1..c8f79f7b6 100644
--- a/src/resources/loaders/musicloader.cpp
+++ b/src/resources/loaders/musicloader.cpp
@@ -35,6 +35,8 @@ namespace
{
struct ResourceLoader final
{
+ A_DELETE_COPY(ResourceLoader)
+
const std::string path;
static Resource *load(const void *const v)
diff --git a/src/resources/loaders/rescaledloader.cpp b/src/resources/loaders/rescaledloader.cpp
index 9bf2272b5..4f4c9b7b0 100644
--- a/src/resources/loaders/rescaledloader.cpp
+++ b/src/resources/loaders/rescaledloader.cpp
@@ -35,6 +35,8 @@ namespace
{
struct RescaledLoader final
{
+ A_DELETE_COPY(RescaledLoader)
+
const Image *const image;
const int width;
const int height;
diff --git a/src/resources/loaders/shaderloader.cpp b/src/resources/loaders/shaderloader.cpp
index 7c5edcb19..291201684 100644
--- a/src/resources/loaders/shaderloader.cpp
+++ b/src/resources/loaders/shaderloader.cpp
@@ -37,6 +37,8 @@ namespace
{
struct ShaderLoader final
{
+ A_DELETE_COPY(ShaderLoader)
+
const std::string name;
const unsigned int type;
diff --git a/src/resources/loaders/shaderprogramloader.cpp b/src/resources/loaders/shaderprogramloader.cpp
index 626d5f93a..682f89d6c 100644
--- a/src/resources/loaders/shaderprogramloader.cpp
+++ b/src/resources/loaders/shaderprogramloader.cpp
@@ -37,6 +37,8 @@ namespace
{
struct ShaderProgramLoader final
{
+ A_DELETE_COPY(ShaderProgramLoader)
+
const std::string vertex;
const std::string fragment;
const bool isNewShader;
diff --git a/src/resources/loaders/soundloader.cpp b/src/resources/loaders/soundloader.cpp
index 2ed5e526f..0eb7f0200 100644
--- a/src/resources/loaders/soundloader.cpp
+++ b/src/resources/loaders/soundloader.cpp
@@ -35,6 +35,8 @@ namespace
{
struct ResourceLoader final
{
+ A_DELETE_COPY(ResourceLoader)
+
const std::string path;
static Resource *load(const void *const v)
diff --git a/src/resources/loaders/spritedefloader.cpp b/src/resources/loaders/spritedefloader.cpp
index 3e9d48155..ef37d2315 100644
--- a/src/resources/loaders/spritedefloader.cpp
+++ b/src/resources/loaders/spritedefloader.cpp
@@ -36,6 +36,8 @@ namespace
{
struct SpriteDefLoader final
{
+ A_DELETE_COPY(SpriteDefLoader)
+
const std::string path;
const int variant;
static Resource *load(const void *const v)
diff --git a/src/resources/loaders/subimageloader.cpp b/src/resources/loaders/subimageloader.cpp
index 18ba3d7d5..ce9177995 100644
--- a/src/resources/loaders/subimageloader.cpp
+++ b/src/resources/loaders/subimageloader.cpp
@@ -35,6 +35,8 @@ namespace
{
struct SubImageLoader final
{
+ A_DELETE_COPY(SubImageLoader)
+
Image *const parent;
const int x;
const int y;
diff --git a/src/resources/loaders/subimagesetloader.cpp b/src/resources/loaders/subimagesetloader.cpp
index 5be38fa80..1dcaffcc8 100644
--- a/src/resources/loaders/subimagesetloader.cpp
+++ b/src/resources/loaders/subimagesetloader.cpp
@@ -36,6 +36,8 @@ namespace
{
struct SubImageSetLoader final
{
+ A_DELETE_COPY(SubImageSetLoader)
+
Image *const parent;
int width;
int height;
diff --git a/src/resources/loaders/walklayerloader.cpp b/src/resources/loaders/walklayerloader.cpp
index 4e76d9fe7..4fbac1010 100644
--- a/src/resources/loaders/walklayerloader.cpp
+++ b/src/resources/loaders/walklayerloader.cpp
@@ -35,6 +35,8 @@
#ifndef DYECMD
struct WalkLayerLoader final
{
+ A_DELETE_COPY(WalkLayerLoader)
+
const std::string name;
const Map *const map;
diff --git a/src/resources/loaders/xmlloader.cpp b/src/resources/loaders/xmlloader.cpp
index baeef118c..31e61df6d 100644
--- a/src/resources/loaders/xmlloader.cpp
+++ b/src/resources/loaders/xmlloader.cpp
@@ -32,6 +32,8 @@ namespace
{
struct ResourceLoader final
{
+ A_DELETE_COPY(ResourceLoader)
+
const std::string path;
const UseResman useResman;
const SkipError skipError;