diff options
| -rw-r--r-- | src/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 1 | ||||
| -rw-r--r-- | src/being/being.cpp | 1 | ||||
| -rw-r--r-- | src/resources/attack.h | 59 | ||||
| -rw-r--r-- | src/resources/beinginfo.cpp | 2 | ||||
| -rw-r--r-- | src/resources/beinginfo.h | 29 |
6 files changed, 65 insertions, 28 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c8f308adf..983fa1132 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -515,6 +515,7 @@ SET(SRCS resources/atlasmanager.h resources/atlasresource.cpp resources/atlasresource.h + resources/attack.h resources/db/avatardb.cpp resources/db/avatardb.h resources/beingcommon.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 566efaffc..43c594c8d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -621,6 +621,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ resources/atlasmanager.h \ resources/atlasresource.cpp \ resources/atlasresource.h \ + resources/attack.h \ resources/db/avatardb.cpp \ resources/db/avatardb.h \ resources/beingcommon.cpp \ diff --git a/src/being/being.cpp b/src/being/being.cpp index 55426913c..fbbbfecae 100644 --- a/src/being/being.cpp +++ b/src/being/being.cpp @@ -61,6 +61,7 @@ #include "net/pethandler.h" #include "net/playerhandler.h" +#include "resources/attack.h" #include "resources/iteminfo.h" #include "resources/resourcemanager.h" diff --git a/src/resources/attack.h b/src/resources/attack.h new file mode 100644 index 000000000..19c7e5938 --- /dev/null +++ b/src/resources/attack.h @@ -0,0 +1,59 @@ +/* + * 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 <http://www.gnu.org/licenses/>. + */ + +#ifndef RESOURCES_ATTACK_H +#define RESOURCES_ATTACK_H + +#include <string> + +#include "localconsts.h" + +struct Attack final +{ + std::string mAction; + std::string mSkyAction; + std::string mWaterAction; + int mEffectId; + int mHitEffectId; + int mCriticalHitEffectId; + int mMissEffectId; + std::string mMissileParticle; + + Attack(const std::string &action, const std::string &skyAction, + const std::string &waterAction, const int effectId, + const int hitEffectId, const int criticalHitEffectId, + const int missEffectId, const std::string &missileParticle) : + mAction(action), + mSkyAction(skyAction), + mWaterAction(waterAction), + mEffectId(effectId), + mHitEffectId(hitEffectId), + mCriticalHitEffectId(criticalHitEffectId), + mMissEffectId(missEffectId), + mMissileParticle(missileParticle) + { + } + + A_DELETE_COPY(Attack) +}; + +#endif // RESOURCES_ATTACK_H diff --git a/src/resources/beinginfo.cpp b/src/resources/beinginfo.cpp index 5cf6b2397..a12961315 100644 --- a/src/resources/beinginfo.cpp +++ b/src/resources/beinginfo.cpp @@ -25,6 +25,8 @@ #include "configuration.h" #include "logger.h" +#include "resources/attack.h" + #include "resources/map/blockmask.h" #include "utils/delete2.h" diff --git a/src/resources/beinginfo.h b/src/resources/beinginfo.h index 62ad7eaf9..27d36e2a3 100644 --- a/src/resources/beinginfo.h +++ b/src/resources/beinginfo.h @@ -36,34 +36,7 @@ #include <map> -struct Attack final -{ - std::string mAction; - std::string mSkyAction; - std::string mWaterAction; - int mEffectId; - int mHitEffectId; - int mCriticalHitEffectId; - int mMissEffectId; - std::string mMissileParticle; - - Attack(const std::string &action, const std::string &skyAction, - const std::string &waterAction, const int effectId, - const int hitEffectId, const int criticalHitEffectId, - const int missEffectId, const std::string &missileParticle) : - mAction(action), - mSkyAction(skyAction), - mWaterAction(waterAction), - mEffectId(effectId), - mHitEffectId(hitEffectId), - mCriticalHitEffectId(criticalHitEffectId), - mMissEffectId(missEffectId), - mMissileParticle(missileParticle) - { - } - - A_DELETE_COPY(Attack) -}; +struct Attack; typedef std::map<int, Attack*> Attacks; |