Merge PR from gpcf (Get on by walking in) - advtrains.git

diff options

author	orwell96 <mono96.mml@gmail.com>	2017-02-07 22:10:48 +0100
committer	orwell96 <mono96.mml@gmail.com>	2017-02-07 22:10:48 +0100
commit	4abb967f921c9d965c0746230b0756736f540dd3 (patch)
tree	9adf0cd8c508e2d42900e91aa1edd050042300fd /advtrains/advtrains_train_industrial/models
parent	9f862a158cd0e07d5799c83fec525c461260752c (diff)
parent	746e328b7b77514d343bfe76922de0244b608278 (diff)
download	advtrains-4abb967f921c9d965c0746230b0756736f540dd3.tar.gz advtrains-4abb967f921c9d965c0746230b0756736f540dd3.tar.bz2 advtrains-4abb967f921c9d965c0746230b0756736f540dd3.zip

Merge PR from gpcf (Get on by walking in)

Diffstat (limited to 'advtrains/advtrains_train_industrial/models')

0 files changed, 0 insertions, 0 deletions

/* Minetest Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com> This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include "nodetimer.h" #include "log.h" #include "serialization.h" #include "util/serialize.h" #include "constants.h" // MAP_BLOCKSIZE /* NodeTimer */ void NodeTimer::serialize(std::ostream &os) const { writeF1000(os, timeout); writeF1000(os, elapsed); } void NodeTimer::deSerialize(std::istream &is) { timeout = readF1000(is); elapsed = readF1000(is); } /* NodeTimerList */ void NodeTimerList::serialize(std::ostream &os, u8 map_format_version) const { if (map_format_version == 24) { // Version 0 is a placeholder for "nothing to see here; go away." if (m_timers.empty()) { writeU8(os, 0); // version return; } writeU8(os, 1); // version writeU16(os, m_timers.size()); } if (map_format_version >= 25) { writeU8(os, 2 + 4 + 4); // length of the data for a single timer writeU16(os, m_timers.size()); } for (const auto &timer : m_timers) { NodeTimer t = timer.second; NodeTimer nt = NodeTimer(t.timeout, t.timeout - (f32)(timer.first - m_time), t.position); v3s16 p = t.position; u16 p16 = p.Z * MAP_BLOCKSIZE * MAP_BLOCKSIZE + p.Y * MAP_BLOCKSIZE + p.X; writeU16(os, p16); nt.serialize(os); } } void NodeTimerList::deSerialize(std::istream &is, u8 map_format_version) { clear(); if (map_format_version == 24) { u8 timer_version = readU8(is); if(timer_version == 0) return; if(timer_version != 1) throw SerializationError("unsupported NodeTimerList version"); } if (map_format_version >= 25) { u8 timer_data_len = readU8(is); if(timer_data_len != 2+4+4) throw SerializationError("unsupported NodeTimer data length"); } u16 count = readU16(is); for (u16 i = 0; i < count; i++) { u16 p16 = readU16(is); v3s16 p; p.Z = p16 / MAP_BLOCKSIZE / MAP_BLOCKSIZE; p16 &= MAP_BLOCKSIZE * MAP_BLOCKSIZE - 1; p.Y = p16 / MAP_BLOCKSIZE; p16 &= MAP_BLOCKSIZE - 1; p.X = p16; NodeTimer t(p); t.deSerialize(is); if (t.timeout <= 0) { warningstream<<"NodeTimerList::deSerialize(): " <<"invalid data at position" <<"("<<p.X<<","<<p.Y<<","<<p.Z<<"): Ignoring." <<std::endl; continue; } if (m_iterators.find(p) != m_iterators.end()) { warningstream<<"NodeTimerList::deSerialize(): " <<"already set data at position" <<"("<<p.X<<","<<p.Y<<","<<p.Z<<"): Ignoring." <<std::endl; continue; } insert(t); } } std::vector<NodeTimer> NodeTimerList::step(float dtime) { std::vector<NodeTimer> elapsed_timers; m_time += dtime;


context:
space:
mode: