From f4ecfac28ac822af7732346eca3dad0365f38994 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Wed, 14 Feb 2024 12:43:33 -0300 Subject: Emotes: Only load client emotes if the server is lacking them --- src/resources/db/emotedb.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/resources/db/emotedb.cpp b/src/resources/db/emotedb.cpp index 25501eaa1..92ad983e5 100644 --- a/src/resources/db/emotedb.cpp +++ b/src/resources/db/emotedb.cpp @@ -64,8 +64,12 @@ void EmoteDB::load() loadXmlFile(paths.getStringValue("emotesFile"), SkipError_false); loadXmlFile(paths.getStringValue("emotesPatchFile"), SkipError_true); loadXmlDir("emotesPatchDir", loadXmlFile) - loadSpecialXmlFile("graphics/sprites/manaplus_emotes.xml", - SkipError_false); + // Only load client emotes if they're missing in server + if (mLastEmote < 20) + { + loadSpecialXmlFile("graphics/sprites/manaplus_emotes.xml", + SkipError_false); + } mLoaded = true; } @@ -99,9 +103,6 @@ void EmoteDB::loadXmlFile(const std::string &fileName, } const int id = XML::getProperty(emoteNode, "id", -1); - // skip hight images - if (id > 19 || (Client::isTmw() && id > 13)) - continue; if (id == -1) { -- cgit v1.2.3-60-g2f50