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/playerinfo.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/playerinfo.cpp')
-rw-r--r-- | src/playerinfo.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/playerinfo.cpp b/src/playerinfo.cpp index a937d71e..433f4f6b 100644 --- a/src/playerinfo.cpp +++ b/src/playerinfo.cpp @@ -31,17 +31,17 @@ namespace PlayerInfo { class PlayerLogic; -static PlayerLogic *mListener = nullptr; +static PlayerLogic *mListener; static PlayerInfoBackend mData; -static Inventory *mInventory = nullptr; -static Equipment *mEquipment = nullptr; +static Inventory *mInventory; +static Equipment *mEquipment; -static bool mStorageCount = 0; +static bool mStorageCount = false; -static bool mNPCCount = 0; -static bool mNPCPostCount = 0; +static bool mNPCCount = false; +static bool mNPCPostCount = false; static BuySellState mBuySellState = BUYSELL_NONE; @@ -78,7 +78,7 @@ void triggerStat(int id, const std::string &changed, int old1, int old2 = 0) int getAttribute(int id) { - IntMap::const_iterator it = mData.mAttributes.find(id); + auto it = mData.mAttributes.find(id); if (it != mData.mAttributes.end()) return it->second; @@ -97,7 +97,7 @@ void setAttribute(int id, int value, bool notify) int getStatBase(int id) { - StatMap::const_iterator it = mData.mStats.find(id); + auto it = mData.mStats.find(id); if (it != mData.mStats.end()) return it->second.base; @@ -114,7 +114,7 @@ void setStatBase(int id, int value, bool notify) int getStatMod(int id) { - StatMap::const_iterator it = mData.mStats.find(id); + auto it = mData.mStats.find(id); if (it != mData.mStats.end()) return it->second.mod; @@ -131,7 +131,7 @@ void setStatMod(int id, int value, bool notify) int getStatEffective(int id) { - StatMap::const_iterator it = mData.mStats.find(id); + auto it = mData.mStats.find(id); if (it != mData.mStats.end()) return it->second.base + it->second.mod; @@ -140,7 +140,7 @@ int getStatEffective(int id) std::pair<int, int> getStatExperience(int id) { - StatMap::const_iterator it = mData.mStats.find(id); + auto it = mData.mStats.find(id); int a, b; if (it != mData.mStats.end()) { @@ -152,7 +152,7 @@ std::pair<int, int> getStatExperience(int id) a = 0; b = 0; } - return std::pair<int, int>(a, b); + return { a, b }; } void setStatExperience(int id, int have, int need, bool notify) |