summaryrefslogtreecommitdiff
path: root/src/resources/itemdb.h
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <bjorn@lindeijer.nl>2024-03-05 10:13:15 +0100
committerThorbjørn Lindeijer <bjorn@lindeijer.nl>2024-03-06 21:49:14 +0000
commit3ce39d2b497ab5356290a22b324181386af51c51 (patch)
tree1b923b8be7e4d2ce8ff70768dc7fff596487935c /src/resources/itemdb.h
parenta9df89bda908e3b3d443db7f3ca865b6f12c75e5 (diff)
downloadmana-3ce39d2b497ab5356290a22b324181386af51c51.tar.gz
mana-3ce39d2b497ab5356290a22b324181386af51c51.tar.bz2
mana-3ce39d2b497ab5356290a22b324181386af51c51.tar.xz
mana-3ce39d2b497ab5356290a22b324181386af51c51.zip
General code cleanups
* Use final for all message handlers, Client, LocalPlayer, Being::getType, Being::setPosition and Being::setMap. (avoids some warnings about virtual dispatch in constructors) * Use auto in more places * Use emplace_back instead of push_back in some places * Use default member initializers * Less else after return * Removed superfluous .c_str() * Removed type aliases that are only used once * Removed more unused includes
Diffstat (limited to 'src/resources/itemdb.h')
-rw-r--r--src/resources/itemdb.h20
1 files changed, 7 insertions, 13 deletions
diff --git a/src/resources/itemdb.h b/src/resources/itemdb.h
index 6a9988d0..84fcf210 100644
--- a/src/resources/itemdb.h
+++ b/src/resources/itemdb.h
@@ -75,8 +75,7 @@ class ItemDB
public:
ItemDB() = default;
- virtual ~ItemDB()
- {}
+ virtual ~ItemDB() = default;
/**
* Frees item data.
@@ -91,8 +90,8 @@ class ItemDB
bool exists(int id) const;
- const ItemInfo &get(int id);
- const ItemInfo &get(const std::string &name);
+ const ItemInfo &get(int id) const;
+ const ItemInfo &get(const std::string &name) const;
virtual void init() = 0;
@@ -144,11 +143,8 @@ class ItemDB
void loadFloorSprite(SpriteDisplay *display, xmlNodePtr node);
// Items database
- using ItemInfos = std::map<int, ItemInfo *>;
- using NamedItemInfos = std::map<std::string, ItemInfo *>;
-
- ItemInfos mItemInfos;
- NamedItemInfos mNamedItemInfos;
+ std::map<int, ItemInfo *> mItemInfos;
+ std::map<std::string, ItemInfo *> mNamedItemInfos;
};
namespace TmwAthena {
@@ -161,8 +157,7 @@ class TaItemInfo;
class TaItemDB: public ItemDB
{
public:
- TaItemDB()
- { }
+ TaItemDB() = default;
~TaItemDB() override
{ unload(); }
@@ -196,8 +191,7 @@ class ManaServItemInfo;
class ManaServItemDB: public ItemDB
{
public:
- ManaServItemDB()
- { }
+ ManaServItemDB() = default;
~ManaServItemDB() override
{ unload(); }