diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2012-07-24 14:56:32 +0300 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2012-07-24 15:03:46 +0300 |
| commit | 5c31445117ea88061dc4ee60e0dec4d11c8c3ed7 (patch) | |
| tree | 285b0d332b4d9ca9b05269984a2b38d6ad40a8c2 /src/mapblock.cpp | |
| parent | 717ae6799542d000952c80d834bd3d9892bc9616 (diff) | |
| download | minetest-5c31445117ea88061dc4ee60e0dec4d11c8c3ed7.tar.gz minetest-5c31445117ea88061dc4ee60e0dec4d11c8c3ed7.tar.bz2 minetest-5c31445117ea88061dc4ee60e0dec4d11c8c3ed7.zip | |
Improve node timer format (map format version 25) and update mapformat.txt
Diffstat (limited to 'src/mapblock.cpp')
| -rw-r--r-- | src/mapblock.cpp | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/src/mapblock.cpp b/src/mapblock.cpp index c7c820d42..b2da768f5 100644 --- a/src/mapblock.cpp +++ b/src/mapblock.cpp @@ -612,8 +612,10 @@ void MapBlock::serialize(std::ostream &os, u8 version, bool disk) */ if(disk) { - // Node timers - m_node_timers.serialize(os); + if(version <= 24){ + // Node timers + m_node_timers.serialize(os, version); + } // Static objects m_static_objects.serialize(os); @@ -623,6 +625,11 @@ void MapBlock::serialize(std::ostream &os, u8 version, bool disk) // Write block-specific node definition id mapping nimap.serialize(os); + + if(version >= 25){ + // Node timers + m_node_timers.serialize(os, version); + } } } @@ -696,10 +703,10 @@ void MapBlock::deSerialize(std::istream &is, u8 version, bool disk) // Read unused zero readU8(is); } - else if(version >= 24){ + if(version == 24){ TRACESTREAM(<<"MapBlock::deSerialize "<<PP(getPos()) - <<": Node timers"<<std::endl); - m_node_timers.deSerialize(is); + <<": Node timers (ver==24)"<<std::endl); + m_node_timers.deSerialize(is, version); } // Static objects @@ -719,6 +726,12 @@ void MapBlock::deSerialize(std::istream &is, u8 version, bool disk) NameIdMapping nimap; nimap.deSerialize(is); correctBlockNodeIds(&nimap, data, m_gamedef); + + if(version >= 25){ + TRACESTREAM(<<"MapBlock::deSerialize "<<PP(getPos()) + <<": Node timers (ver>=25)"<<std::endl); + m_node_timers.deSerialize(is, version); + } } TRACESTREAM(<<"MapBlock::deSerialize "<<PP(getPos()) |