From c4269ec3066959725f0f1d7670a14eadc8831a76 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 20 Dec 2015 18:50:06 +0300
Subject: Move imagesprite into sprite directory.
---
src/CMakeLists.txt | 4 +-
src/Makefile.am | 4 +-
src/being/actorsprite.cpp | 2 +-
src/imagesprite.cpp | 60 --------------------------
src/imagesprite.h | 82 ------------------------------------
src/resources/sprite/imagesprite.cpp | 60 ++++++++++++++++++++++++++
src/resources/sprite/imagesprite.h | 82 ++++++++++++++++++++++++++++++++++++
7 files changed, 147 insertions(+), 147 deletions(-)
delete mode 100644 src/imagesprite.cpp
delete mode 100644 src/imagesprite.h
create mode 100644 src/resources/sprite/imagesprite.cpp
create mode 100644 src/resources/sprite/imagesprite.h
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1307039e4..fb2429bec 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -944,8 +944,8 @@ SET(SRCS
enums/magicschool.h
particle/imageparticle.cpp
particle/imageparticle.h
- imagesprite.cpp
- imagesprite.h
+ resources/sprite/imagesprite.cpp
+ resources/sprite/imagesprite.h
inventory.cpp
inventory.h
item.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 98ad1ef6d..0f89cf44d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -706,8 +706,8 @@ manaplus_SOURCES += main.cpp \
actions/windows.h \
client.cpp \
client.h \
- imagesprite.cpp \
- imagesprite.h \
+ resources/sprite/imagesprite.cpp \
+ resources/sprite/imagesprite.h \
inventory.cpp \
inventory.h \
textcommand.cpp \
diff --git a/src/being/actorsprite.cpp b/src/being/actorsprite.cpp
index c9577b2dc..5fd9884de 100644
--- a/src/being/actorsprite.cpp
+++ b/src/being/actorsprite.cpp
@@ -22,7 +22,6 @@
#include "being/actorsprite.h"
#include "configuration.h"
-#include "imagesprite.h"
#include "statuseffect.h"
#include "being/localplayer.h"
@@ -38,6 +37,7 @@
#include "resources/resourcemanager.h"
#include "resources/sprite/animatedsprite.h"
+#include "resources/sprite/imagesprite.h"
#include "resources/sprite/spritereference.h"
#include "utils/checkutils.h"
diff --git a/src/imagesprite.cpp b/src/imagesprite.cpp
deleted file mode 100644
index 953e91472..000000000
--- a/src/imagesprite.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * The ManaPlus Client
- * Copyright (C) 2010 The Mana Developers
- * Copyright (C) 2011-2015 The ManaPlus Developers
- *
- * This file is part of The ManaPlus Client.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "imagesprite.h"
-
-#include "render/graphics.h"
-
-#include "debug.h"
-
-ImageSprite::ImageSprite(Image *const image) :
- mImage(image)
-{
- if (mImage)
- {
- mAlpha = mImage->getAlpha();
- mImage->incRef();
- }
- else
- {
- mAlpha = 1;
- }
-}
-
-ImageSprite::~ImageSprite()
-{
- if (mImage)
- {
- mImage->decRef();
- mImage = nullptr;
- }
-}
-
-void ImageSprite::draw(Graphics *const graphics,
- const int posX, const int posY) const
-{
- FUNC_BLOCK("ImageSprite::draw", 1)
- if (!mImage)
- return;
-
- mImage->setAlpha(mAlpha);
- graphics->drawImage(mImage, posX, posY);
-}
diff --git a/src/imagesprite.h b/src/imagesprite.h
deleted file mode 100644
index 61defaa2f..000000000
--- a/src/imagesprite.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * The ManaPlus Client
- * Copyright (C) 2010 The Mana Developers
- * Copyright (C) 2011-2015 The ManaPlus Developers
- *
- * This file is part of The ManaPlus Client.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef IMAGESPRITE_H
-#define IMAGESPRITE_H
-
-#include "resources/sprite/sprite.h"
-
-#include "resources/image.h"
-
-class Graphics;
-
-class ImageSprite final : public Sprite
-{
- public:
- explicit ImageSprite(Image *const image);
-
- A_DELETE_COPY(ImageSprite)
-
- ~ImageSprite();
-
- bool reset() override final
- { return false; }
-
- bool play(const std::string &action A_UNUSED) override final
- { return false; }
-
- bool update(const int time A_UNUSED) override final
- { return false; }
-
- void draw(Graphics *const graphics,
- const int posX, const int posY)
- const override final A_NONNULL(2);
-
- int getWidth() const override final A_WARN_UNUSED
- { return mImage ? mImage->getWidth() : 0; }
-
- int getHeight() const override final A_WARN_UNUSED
- { return mImage ? mImage->getHeight() : 0; }
-
- const Image* getImage() const override final A_WARN_UNUSED
- { return mImage; }
-
- bool setSpriteDirection(const SpriteDirection::Type
- direction A_UNUSED) override final
- { return false; }
-
- int getNumberOfLayers() const A_WARN_UNUSED
- { return 1; }
-
- unsigned int getCurrentFrame() const override final A_WARN_UNUSED
- { return 0; }
-
- unsigned int getFrameCount() const override final A_WARN_UNUSED
- { return 1; }
-
- bool updateNumber(const unsigned num A_UNUSED) override final
- { return false; }
-
- private:
- Image *mImage;
-};
-
-#endif // IMAGESPRITE_H
diff --git a/src/resources/sprite/imagesprite.cpp b/src/resources/sprite/imagesprite.cpp
new file mode 100644
index 000000000..9b14e3126
--- /dev/null
+++ b/src/resources/sprite/imagesprite.cpp
@@ -0,0 +1,60 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2010 The Mana Developers
+ * Copyright (C) 2011-2015 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "resources/sprite/imagesprite.h"
+
+#include "render/graphics.h"
+
+#include "debug.h"
+
+ImageSprite::ImageSprite(Image *const image) :
+ mImage(image)
+{
+ if (mImage)
+ {
+ mAlpha = mImage->getAlpha();
+ mImage->incRef();
+ }
+ else
+ {
+ mAlpha = 1;
+ }
+}
+
+ImageSprite::~ImageSprite()
+{
+ if (mImage)
+ {
+ mImage->decRef();
+ mImage = nullptr;
+ }
+}
+
+void ImageSprite::draw(Graphics *const graphics,
+ const int posX, const int posY) const
+{
+ FUNC_BLOCK("ImageSprite::draw", 1)
+ if (!mImage)
+ return;
+
+ mImage->setAlpha(mAlpha);
+ graphics->drawImage(mImage, posX, posY);
+}
diff --git a/src/resources/sprite/imagesprite.h b/src/resources/sprite/imagesprite.h
new file mode 100644
index 000000000..89a8bdbe1
--- /dev/null
+++ b/src/resources/sprite/imagesprite.h
@@ -0,0 +1,82 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2010 The Mana Developers
+ * Copyright (C) 2011-2015 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef RESOURCES_SPRITE_IMAGESPRITE_H
+#define RESOURCES_SPRITE_IMAGESPRITE_H
+
+#include "resources/sprite/sprite.h"
+
+#include "resources/image.h"
+
+class Graphics;
+
+class ImageSprite final : public Sprite
+{
+ public:
+ explicit ImageSprite(Image *const image);
+
+ A_DELETE_COPY(ImageSprite)
+
+ ~ImageSprite();
+
+ bool reset() override final
+ { return false; }
+
+ bool play(const std::string &action A_UNUSED) override final
+ { return false; }
+
+ bool update(const int time A_UNUSED) override final
+ { return false; }
+
+ void draw(Graphics *const graphics,
+ const int posX, const int posY)
+ const override final A_NONNULL(2);
+
+ int getWidth() const override final A_WARN_UNUSED
+ { return mImage ? mImage->getWidth() : 0; }
+
+ int getHeight() const override final A_WARN_UNUSED
+ { return mImage ? mImage->getHeight() : 0; }
+
+ const Image* getImage() const override final A_WARN_UNUSED
+ { return mImage; }
+
+ bool setSpriteDirection(const SpriteDirection::Type
+ direction A_UNUSED) override final
+ { return false; }
+
+ int getNumberOfLayers() const A_WARN_UNUSED
+ { return 1; }
+
+ unsigned int getCurrentFrame() const override final A_WARN_UNUSED
+ { return 0; }
+
+ unsigned int getFrameCount() const override final A_WARN_UNUSED
+ { return 1; }
+
+ bool updateNumber(const unsigned num A_UNUSED) override final
+ { return false; }
+
+ private:
+ Image *mImage;
+};
+
+#endif // RESOURCES_SPRITE_IMAGESPRITE_H
--
cgit v1.2.3-70-g09d2