From 0d6c76d9827442d4f89482b64077cba8a7ddc47d Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 20 Dec 2015 18:01:48 +0300 Subject: Move spriteaction.h into const directory. --- src/CMakeLists.txt | 2 +- src/Makefile.am | 2 +- src/animatedsprite.cpp | 3 +- src/animationdelayload.cpp | 3 +- src/being/being.cpp | 3 +- src/const/resources/spriteaction.h | 74 ++++++++++++++++++++++++++++++++++++++ src/gui/windows/skilldialog.cpp | 3 +- src/resources/beinginfo.cpp | 3 +- src/resources/iteminfo.cpp | 5 +-- src/resources/sprite/spritedef.cpp | 3 +- src/resources/spriteaction.h | 74 -------------------------------------- src/statuseffect.cpp | 3 +- 12 files changed, 93 insertions(+), 85 deletions(-) create mode 100644 src/const/resources/spriteaction.h delete mode 100644 src/resources/spriteaction.h (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index fbff965d1..800ae25a8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -734,7 +734,7 @@ SET(SRCS resources/soundeffect.cpp resources/soundeffect.h resources/soundinfo.h - resources/spriteaction.h + const/resources/spriteaction.h resources/sprite/spritedef.h resources/sprite/spritedef.cpp resources/spritedirection.h diff --git a/src/Makefile.am b/src/Makefile.am index 7b446fb73..3e036fe7b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -383,7 +383,7 @@ SRC += events/actionevent.h \ resources/soundeffect.cpp \ resources/soundeffect.h \ resources/soundinfo.h \ - resources/spriteaction.h \ + const/resources/spriteaction.h \ resources/sprite/spritedef.cpp \ resources/sprite/spritedef.h \ resources/spritedirection.h \ diff --git a/src/animatedsprite.cpp b/src/animatedsprite.cpp index cf5b275db..93e448cc3 100644 --- a/src/animatedsprite.cpp +++ b/src/animatedsprite.cpp @@ -24,6 +24,8 @@ #include "animationdelayload.h" +#include "const/resources/spriteaction.h" + #include "render/graphics.h" #include "resources/action.h" @@ -31,7 +33,6 @@ #include "resources/delayedmanager.h" #include "resources/image.h" #include "resources/resourcemanager.h" -#include "resources/spriteaction.h" #include "utils/delete2.h" diff --git a/src/animationdelayload.cpp b/src/animationdelayload.cpp index c52355963..437496c51 100644 --- a/src/animationdelayload.cpp +++ b/src/animationdelayload.cpp @@ -22,8 +22,9 @@ #include "animatedsprite.h" +#include "const/resources/spriteaction.h" + #include "resources/resourcemanager.h" -#include "resources/spriteaction.h" #include "debug.h" diff --git a/src/being/being.cpp b/src/being/being.cpp index 565ae2446..a5e9acf9b 100644 --- a/src/being/being.cpp +++ b/src/being/being.cpp @@ -41,6 +41,8 @@ #include "const/utils/timer.h" +#include "const/resources/spriteaction.h" + #include "enums/being/beingdirection.h" #include "particle/particleinfo.h" @@ -70,7 +72,6 @@ #include "resources/emotesprite.h" #include "resources/horseinfo.h" #include "resources/iteminfo.h" -#include "resources/spriteaction.h" #include "resources/db/avatardb.h" #include "resources/db/badgesdb.h" diff --git a/src/const/resources/spriteaction.h b/src/const/resources/spriteaction.h new file mode 100644 index 000000000..a7071b3e1 --- /dev/null +++ b/src/const/resources/spriteaction.h @@ -0,0 +1,74 @@ +/* + * 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 CONST_RESOURCES_SPRITEACTION_H +#define CONST_RESOURCES_SPRITEACTION_H + +#include + +/* + * Remember those are the main action. + * Action subtypes, e.g.: "attack_bow" are to be passed by items.xml after + * an ACTION_ATTACK call. + * Which special to be use to to be passed with the USE_SPECIAL call. + * Running, walking, ... is a sub-type of moving. + * ... + * Please don't add hard-coded subtypes here! + */ +namespace SpriteAction +{ + static const std::string DEFAULT("stand"); + static const std::string STAND("stand"); + static const std::string SIT("sit"); + static const std::string SITTOP("sittop"); + static const std::string DEAD("dead"); + static const std::string MOVE("walk"); + static const std::string ATTACK("attack"); + static const std::string SPAWN("spawn"); + static const std::string CAST("cast"); + + static const std::string FLY("fly"); + static const std::string SWIM("swim"); + static const std::string RIDE("ride"); + static const std::string STANDSKY("standsky"); + static const std::string STANDWATER("standwater"); + static const std::string STANDRIDE("standride"); + static const std::string SITSKY("sitsky"); + static const std::string SITWATER("sitwater"); + static const std::string SITRIDE("sitride"); + static const std::string ATTACKSKY("attacksky"); + static const std::string ATTACKWATER("attackwater"); + static const std::string ATTACKRIDE("attackride"); + static const std::string CASTSKY("castsky"); + static const std::string CASTWATER("castwater"); + static const std::string CASTRIDE("castride"); + static const std::string SPAWNSKY("spawnsky"); + static const std::string SPAWNWATER("spawnwater"); + static const std::string SPAWNRIDE("spawnride"); + static const std::string DEADSKY("deadsky"); + static const std::string DEADWATER("deadwater"); + static const std::string DEADRIDE("deadride"); + + static const std::string INVALID(""); +} // namespace SpriteAction + +#endif // CONST_RESOURCES_SPRITEACTION_H diff --git a/src/gui/windows/skilldialog.cpp b/src/gui/windows/skilldialog.cpp index e163923cc..0446bc886 100644 --- a/src/gui/windows/skilldialog.cpp +++ b/src/gui/windows/skilldialog.cpp @@ -30,6 +30,8 @@ #include "being/localplayer.h" #include "being/playerinfo.h" +#include "const/resources/spriteaction.h" + #include "gui/windows/setupwindow.h" #include "gui/windows/shortcutwindow.h" @@ -53,7 +55,6 @@ #include "utils/timer.h" #include "resources/beingcommon.h" -#include "resources/spriteaction.h" #include "debug.h" diff --git a/src/resources/beinginfo.cpp b/src/resources/beinginfo.cpp index b857335ba..7bb5685ad 100644 --- a/src/resources/beinginfo.cpp +++ b/src/resources/beinginfo.cpp @@ -25,10 +25,11 @@ #include "configuration.h" #include "logger.h" +#include "const/resources/spriteaction.h" + #include "enums/resources/map/blockmask.h" #include "resources/attack.h" -#include "resources/spriteaction.h" #include "resources/spritereference.h" #include "resources/db/colordb.h" diff --git a/src/resources/iteminfo.cpp b/src/resources/iteminfo.cpp index 490a185bc..03f0ad422 100644 --- a/src/resources/iteminfo.cpp +++ b/src/resources/iteminfo.cpp @@ -22,11 +22,12 @@ #include "resources/iteminfo.h" -#include "resources/spriteaction.h" -#include "resources/spritedirection.h" +#include "const/resources/spriteaction.h" #include "const/resources/map/map.h" +#include "resources/spritedirection.h" + #include "resources/db/colordb.h" #include "resources/db/itemdb.h" diff --git a/src/resources/sprite/spritedef.cpp b/src/resources/sprite/spritedef.cpp index cb0fc777c..453da9f28 100644 --- a/src/resources/sprite/spritedef.cpp +++ b/src/resources/sprite/spritedef.cpp @@ -26,6 +26,8 @@ #include "logger.h" #include "settings.h" +#include "const/resources/spriteaction.h" + #include "const/resources/map/map.h" #include "resources/action.h" @@ -33,7 +35,6 @@ #include "resources/dye.h" #include "resources/imageset.h" #include "resources/resourcemanager.h" -#include "resources/spriteaction.h" #include "resources/spritereference.h" #include "debug.h" diff --git a/src/resources/spriteaction.h b/src/resources/spriteaction.h deleted file mode 100644 index b39c1e96d..000000000 --- a/src/resources/spriteaction.h +++ /dev/null @@ -1,74 +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_SPRITEACTION_H -#define RESOURCES_SPRITEACTION_H - -#include - -/* - * Remember those are the main action. - * Action subtypes, e.g.: "attack_bow" are to be passed by items.xml after - * an ACTION_ATTACK call. - * Which special to be use to to be passed with the USE_SPECIAL call. - * Running, walking, ... is a sub-type of moving. - * ... - * Please don't add hard-coded subtypes here! - */ -namespace SpriteAction -{ - static const std::string DEFAULT("stand"); - static const std::string STAND("stand"); - static const std::string SIT("sit"); - static const std::string SITTOP("sittop"); - static const std::string DEAD("dead"); - static const std::string MOVE("walk"); - static const std::string ATTACK("attack"); - static const std::string SPAWN("spawn"); - static const std::string CAST("cast"); - - static const std::string FLY("fly"); - static const std::string SWIM("swim"); - static const std::string RIDE("ride"); - static const std::string STANDSKY("standsky"); - static const std::string STANDWATER("standwater"); - static const std::string STANDRIDE("standride"); - static const std::string SITSKY("sitsky"); - static const std::string SITWATER("sitwater"); - static const std::string SITRIDE("sitride"); - static const std::string ATTACKSKY("attacksky"); - static const std::string ATTACKWATER("attackwater"); - static const std::string ATTACKRIDE("attackride"); - static const std::string CASTSKY("castsky"); - static const std::string CASTWATER("castwater"); - static const std::string CASTRIDE("castride"); - static const std::string SPAWNSKY("spawnsky"); - static const std::string SPAWNWATER("spawnwater"); - static const std::string SPAWNRIDE("spawnride"); - static const std::string DEADSKY("deadsky"); - static const std::string DEADWATER("deadwater"); - static const std::string DEADRIDE("deadride"); - - static const std::string INVALID(""); -} // namespace SpriteAction - -#endif // RESOURCES_SPRITEACTION_H diff --git a/src/statuseffect.cpp b/src/statuseffect.cpp index c3aed4ea0..4c8719b21 100644 --- a/src/statuseffect.cpp +++ b/src/statuseffect.cpp @@ -26,6 +26,8 @@ #include "configuration.h" #include "soundmanager.h" +#include "const/resources/spriteaction.h" + #include "gui/widgets/tabs/chat/chattab.h" #include "particle/particle.h" @@ -33,7 +35,6 @@ #include "listeners/debugmessagelistener.h" #include "resources/beingcommon.h" -#include "resources/spriteaction.h" #include "debug.h" -- cgit v1.2.3-70-g09d2