summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/action.h2
-rw-r--r--src/resources/ambientlayer.h2
-rw-r--r--src/resources/animation.h1
-rw-r--r--src/resources/atlasmanager.h11
-rw-r--r--src/resources/beinginfo.h4
-rw-r--r--src/resources/dye.h4
-rw-r--r--src/resources/emotedb.h10
-rw-r--r--src/resources/image.h2
-rw-r--r--src/resources/imagehelper.h5
-rw-r--r--src/resources/imageset.h4
-rw-r--r--src/resources/music.h5
-rw-r--r--src/resources/openglimagehelper.h6
-rw-r--r--src/resources/resource.h4
-rw-r--r--src/resources/resourcemanager.h2
-rw-r--r--src/resources/sdlimagehelper.h5
-rw-r--r--src/resources/soundeffect.h2
-rw-r--r--src/resources/specialdb.h5
-rw-r--r--src/resources/spritedef.h4
-rw-r--r--src/resources/subimage.h2
19 files changed, 80 insertions, 0 deletions
diff --git a/src/resources/action.h b/src/resources/action.h
index dbb572ef3..4cfb498f1 100644
--- a/src/resources/action.h
+++ b/src/resources/action.h
@@ -37,6 +37,8 @@ class Action final
public:
Action();
+ A_DELETE_COPY(Action);
+
~Action();
void setAnimation(const int direction, Animation *const animation);
diff --git a/src/resources/ambientlayer.h b/src/resources/ambientlayer.h
index 09767a472..6c051774e 100644
--- a/src/resources/ambientlayer.h
+++ b/src/resources/ambientlayer.h
@@ -44,6 +44,8 @@ class AmbientLayer final
const float speedX, const float speedY,
const bool keepRatio = false);
+ A_DELETE_COPY(AmbientLayer);
+
~AmbientLayer();
void update(const int timePassed, const float dx, const float dy);
diff --git a/src/resources/animation.h b/src/resources/animation.h
index 55db8b717..dd5421735 100644
--- a/src/resources/animation.h
+++ b/src/resources/animation.h
@@ -43,6 +43,7 @@ struct Frame final
LABEL,
PAUSE
};
+
Image *image;
int delay;
int offsetX;
diff --git a/src/resources/atlasmanager.h b/src/resources/atlasmanager.h
index 1606fc4c9..4976185a7 100644
--- a/src/resources/atlasmanager.h
+++ b/src/resources/atlasmanager.h
@@ -42,6 +42,8 @@ struct AtlasItem
{
}
+ A_DELETE_COPY(AtlasItem);
+
Image *image;
std::string name;
int x;
@@ -60,6 +62,8 @@ struct TextureAtlas
{
}
+ A_DELETE_COPY(TextureAtlas);
+
std::string name;
Image *atlasImage;
SDL_Surface *surface;
@@ -71,6 +75,11 @@ struct TextureAtlas
class AtlasResource : public Resource
{
public:
+ AtlasResource()
+ { }
+
+ A_DELETE_COPY(AtlasResource);
+
~AtlasResource();
void incRef();
@@ -85,6 +94,8 @@ class AtlasManager
public:
AtlasManager();
+ A_DELETE_COPY(AtlasManager);
+
static AtlasResource *loadTextureAtlas(const std::string &name,
const StringVect &files);
diff --git a/src/resources/beinginfo.h b/src/resources/beinginfo.h
index 208fcd541..f5e9650c1 100644
--- a/src/resources/beinginfo.h
+++ b/src/resources/beinginfo.h
@@ -48,6 +48,8 @@ struct Attack final
mMissileParticle(missileParticle)
{
}
+
+ A_DELETE_COPY(Attack);
};
typedef std::map<int, Attack*> Attacks;
@@ -81,6 +83,8 @@ class BeingInfo final
BeingInfo();
+ A_DELETE_COPY(BeingInfo);
+
~BeingInfo();
void setName(const std::string &name)
diff --git a/src/resources/dye.h b/src/resources/dye.h
index 1655ce051..0795f1276 100644
--- a/src/resources/dye.h
+++ b/src/resources/dye.h
@@ -47,6 +47,8 @@ class DyePalette final
*/
DyePalette(const std::string &pallete, const int8_t blockSize);
+ A_DELETE_COPY(DyePalette);
+
/**
* Gets a pixel color depending on its intensity. First color is
* implicitly black (0, 0, 0).
@@ -102,6 +104,8 @@ class Dye final
*/
Dye(const std::string &dye);
+ A_DELETE_COPY(Dye);
+
/**
* Destroys the associated palettes.
*/
diff --git a/src/resources/emotedb.h b/src/resources/emotedb.h
index bb4fbc4f5..e2d621a7f 100644
--- a/src/resources/emotedb.h
+++ b/src/resources/emotedb.h
@@ -33,12 +33,22 @@ class AnimatedSprite;
struct EmoteSprite final
{
+ EmoteSprite()
+ { }
+
+ A_DELETE_COPY(EmoteSprite);
+
const AnimatedSprite *sprite;
std::string name;
};
struct EmoteInfo final
{
+ EmoteInfo()
+ { }
+
+ A_DELETE_COPY(EmoteInfo);
+
std::list<EmoteSprite*> sprites;
StringVect particles;
};
diff --git a/src/resources/image.h b/src/resources/image.h
index 26498e988..160adcba3 100644
--- a/src/resources/image.h
+++ b/src/resources/image.h
@@ -65,6 +65,8 @@ class Image : public Resource
#endif
public:
+ A_DELETE_COPY(Image);
+
/**
* Destructor.
*/
diff --git a/src/resources/imagehelper.h b/src/resources/imagehelper.h
index fdda3b00f..ddd4ace97 100644
--- a/src/resources/imagehelper.h
+++ b/src/resources/imagehelper.h
@@ -43,6 +43,11 @@ class ImageHelper
friend class Image;
public:
+ ImageHelper()
+ { }
+
+ A_DELETE_COPY(ImageHelper);
+
virtual ~ImageHelper()
{ }
diff --git a/src/resources/imageset.h b/src/resources/imageset.h
index 4ff138d7f..35a429329 100644
--- a/src/resources/imageset.h
+++ b/src/resources/imageset.h
@@ -27,6 +27,8 @@
#include <vector>
+#include "localconsts.h"
+
class Image;
/**
@@ -41,6 +43,8 @@ class ImageSet : public Resource
ImageSet(Image *const img, const int w, const int h,
const int margin = 0, const int spacing = 0);
+ A_DELETE_COPY(ImageSet);
+
/**
* Destructor.
*/
diff --git a/src/resources/music.h b/src/resources/music.h
index e002f6b2f..96ad32981 100644
--- a/src/resources/music.h
+++ b/src/resources/music.h
@@ -35,6 +35,11 @@
class Music final : public Resource
{
public:
+ Music()
+ { }
+
+ A_DELETE_COPY(Music);
+
/**
* Destructor.
*/
diff --git a/src/resources/openglimagehelper.h b/src/resources/openglimagehelper.h
index e5c0cab5e..75a6c52ad 100644
--- a/src/resources/openglimagehelper.h
+++ b/src/resources/openglimagehelper.h
@@ -49,6 +49,12 @@ class OpenGLImageHelper final : public ImageHelper
friend class Image;
public:
+ OpenGLImageHelper()
+ {
+ }
+
+ A_DELETE_COPY(OpenGLImageHelper);
+
virtual ~OpenGLImageHelper()
{ }
diff --git a/src/resources/resource.h b/src/resources/resource.h
index d9b220338..4df9b47a0 100644
--- a/src/resources/resource.h
+++ b/src/resources/resource.h
@@ -28,6 +28,8 @@
#include <ctime>
#include <string>
+#include "localconsts.h"
+
/**
* A generic reference counted resource object.
*/
@@ -49,6 +51,8 @@ class Resource
{
}
+ A_DELETE_COPY(Resource);
+
/**
* Increments the internal reference count.
*/
diff --git a/src/resources/resourcemanager.h b/src/resources/resourcemanager.h
index 80461ce19..dcd909aa7 100644
--- a/src/resources/resourcemanager.h
+++ b/src/resources/resourcemanager.h
@@ -62,6 +62,8 @@ class ResourceManager final
ResourceManager();
+ A_DELETE_COPY(ResourceManager);
+
/**
* Destructor. Cleans up remaining resources, warning about resources
* that were still referenced.
diff --git a/src/resources/sdlimagehelper.h b/src/resources/sdlimagehelper.h
index 6884af28d..3c790e7b7 100644
--- a/src/resources/sdlimagehelper.h
+++ b/src/resources/sdlimagehelper.h
@@ -40,6 +40,11 @@ class SDLImageHelper final : public ImageHelper
friend class Image;
public:
+ SDLImageHelper()
+ { }
+
+ A_DELETE_COPY(SDLImageHelper);
+
virtual ~SDLImageHelper()
{ }
diff --git a/src/resources/soundeffect.h b/src/resources/soundeffect.h
index 6900669c9..229977c2a 100644
--- a/src/resources/soundeffect.h
+++ b/src/resources/soundeffect.h
@@ -35,6 +35,8 @@
class SoundEffect final : public Resource
{
public:
+ A_DELETE_COPY(SoundEffect);
+
/**
* Destructor.
*/
diff --git a/src/resources/specialdb.h b/src/resources/specialdb.h
index 1fa11df9e..d478f654b 100644
--- a/src/resources/specialdb.h
+++ b/src/resources/specialdb.h
@@ -27,6 +27,11 @@
struct SpecialInfo final
{
+ SpecialInfo()
+ { }
+
+ A_DELETE_COPY(SpecialInfo);
+
enum TargetMode
{
TARGET_SELF = 0, // no target selection
diff --git a/src/resources/spritedef.h b/src/resources/spritedef.h
index bc4f13a13..09e5171e4 100644
--- a/src/resources/spritedef.h
+++ b/src/resources/spritedef.h
@@ -49,6 +49,8 @@ struct SpriteReference final
{
}
+ A_DELETE_COPY(SpriteReference);
+
std::string sprite;
int variant;
};
@@ -110,6 +112,8 @@ enum SpriteDirection
class SpriteDef final : public Resource
{
public:
+ A_DELETE_COPY(SpriteDef);
+
/**
* Loads a sprite definition file.
*/
diff --git a/src/resources/subimage.h b/src/resources/subimage.h
index 719b9f4c1..c30b39177 100644
--- a/src/resources/subimage.h
+++ b/src/resources/subimage.h
@@ -59,6 +59,8 @@ class SubImage final : public Image
const int texWidth, const int textHeight);
#endif
+ A_DELETE_COPY(SubImage);
+
/**
* Destructor.
*/
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-04 12:24:03 +0000