summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-01-19 01:10:55 +0300
committerAndrei Karas <akaras@inbox.ru>2014-01-19 01:10:55 +0300
commit81c73d43071de8ac22af1b7b9174cab1809203ba (patch)
treef66232c757092af8411a8abdc79906455f64bb0c /src/resources
parente9e343366fbfbe9a6343089ff113354524f3f306 (diff)
downloadmv-81c73d43071de8ac22af1b7b9174cab1809203ba.tar.gz
mv-81c73d43071de8ac22af1b7b9174cab1809203ba.tar.bz2
mv-81c73d43071de8ac22af1b7b9174cab1809203ba.tar.xz
mv-81c73d43071de8ac22af1b7b9174cab1809203ba.zip
in emotes popup show also emote id.
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/db/emotedb.cpp3
-rw-r--r--src/resources/db/emotedb.h2
2 files changed, 5 insertions, 0 deletions
diff --git a/src/resources/db/emotedb.cpp b/src/resources/db/emotedb.cpp
index 594bcce5d..97ea95aa0 100644
--- a/src/resources/db/emotedb.cpp
+++ b/src/resources/db/emotedb.cpp
@@ -49,6 +49,7 @@ void EmoteDB::load()
unknownSprite->sprite = AnimatedSprite::load(
paths.getStringValue("spriteErrorFile"));
unknownSprite->name = "unknown";
+ unknownSprite->id = 0;
mUnknown.sprites.push_back(unknownSprite);
logger->log1("Initializing emote database...");
@@ -122,6 +123,7 @@ void EmoteDB::loadXmlFile(const std::string &fileName)
XML::getProperty(spriteNode, "variant", 0));
currentSprite->name = XML::langProperty(
spriteNode, "name", "");
+ currentSprite->id = id;
currentInfo->sprites.push_back(currentSprite);
}
else if (xmlNameEqual(spriteNode, "particlefx"))
@@ -194,6 +196,7 @@ void EmoteDB::loadSpecialXmlFile(const std::string &fileName)
XML::getProperty(spriteNode, "variant", 0));
currentSprite->name = XML::langProperty(
spriteNode, "name", "");
+ currentSprite->id = id;
currentInfo->sprites.push_back(currentSprite);
}
else if (xmlNameEqual(spriteNode, "particlefx"))
diff --git a/src/resources/db/emotedb.h b/src/resources/db/emotedb.h
index f00bfbb47..02683a99a 100644
--- a/src/resources/db/emotedb.h
+++ b/src/resources/db/emotedb.h
@@ -35,12 +35,14 @@ struct EmoteSprite final
{
EmoteSprite() :
sprite(nullptr),
+ id(0),
name()
{ }
A_DELETE_COPY(EmoteSprite)
const AnimatedSprite *sprite;
+ int id;
std::string name;
};