From b0659d030bf850c68acb83c8b6e7807c1fcac975 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 19 May 2014 12:42:17 +0300 Subject: Move spritereference into separate file. --- src/CMakeLists.txt | 1 + src/Makefile.am | 1 + src/being/actorsprite.cpp | 1 + src/client.cpp | 3 ++- src/resources/beinginfo.cpp | 1 + src/resources/db/avatardb.cpp | 1 + src/resources/db/itemdb.cpp | 1 + src/resources/db/monsterdb.cpp | 1 + src/resources/db/npcdb.cpp | 1 + src/resources/db/petdb.cpp | 1 + src/resources/spritedef.cpp | 1 + src/resources/spritedef.h | 19 +-------------- src/resources/spritereference.h | 51 +++++++++++++++++++++++++++++++++++++++++ 13 files changed, 64 insertions(+), 19 deletions(-) create mode 100644 src/resources/spritereference.h (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9001d9a59..2612786f0 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -599,6 +599,7 @@ SET(SRCS resources/soundinfo.h resources/spritedef.h resources/spritedef.cpp + resources/spritereference.h resources/subimage.cpp resources/subimage.h resources/surfaceimagehelper.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 39c032946..ba7e66255 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -105,6 +105,7 @@ dyecmd_SOURCES += dyetool/dyemain.cpp \ resources/updatefile.h \ resources/spritedef.cpp \ resources/spritedef.h \ + resources/spritereference.h \ utils/mkdir.cpp \ utils/mkdir.h \ utils/paths.cpp \ diff --git a/src/being/actorsprite.cpp b/src/being/actorsprite.cpp index f52820f86..1a5a93404 100644 --- a/src/being/actorsprite.cpp +++ b/src/being/actorsprite.cpp @@ -35,6 +35,7 @@ #include "particle/particle.h" #include "resources/resourcemanager.h" +#include "resources/spritereference.h" #include "utils/checkutils.h" #include "utils/delete2.h" diff --git a/src/client.cpp b/src/client.cpp index 59b19392d..2217314c4 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -92,8 +92,9 @@ #include "resources/imagehelper.h" #include "resources/openglimagehelper.h" -#include "resources/surfaceimagehelper.h" #include "resources/resourcemanager.h" +#include "resources/surfaceimagehelper.h" +#include "resources/spritereference.h" #include "resources/db/avatardb.h" #include "resources/db/chardb.h" diff --git a/src/resources/beinginfo.cpp b/src/resources/beinginfo.cpp index a20e55d86..6fbf0a5ae 100644 --- a/src/resources/beinginfo.cpp +++ b/src/resources/beinginfo.cpp @@ -26,6 +26,7 @@ #include "logger.h" #include "resources/attack.h" +#include "resources/spritereference.h" #include "resources/map/blockmask.h" diff --git a/src/resources/db/avatardb.cpp b/src/resources/db/avatardb.cpp index e51a8d468..0074d4617 100644 --- a/src/resources/db/avatardb.cpp +++ b/src/resources/db/avatardb.cpp @@ -26,6 +26,7 @@ #include "resources/beingcommon.h" #include "resources/beinginfo.h" +#include "resources/spritereference.h" #include "utils/dtor.h" #include "utils/gettext.h" diff --git a/src/resources/db/itemdb.cpp b/src/resources/db/itemdb.cpp index c077f58fe..32b0ee67c 100644 --- a/src/resources/db/itemdb.cpp +++ b/src/resources/db/itemdb.cpp @@ -29,6 +29,7 @@ #include "resources/beingcommon.h" #include "resources/iteminfo.h" +#include "resources/spritereference.h" #include "utils/delete2.h" #include "utils/dtor.h" diff --git a/src/resources/db/monsterdb.cpp b/src/resources/db/monsterdb.cpp index d29cac7e9..a78707571 100644 --- a/src/resources/db/monsterdb.cpp +++ b/src/resources/db/monsterdb.cpp @@ -26,6 +26,7 @@ #include "resources/beingcommon.h" #include "resources/beinginfo.h" +#include "resources/spritereference.h" #include "resources/map/blockmask.h" diff --git a/src/resources/db/npcdb.cpp b/src/resources/db/npcdb.cpp index 359c86c4a..2301046df 100644 --- a/src/resources/db/npcdb.cpp +++ b/src/resources/db/npcdb.cpp @@ -26,6 +26,7 @@ #include "resources/beingcommon.h" #include "resources/beinginfo.h" +#include "resources/spritereference.h" #include "utils/dtor.h" #include "configuration.h" diff --git a/src/resources/db/petdb.cpp b/src/resources/db/petdb.cpp index 7af3c5d09..2d7417f45 100644 --- a/src/resources/db/petdb.cpp +++ b/src/resources/db/petdb.cpp @@ -27,6 +27,7 @@ #include "resources/beingcommon.h" #include "resources/beinginfo.h" +#include "resources/spritereference.h" #include "utils/gettext.h" #include "utils/dtor.h" diff --git a/src/resources/spritedef.cpp b/src/resources/spritedef.cpp index c41d95aa5..40194bffb 100644 --- a/src/resources/spritedef.cpp +++ b/src/resources/spritedef.cpp @@ -31,6 +31,7 @@ #include "resources/dye.h" #include "resources/imageset.h" #include "resources/resourcemanager.h" +#include "resources/spritereference.h" #include "configuration.h" diff --git a/src/resources/spritedef.h b/src/resources/spritedef.h index b9f5d2b19..a77ce8411 100644 --- a/src/resources/spritedef.h +++ b/src/resources/spritedef.h @@ -36,24 +36,7 @@ class Action; class Animation; class ImageSet; -struct SpriteReference final -{ - static SpriteReference *Empty; - - SpriteReference(): - sprite(""), variant(0) - {} - - SpriteReference(const std::string &sprite0, const int variant0) : - sprite(sprite0), variant(variant0) - { - } - - A_DELETE_COPY(SpriteReference) - - std::string sprite; - int variant; -}; +struct SpriteReference; struct SpriteDisplay final { diff --git a/src/resources/spritereference.h b/src/resources/spritereference.h new file mode 100644 index 000000000..4e3c16e1f --- /dev/null +++ b/src/resources/spritereference.h @@ -0,0 +1,51 @@ +/* + * The ManaPlus Client + * Copyright (C) 2004-2009 The Mana World Development Team + * Copyright (C) 2009-2010 The Mana Developers + * Copyright (C) 2011-2014 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 . + */ + +#ifndef RESOURCES_SPRITEREFERENCE_H +#define RESOURCES_SPRITEREFERENCE_H + +#include + +#include "localconsts.h" + +struct SpriteReference final +{ + static SpriteReference *Empty; + + SpriteReference(): + sprite(), + variant(0) + {} + + SpriteReference(const std::string &sprite0, const int variant0) : + sprite(sprite0), + variant(variant0) + { + } + + A_DELETE_COPY(SpriteReference) + + std::string sprite; + int variant; +}; + +#endif // RESOURCES_SPRITEREFERENCE_H -- cgit v1.2.3-60-g2f50