summaryrefslogtreecommitdiff
path: root/src/resources/emotedb.cpp
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <bjorn@lindeijer.nl>2024-02-09 09:47:21 +0100
committerThorbjørn Lindeijer <bjorn@lindeijer.nl>2024-02-13 12:57:16 +0100
commitc70be70cab3615cb36cc5f244671cf5d39f1fda8 (patch)
treeb15e68552ffd6adda832a9ae5d38160ef8299d7f /src/resources/emotedb.cpp
parent717eb07c0d51098e319059883b11ba6e2bf4cbb8 (diff)
downloadmana-c70be70cab3615cb36cc5f244671cf5d39f1fda8.tar.gz
mana-c70be70cab3615cb36cc5f244671cf5d39f1fda8.tar.bz2
mana-c70be70cab3615cb36cc5f244671cf5d39f1fda8.tar.xz
mana-c70be70cab3615cb36cc5f244671cf5d39f1fda8.zip
General code cleanups
* Removing unused includes * Use member initialization * Use range-based for loops * Use nullptr * Removed no longer used aliases * Use override * Don't use else after return * Use '= delete' to remove implicit members * Use std::string::empty instead of comparing to ""
Diffstat (limited to 'src/resources/emotedb.cpp')
-rw-r--r--src/resources/emotedb.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/resources/emotedb.cpp b/src/resources/emotedb.cpp
index fde7030a..752f7b4f 100644
--- a/src/resources/emotedb.cpp
+++ b/src/resources/emotedb.cpp
@@ -21,12 +21,10 @@
#include "resources/emotedb.h"
-#include "configuration.h"
#include "log.h"
#include "imagesprite.h"
#include "resources/resourcemanager.h"
-#include "resources/image.h"
#include "resources/imageset.h"
namespace
@@ -134,10 +132,8 @@ const Emote *EmoteDB::get(int id)
logger->log("EmoteDB: Warning, unknown emote ID %d requested", id);
return &mUnknown;
}
- else
- {
- return i->second;
- }
+
+ return i->second;
}
int EmoteDB::getLast()