From 5b0636a4bf89b22ec5e18fd41f9c9d122034b7a8 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 20 Dec 2015 18:18:10 +0300 Subject: Move spritereference.h into sprite directory. --- src/CMakeLists.txt | 4 +-- src/Makefile.am | 2 +- src/being/actorsprite.cpp | 3 +- src/client.cpp | 3 +- src/resources/beingcommon.cpp | 3 +- src/resources/beinginfo.cpp | 3 +- src/resources/db/avatardb.cpp | 3 +- src/resources/db/itemdb.cpp | 3 +- src/resources/db/npcdb.cpp | 3 +- src/resources/db/petdb.cpp | 3 +- src/resources/db/skillunitdb.cpp | 3 +- src/resources/horseinfo.h | 2 +- src/resources/sprite/spritedef.cpp | 3 +- src/resources/sprite/spritereference.h | 53 ++++++++++++++++++++++++++++++++++ src/resources/spritereference.h | 53 ---------------------------------- 15 files changed, 77 insertions(+), 67 deletions(-) create mode 100644 src/resources/sprite/spritereference.h delete mode 100644 src/resources/spritereference.h (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ac9d455ad..616a1fa8f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -739,7 +739,7 @@ SET(SRCS resources/sprite/spritedef.cpp enums/resources/spritedirection.h resources/sprite/spritedisplay.h - resources/spritereference.h + resources/sprite/spritereference.h resources/subimage.cpp resources/subimage.h resources/surfaceimagehelper.cpp @@ -1376,7 +1376,7 @@ SET(DYE_CMD_SRCS resources/sprite/spritedef.cpp resources/sprite/spritedef.h resources/sprite/spritedisplay.h - resources/spritereference.h + resources/sprite/spritereference.h utils/files.cpp utils/files.h utils/mkdir.cpp diff --git a/src/Makefile.am b/src/Makefile.am index bb1435f84..8665aff0e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1171,7 +1171,7 @@ manaplus_SOURCES += main.cpp \ resources/equipmentslots.h \ resources/horseinfo.h \ resources/sprite/spritedisplay.h \ - resources/spritereference.h \ + resources/sprite/spritereference.h \ resources/textureatlas.h \ resources/updatefile.h \ enums/resources/map/blockmask.h \ diff --git a/src/being/actorsprite.cpp b/src/being/actorsprite.cpp index b819ef497..a19cae0a2 100644 --- a/src/being/actorsprite.cpp +++ b/src/being/actorsprite.cpp @@ -37,7 +37,8 @@ #include "particle/particle.h" #include "resources/resourcemanager.h" -#include "resources/spritereference.h" + +#include "resources/sprite/spritereference.h" #include "utils/checkutils.h" #include "utils/delete2.h" diff --git a/src/client.cpp b/src/client.cpp index c61d9ef2d..4f4f5279a 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -98,7 +98,8 @@ #include "resources/imagehelper.h" #include "resources/resourcemanager.h" -#include "resources/spritereference.h" + +#include "resources/sprite/spritereference.h" #include "resources/db/avatardb.h" #include "resources/db/badgesdb.h" diff --git a/src/resources/beingcommon.cpp b/src/resources/beingcommon.cpp index 3025e658c..fcd51362b 100644 --- a/src/resources/beingcommon.cpp +++ b/src/resources/beingcommon.cpp @@ -28,7 +28,8 @@ #include "utils/files.h" #include "resources/beinginfo.h" -#include "resources/spritereference.h" + +#include "resources/sprite/spritereference.h" #include diff --git a/src/resources/beinginfo.cpp b/src/resources/beinginfo.cpp index 7bb5685ad..9d0820bf5 100644 --- a/src/resources/beinginfo.cpp +++ b/src/resources/beinginfo.cpp @@ -30,7 +30,8 @@ #include "enums/resources/map/blockmask.h" #include "resources/attack.h" -#include "resources/spritereference.h" + +#include "resources/sprite/spritereference.h" #include "resources/db/colordb.h" diff --git a/src/resources/db/avatardb.cpp b/src/resources/db/avatardb.cpp index 358cfea48..302697a80 100644 --- a/src/resources/db/avatardb.cpp +++ b/src/resources/db/avatardb.cpp @@ -26,7 +26,8 @@ #include "resources/beingcommon.h" #include "resources/beinginfo.h" -#include "resources/spritereference.h" + +#include "resources/sprite/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 5429698f1..7de8347fb 100644 --- a/src/resources/db/itemdb.cpp +++ b/src/resources/db/itemdb.cpp @@ -32,7 +32,8 @@ #include "resources/beingcommon.h" #include "resources/iteminfo.h" #include "resources/itemtypemapdata.h" -#include "resources/spritereference.h" + +#include "resources/sprite/spritereference.h" #include "resources/db/itemdbstat.h" diff --git a/src/resources/db/npcdb.cpp b/src/resources/db/npcdb.cpp index 1d2cf4899..057d9bc2c 100644 --- a/src/resources/db/npcdb.cpp +++ b/src/resources/db/npcdb.cpp @@ -27,7 +27,8 @@ #include "resources/beingcommon.h" #include "resources/beinginfo.h" -#include "resources/spritereference.h" + +#include "resources/sprite/spritereference.h" #include "utils/dtor.h" #include "utils/gettext.h" diff --git a/src/resources/db/petdb.cpp b/src/resources/db/petdb.cpp index f219a6889..ee5a398a9 100644 --- a/src/resources/db/petdb.cpp +++ b/src/resources/db/petdb.cpp @@ -27,7 +27,8 @@ #include "resources/beingcommon.h" #include "resources/beinginfo.h" -#include "resources/spritereference.h" + +#include "resources/sprite/spritereference.h" #include "utils/gettext.h" #include "utils/dtor.h" diff --git a/src/resources/db/skillunitdb.cpp b/src/resources/db/skillunitdb.cpp index a92748f45..ffd693b7b 100644 --- a/src/resources/db/skillunitdb.cpp +++ b/src/resources/db/skillunitdb.cpp @@ -27,7 +27,8 @@ #include "resources/beingcommon.h" #include "resources/beinginfo.h" -#include "resources/spritereference.h" + +#include "resources/sprite/spritereference.h" #include "utils/gettext.h" #include "utils/dtor.h" diff --git a/src/resources/horseinfo.h b/src/resources/horseinfo.h index 11cca4c8f..00eb96b28 100644 --- a/src/resources/horseinfo.h +++ b/src/resources/horseinfo.h @@ -22,7 +22,7 @@ #ifndef RESOURCES_HORSEINFO_H #define RESOURCES_HORSEINFO_H -#include "resources/spritereference.h" +#include "resources/sprite/spritereference.h" #include "localconsts.h" diff --git a/src/resources/sprite/spritedef.cpp b/src/resources/sprite/spritedef.cpp index 453da9f28..dda4a8378 100644 --- a/src/resources/sprite/spritedef.cpp +++ b/src/resources/sprite/spritedef.cpp @@ -35,7 +35,8 @@ #include "resources/dye.h" #include "resources/imageset.h" #include "resources/resourcemanager.h" -#include "resources/spritereference.h" + +#include "resources/sprite/spritereference.h" #include "debug.h" diff --git a/src/resources/sprite/spritereference.h b/src/resources/sprite/spritereference.h new file mode 100644 index 000000000..734bcf673 --- /dev/null +++ b/src/resources/sprite/spritereference.h @@ -0,0 +1,53 @@ +/* + * The ManaPlus Client + * Copyright (C) 2004-2009 The Mana World Development Team + * Copyright (C) 2009-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 . + */ + +#ifndef RESOURCES_SPRITE_SPRITEREFERENCE_H +#define RESOURCES_SPRITE_SPRITEREFERENCE_H + +#include "utils/stringvector.h" + +#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; +}; + +typedef std::vector::const_iterator SpriteRefs; + +#endif // RESOURCES_SPRITE_SPRITEREFERENCE_H diff --git a/src/resources/spritereference.h b/src/resources/spritereference.h deleted file mode 100644 index a68b0d792..000000000 --- a/src/resources/spritereference.h +++ /dev/null @@ -1,53 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2004-2009 The Mana World Development Team - * Copyright (C) 2009-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 . - */ - -#ifndef RESOURCES_SPRITEREFERENCE_H -#define RESOURCES_SPRITEREFERENCE_H - -#include "utils/stringvector.h" - -#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; -}; - -typedef std::vector::const_iterator SpriteRefs; - -#endif // RESOURCES_SPRITEREFERENCE_H -- cgit v1.2.3-70-g09d2