diff options
author | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2024-03-12 13:24:16 +0100 |
---|---|---|
committer | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2024-03-12 21:23:10 +0100 |
commit | 306ad2effe4d0897453e61ad787e01dc47c33076 (patch) | |
tree | 75b8b291af55e80d01d9eb85afd7d465233a1a57 /src/event.cpp | |
parent | 66599a9896e0cf69b58c0a73152aba4750d87af2 (diff) | |
download | mana-306ad2effe4d0897453e61ad787e01dc47c33076.tar.gz mana-306ad2effe4d0897453e61ad787e01dc47c33076.tar.bz2 mana-306ad2effe4d0897453e61ad787e01dc47c33076.tar.xz mana-306ad2effe4d0897453e61ad787e01dc47c33076.zip |
General code cleanups
* Use default member initializers
* Use range-based for loops
* Avoid needless pointer references for ShopItem::mDuplicates
* Removed type aliases that are only used once or twice
* Removed more unused includes
* Removed some unused functions
* Removed superfluous .c_str()
* Rely on default copy and assignment operators for Vector class
* Use std::unique_ptr in some places
* Removed duplicated mPlayerMoney updating in SellDialog
* Removed duplicated Game::handleInput call
* Removed unused SDLInput::mMouseInWindow
* Removed remnant of manual widget positioning in HelpWindow
* Removed superfluous initialization of static pointers
Diffstat (limited to 'src/event.cpp')
-rw-r--r-- | src/event.cpp | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/src/event.cpp b/src/event.cpp index aba2996f..7c9b6f45 100644 --- a/src/event.cpp +++ b/src/event.cpp @@ -57,13 +57,6 @@ int Event::getInt(const std::string &key) const return static_cast<IntData *>(it->second)->getData(); } -bool Event::hasInt(const std::string &key) const -{ - auto it = mData.find(key); - return !(it == mData.end() - || it->second->getType() != VariableData::DATA_INT); -} - // Strings void Event::setString(const std::string &key, const std::string &value) @@ -87,13 +80,6 @@ const std::string &Event::getString(const std::string &key) const } -bool Event::hasString(const std::string &key) const -{ - auto it = mData.find(key); - return !(it == mData.end() - || it->second->getType() != VariableData::DATA_STRING); -} - // Floats void Event::setFloat(const std::string &key, double value) @@ -116,13 +102,6 @@ double Event::getFloat(const std::string &key) const return static_cast<FloatData *>(it->second)->getData(); } -bool Event::hasFloat(const std::string &key) const -{ - auto it = mData.find(key); - return !(it == mData.end() - || it->second->getType() != VariableData::DATA_FLOAT); -} - // Booleans void Event::setBool(const std::string &key, bool value) @@ -145,13 +124,6 @@ bool Event::getBool(const std::string &key) const return static_cast<BoolData *>(it->second)->getData(); } -bool Event::hasBool(const std::string &key) const -{ - auto it = mData.find(key); - return !(it == mData.end() - || it->second->getType() != VariableData::DATA_BOOL); -} - // Items void Event::setItem(const std::string &key, Item *value) @@ -174,13 +146,6 @@ Item *Event::getItem(const std::string &key) const return static_cast<ItemData *>(it->second)->getData(); } -bool Event::hasItem(const std::string &key) const -{ - auto it = mData.find(key); - return !(it == mData.end() - || it->second->getType() != VariableData::DATA_ITEM); -} - // Actors void Event::setActor(const std::string &key, ActorSprite *value) @@ -203,13 +168,6 @@ ActorSprite *Event::getActor(const std::string &key) const return static_cast<ActorData *>(it->second)->getData(); } -bool Event::hasActor(const std::string &key) const -{ - auto it = mData.find(key); - return !(it == mData.end() - || it->second->getType() != VariableData::DATA_ACTOR); -} - // Triggers void Event::trigger(Channel channel, const Event &event) |