From 81c73d43071de8ac22af1b7b9174cab1809203ba Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 19 Jan 2014 01:10:55 +0300
Subject: in emotes popup show also emote id.

---
 src/resources/db/emotedb.cpp | 3 +++
 src/resources/db/emotedb.h   | 2 ++
 2 files changed, 5 insertions(+)

(limited to 'src/resources/db')

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;
 };
 
-- 
cgit v1.2.3-70-g09d2