From fe70d4929e6ca0e46e6210d8795056c6e8a4b93d Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 29 Dec 2015 01:34:51 +0300 Subject: Move animationdelayload into sprite directory. --- src/CMakeLists.txt | 8 ++-- src/Makefile.am | 4 +- src/animationdelayload.cpp | 65 ----------------------------- src/animationdelayload.h | 55 ------------------------ src/resources/delayedmanager.cpp | 2 +- src/resources/sprite/animatedsprite.cpp | 4 +- src/resources/sprite/animationdelayload.cpp | 65 +++++++++++++++++++++++++++++ src/resources/sprite/animationdelayload.h | 55 ++++++++++++++++++++++++ 8 files changed, 129 insertions(+), 129 deletions(-) delete mode 100644 src/animationdelayload.cpp delete mode 100644 src/animationdelayload.h create mode 100644 src/resources/sprite/animationdelayload.cpp create mode 100644 src/resources/sprite/animationdelayload.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 160b98426..cbb406211 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -864,8 +864,8 @@ SET(SRCS actormanager.h resources/sprite/animatedsprite.cpp resources/sprite/animatedsprite.h - animationdelayload.cpp - animationdelayload.h + resources/sprite/animationdelayload.cpp + resources/sprite/animationdelayload.h particle/animationparticle.cpp particle/animationparticle.h avatar.cpp @@ -1298,8 +1298,8 @@ SET(DYE_CMD_SRCS dyetool/dyemain.cpp resources/sprite/animatedsprite.cpp resources/sprite/animatedsprite.h - animationdelayload.cpp - animationdelayload.h + resources/sprite/animationdelayload.cpp + resources/sprite/animationdelayload.h configuration.cpp configuration.h graphicsmanager.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 55010ba10..83d5ec41a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -684,8 +684,8 @@ manaplus_SOURCES += main.cpp \ actormanager.h \ resources/sprite/animatedsprite.cpp \ resources/sprite/animatedsprite.h \ - animationdelayload.cpp \ - animationdelayload.h \ + resources/sprite/animationdelayload.cpp \ + resources/sprite/animationdelayload.h \ actions/actions.cpp \ actions/actions.h \ actions/chat.cpp \ diff --git a/src/animationdelayload.cpp b/src/animationdelayload.cpp deleted file mode 100644 index 85bdaaf3b..000000000 --- a/src/animationdelayload.cpp +++ /dev/null @@ -1,65 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2012-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 . - */ - -#include "animationdelayload.h" - -#include "const/resources/spriteaction.h" - -#include "resources/resourcemanager.h" - -#include "resources/sprite/animatedsprite.h" - -#include "debug.h" - -AnimationDelayLoad::AnimationDelayLoad(const std::string &fileName, - const int variant, - AnimatedSprite *const sprite) : - mFileName(fileName), - mVariant(variant), - mSprite(sprite), - mAction(SpriteAction::STAND) -{ -} - -AnimationDelayLoad::~AnimationDelayLoad() -{ - if (mSprite) - { - mSprite->clearDelayLoad(); - mSprite = nullptr; - } -} - -void AnimationDelayLoad::clearSprite() -{ - mSprite = nullptr; -} - -void AnimationDelayLoad::load() -{ - if (mSprite) - { - SpriteDef *const s = resourceManager->getSprite(mFileName, mVariant); - if (!s) - return; - mSprite->setSprite(s); - mSprite->play(mAction); - } -} diff --git a/src/animationdelayload.h b/src/animationdelayload.h deleted file mode 100644 index a9081d615..000000000 --- a/src/animationdelayload.h +++ /dev/null @@ -1,55 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2012-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 ANIMATIONDELAYLOAD_H -#define ANIMATIONDELAYLOAD_H - -#include - -#include "localconsts.h" - -class AnimatedSprite; - -class AnimationDelayLoad final -{ - public: - AnimationDelayLoad(const std::string &fileName, - const int variant, - AnimatedSprite *const sprite); - - A_DELETE_COPY(AnimationDelayLoad) - - ~AnimationDelayLoad(); - - void clearSprite(); - - void load(); - - void setAction(const std::string &action) - { mAction = action; } - - private: - std::string mFileName; - int mVariant; - AnimatedSprite *mSprite; - std::string mAction; -}; - -#endif // ANIMATIONDELAYLOAD_H diff --git a/src/resources/delayedmanager.cpp b/src/resources/delayedmanager.cpp index b001db124..cc27dc0d2 100644 --- a/src/resources/delayedmanager.cpp +++ b/src/resources/delayedmanager.cpp @@ -20,7 +20,7 @@ #include "resources/delayedmanager.h" -#include "animationdelayload.h" +#include "resources/sprite/animationdelayload.h" #include "utils/timer.h" diff --git a/src/resources/sprite/animatedsprite.cpp b/src/resources/sprite/animatedsprite.cpp index f06a3cc6a..98d4b418d 100644 --- a/src/resources/sprite/animatedsprite.cpp +++ b/src/resources/sprite/animatedsprite.cpp @@ -22,8 +22,6 @@ #include "resources/sprite/animatedsprite.h" -#include "animationdelayload.h" - #include "const/resources/spriteaction.h" #include "render/graphics.h" @@ -35,6 +33,8 @@ #include "resources/animation/animation.h" +#include "resources/sprite/animationdelayload.h" + #include "utils/delete2.h" #include "debug.h" diff --git a/src/resources/sprite/animationdelayload.cpp b/src/resources/sprite/animationdelayload.cpp new file mode 100644 index 000000000..8800cb754 --- /dev/null +++ b/src/resources/sprite/animationdelayload.cpp @@ -0,0 +1,65 @@ +/* + * The ManaPlus Client + * Copyright (C) 2012-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 . + */ + +#include "resources/sprite/animationdelayload.h" + +#include "const/resources/spriteaction.h" + +#include "resources/resourcemanager.h" + +#include "resources/sprite/animatedsprite.h" + +#include "debug.h" + +AnimationDelayLoad::AnimationDelayLoad(const std::string &fileName, + const int variant, + AnimatedSprite *const sprite) : + mFileName(fileName), + mVariant(variant), + mSprite(sprite), + mAction(SpriteAction::STAND) +{ +} + +AnimationDelayLoad::~AnimationDelayLoad() +{ + if (mSprite) + { + mSprite->clearDelayLoad(); + mSprite = nullptr; + } +} + +void AnimationDelayLoad::clearSprite() +{ + mSprite = nullptr; +} + +void AnimationDelayLoad::load() +{ + if (mSprite) + { + SpriteDef *const s = resourceManager->getSprite(mFileName, mVariant); + if (!s) + return; + mSprite->setSprite(s); + mSprite->play(mAction); + } +} diff --git a/src/resources/sprite/animationdelayload.h b/src/resources/sprite/animationdelayload.h new file mode 100644 index 000000000..9e91a1949 --- /dev/null +++ b/src/resources/sprite/animationdelayload.h @@ -0,0 +1,55 @@ +/* + * The ManaPlus Client + * Copyright (C) 2012-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_ANIMATIONDELAYLOAD_H +#define RESOURCES_SPRITE_ANIMATIONDELAYLOAD_H + +#include + +#include "localconsts.h" + +class AnimatedSprite; + +class AnimationDelayLoad final +{ + public: + AnimationDelayLoad(const std::string &fileName, + const int variant, + AnimatedSprite *const sprite); + + A_DELETE_COPY(AnimationDelayLoad) + + ~AnimationDelayLoad(); + + void clearSprite(); + + void load(); + + void setAction(const std::string &action) + { mAction = action; } + + private: + std::string mFileName; + int mVariant; + AnimatedSprite *mSprite; + std::string mAction; +}; + +#endif // RESOURCES_SPRITE_ANIMATIONDELAYLOAD_H -- cgit v1.2.3-60-g2f50