diff options
Diffstat (limited to 'src/resources/db/emotedb.cpp')
| -rw-r--r-- | src/resources/db/emotedb.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/resources/db/emotedb.cpp b/src/resources/db/emotedb.cpp index 92ad983e5..3d2ced2da 100644 --- a/src/resources/db/emotedb.cpp +++ b/src/resources/db/emotedb.cpp @@ -1,9 +1,10 @@ /* - * The ManaPlus Client + * The ManaVerse Client * Copyright (C) 2009 Aethyra Development Team - * Copyright (C) 2011-2019 The ManaPlus Developers + * Copyright (C) 2011-2020 The ManaPlus Developers + * Copyright (C) 2020-2025 The ManaVerse Developers * - * This file is part of The ManaPlus Client. + * This file is part of The ManaVerse 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 @@ -115,8 +116,10 @@ void EmoteDB::loadXmlFile(const std::string &fileName, currentInfo = mEmoteInfos[id]; else currentInfo = new EmoteInfo; + if (currentInfo == nullptr) continue; + currentInfo->time = XML::getProperty(emoteNode, "time", 500); currentInfo->effectId = XML::getProperty(emoteNode, "effect", -1); |