summaryrefslogtreecommitdiff
path: root/src/resources/emotedb.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-04-21 01:44:57 +0300
committerAndrei Karas <akaras@inbox.ru>2013-04-21 01:44:57 +0300
commitcfe4c893ba4ba30379919636d3c508ebf1594e23 (patch)
tree94abccb0bfbf6ce3675186f80c7243bbf4b6c157 /src/resources/emotedb.h
parent52f78717dae3cb02eb1539841dd2a6bd351f74c1 (diff)
downloadManaVerse-cfe4c893ba4ba30379919636d3c508ebf1594e23.tar.gz
ManaVerse-cfe4c893ba4ba30379919636d3c508ebf1594e23.tar.bz2
ManaVerse-cfe4c893ba4ba30379919636d3c508ebf1594e23.tar.xz
ManaVerse-cfe4c893ba4ba30379919636d3c508ebf1594e23.zip
add owned show time to each emote type.
Diffstat (limited to 'src/resources/emotedb.h')
-rw-r--r--src/resources/emotedb.h11
1 files changed, 2 insertions, 9 deletions
diff --git a/src/resources/emotedb.h b/src/resources/emotedb.h
index 6a6463dfb..d8edb99ec 100644
--- a/src/resources/emotedb.h
+++ b/src/resources/emotedb.h
@@ -55,6 +55,7 @@ struct EmoteInfo final
std::list<EmoteSprite*> sprites;
StringVect particles;
+ int time;
};
typedef std::map<int, EmoteInfo*> EmoteInfos;
@@ -72,15 +73,7 @@ namespace EmoteDB
const EmoteInfo *get(const int id,
const bool allowNull = false) A_WARN_UNUSED;
- const AnimatedSprite *getAnimation(const int id,
- const bool allowNull = false)
- A_WARN_UNUSED;
-
- const AnimatedSprite *getAnimation2(int id,
- const bool allowNull = false)
- A_WARN_UNUSED;
-
- AnimatedSprite *getClone(const int id, const bool allowNull);
+ const EmoteInfo *get2(int id, const bool allowNull = false) A_WARN_UNUSED;
const EmoteSprite *getSprite(const int id, const bool allowNull = false)
A_WARN_UNUSED;