diff options
author | est31 <MTest31@outlook.com> | 2015-09-18 13:45:42 +0200 |
---|---|---|
committer | est31 <MTest31@outlook.com> | 2015-09-19 20:57:29 +0200 |
commit | 452df1c723722183ebf3a332f7bcc355be5b2998 (patch) | |
tree | cfba8eaa11c7bdc1d6c245bfa85c973597bccc3c /src/nodemetadata.h | |
parent | 9c635f28ac2b103bf7196e47947bf64673c13393 (diff) | |
download | minetest-452df1c723722183ebf3a332f7bcc355be5b2998.tar.gz minetest-452df1c723722183ebf3a332f7bcc355be5b2998.tar.bz2 minetest-452df1c723722183ebf3a332f7bcc355be5b2998.zip |
Various style cleanups + unused code removal
-> Don't pass pointer to whole IGameDef to NodeMetadata constructors
and deserializers, but only to IItemDefManager, which is needed
-> Remove the unused content_mapnode_get_new_name() method
-> Fix style for MapBlock::deSerialize and MapBlock::deSerialize_pre22,
improving accuracy of error messages a bit
-> Fix style at other serialisation methods too
-> Improve accuracy of some comments
Diffstat (limited to 'src/nodemetadata.h')
-rw-r--r-- | src/nodemetadata.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/nodemetadata.h b/src/nodemetadata.h index 8e84e5af3..8d1298212 100644 --- a/src/nodemetadata.h +++ b/src/nodemetadata.h @@ -35,12 +35,12 @@ with this program; if not, write to the Free Software Foundation, Inc., */ class Inventory; -class IGameDef; +class IItemDefManager; class NodeMetadata { public: - NodeMetadata(IGameDef *gamedef); + NodeMetadata(IItemDefManager *item_def_mgr); ~NodeMetadata(); void serialize(std::ostream &os) const; @@ -80,7 +80,7 @@ public: ~NodeMetadataList(); void serialize(std::ostream &os) const; - void deSerialize(std::istream &is, IGameDef *gamedef); + void deSerialize(std::istream &is, IItemDefManager *item_def_mgr); // Add all keys in this list to the vector keys std::vector<v3s16> getAllKeys(); |