diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-05-19 15:45:29 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-05-19 15:45:29 +0300 |
commit | 45753eaadc1fe9adc53f366c2a049199690ffb93 (patch) | |
tree | e79993f205934a48a19a6673365764dc36561d58 /src/resources | |
parent | 7f97219905c2ad4ffcf9a36a019bf43ad4f0f93b (diff) | |
download | manaplus-45753eaadc1fe9adc53f366c2a049199690ffb93.tar.gz manaplus-45753eaadc1fe9adc53f366c2a049199690ffb93.tar.bz2 manaplus-45753eaadc1fe9adc53f366c2a049199690ffb93.tar.xz manaplus-45753eaadc1fe9adc53f366c2a049199690ffb93.zip |
Move emotesprite into separate file.
Diffstat (limited to 'src/resources')
-rw-r--r-- | src/resources/db/emotedb.cpp | 1 | ||||
-rw-r--r-- | src/resources/db/emotedb.h | 15 | ||||
-rw-r--r-- | src/resources/emotesprite.h | 46 |
3 files changed, 48 insertions, 14 deletions
diff --git a/src/resources/db/emotedb.cpp b/src/resources/db/emotedb.cpp index 943628978..2384f3c47 100644 --- a/src/resources/db/emotedb.cpp +++ b/src/resources/db/emotedb.cpp @@ -28,6 +28,7 @@ #include "configuration.h" #include "resources/beingcommon.h" +#include "resources/emotesprite.h" #include "debug.h" diff --git a/src/resources/db/emotedb.h b/src/resources/db/emotedb.h index 29a2a8de4..7b4f5480a 100644 --- a/src/resources/db/emotedb.h +++ b/src/resources/db/emotedb.h @@ -31,20 +31,7 @@ class AnimatedSprite; -struct EmoteSprite final -{ - EmoteSprite() : - sprite(nullptr), - id(0), - name() - { } - - A_DELETE_COPY(EmoteSprite) - - const AnimatedSprite *sprite; - int id; - std::string name; -}; +struct EmoteSprite; struct EmoteInfo final { diff --git a/src/resources/emotesprite.h b/src/resources/emotesprite.h new file mode 100644 index 000000000..99ecd977f --- /dev/null +++ b/src/resources/emotesprite.h @@ -0,0 +1,46 @@ +/* + * Emote database + * Copyright (C) 2009 Aethyra Development Team + * 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_EMOTESPRITE_H +#define RESOURCES_EMOTESPRITE_H + +#include <string> + +#include "localconsts.h" + +class AnimatedSprite; + +struct EmoteSprite final +{ + EmoteSprite() : + sprite(nullptr), + id(0), + name() + { } + + A_DELETE_COPY(EmoteSprite) + + const AnimatedSprite *sprite; + int id; + std::string name; +}; + +#endif // RESOURCES_EMOTESPRITE_H |