diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2012-07-23 07:20:13 +0300 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2012-07-23 08:18:39 +0300 |
| commit | fd845f27f5b3e3c6587c472be76235567a7b934d (patch) | |
| tree | 53915de3f1c512e0e4ec8d29cd42160a9af5e826 /src/nodedef.cpp | |
| parent | ea62ee4b61371107ef3d693bda4c410ba02ca7e6 (diff) | |
| download | minetest-fd845f27f5b3e3c6587c472be76235567a7b934d.tar.gz minetest-fd845f27f5b3e3c6587c472be76235567a7b934d.tar.bz2 minetest-fd845f27f5b3e3c6587c472be76235567a7b934d.zip | |
Fix map deserialization and remove old serialization code
Diffstat (limited to 'src/nodedef.cpp')
| -rw-r--r-- | src/nodedef.cpp | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/src/nodedef.cpp b/src/nodedef.cpp index 47a29a6fc..e38061e30 100644 --- a/src/nodedef.cpp +++ b/src/nodedef.cpp @@ -377,18 +377,9 @@ public: } } // CONTENT_IGNORE = not found - content_t getFreeId(bool require_full_param2) + content_t getFreeId() { - // If allowed, first search in the large 4-bit-param2 pool - if(!require_full_param2){ - for(u16 i=0x800; i<=0xfff; i++){ - const ContentFeatures &f = m_content_features[i]; - if(f.name == "") - return i; - } - } - // Then search from the small 8-bit-param2 pool - for(u16 i=0; i<=125; i++){ + for(u32 i=0; i<=0xffff; i++){ const ContentFeatures &f = m_content_features[i]; if(f.name == "") return i; @@ -492,16 +483,8 @@ public: u16 id = CONTENT_IGNORE; bool found = m_name_id_mapping.getId(name, id); // ignore aliases if(!found){ - // Determine if full param2 is required - bool require_full_param2 = ( - def.param_type_2 == CPT2_FULL - || - def.param_type_2 == CPT2_FLOWINGLIQUID - || - def.legacy_wallmounted - ); // Get some id - id = getFreeId(require_full_param2); + id = getFreeId(); if(id == CONTENT_IGNORE) return CONTENT_IGNORE; if(name != "") |