diff options
| author | Stijn Buys <ingar@osirion.org> | 2012-10-08 20:19:50 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2012-10-08 20:19:50 +0000 |
| commit | 90be07acb8d2a2c481761ef754d938559510ae0f (patch) | |
| tree | 66fb813990e367b92daacd19c580da091c608d61 | |
| parent | b5d824f36191e7ddc1c04afa0778347e1b02073e (diff) | |
Renamed Item::flag_is_set() to Item::has_flag().
| -rw-r--r-- | src/core/item.h | 4 | ||||
| -rw-r--r-- | src/game/base/savegame.cc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/core/item.h b/src/core/item.h index ac3188d..98d5813 100644 --- a/src/core/item.h +++ b/src/core/item.h @@ -55,8 +55,8 @@ public: } /// returns true of a flag is set - inline const bool flag_is_set(const Flags flag) const { - return ((item_flags & (unsigned int)flag) == (unsigned int)flag); + inline const bool has_flag(const Flags flag) const { + return ((item_flags & (unsigned int) flag) == (unsigned int) flag); } /* ---- mutators ----------------------------------------------- */ diff --git a/src/game/base/savegame.cc b/src/game/base/savegame.cc index 702dd49..0057a50 100644 --- a/src/game/base/savegame.cc +++ b/src/game/base/savegame.cc @@ -291,7 +291,7 @@ void SaveGame::inventory_to_stream(core::Inventory *inventory, std::ostream & os os << "label=" << item->info()->label() << std::endl; os << "amount=" << item->amount() << std::endl; os << "price=" << item->price() << std::endl; - os << "tradeable=" << (item->flag_is_set(core::Item::Tradeable) ? "yes" : "no") << std::endl; + os << "tradeable=" << (item->has_flag(core::Item::Tradeable) ? "yes" : "no") << std::endl; } } |