diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-11-28 00:45:34 +0200 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-11-29 19:13:56 +0200 |
| commit | 842eb5da280b09e046531dd03fe9b9b20752ad12 (patch) | |
| tree | 97d26292a9162c8c713aa3cacb0914d6c35d3b78 /src/mapblock.cpp | |
| parent | 05df2ee8a4fe6bd4fcb1879fd418ef6ad301fcf4 (diff) | |
| download | minetest-842eb5da280b09e046531dd03fe9b9b20752ad12.tar.gz minetest-842eb5da280b09e046531dd03fe9b9b20752ad12.tar.bz2 minetest-842eb5da280b09e046531dd03fe9b9b20752ad12.zip | |
Replace old active block random node modifying things with actual ActiveBlockModifiers
Diffstat (limited to 'src/mapblock.cpp')
| -rw-r--r-- | src/mapblock.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/mapblock.cpp b/src/mapblock.cpp index bc678db15..016cb222e 100644 --- a/src/mapblock.cpp +++ b/src/mapblock.cpp @@ -48,6 +48,7 @@ MapBlock::MapBlock(Map *parent, v3s16 pos, IGameDef *gamedef, bool dummy): m_day_night_differs(false), m_generated(false), m_timestamp(BLOCK_TIMESTAMP_UNDEFINED), + m_disk_timestamp(BLOCK_TIMESTAMP_UNDEFINED), m_usage_timer(0) { data = NULL; @@ -928,10 +929,12 @@ void MapBlock::deSerializeDiskExtra(std::istream &is, u8 version) m_static_objects.deSerialize(is); // Timestamp - if(version >= 17) + if(version >= 17){ setTimestamp(readU32(is)); - else + m_disk_timestamp = m_timestamp; + } else { setTimestamp(BLOCK_TIMESTAMP_UNDEFINED); + } // Dynamically re-set ids based on node names NameIdMapping nimap; |