neocturne/MinedMap
1
0
Fork 0
mirror of https://github.com/neocturne/MinedMap.git synced 2025-07-12 09:59:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

More convenient tag access

Browse source
This commit is contained in:
Matthias Schiffer 2015-02-01 01:38:20 +01:00
parent cbe6461882
commit a6a2a62812
8 changed files with 103 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/World/Chunk.cpp
View file

@ -36,7 +36,7 @@
namespace MinedMap {
namespace World {
std::tuple<UniqueCPtr<uint8_t[]>, size_t> Chunk::inflateChunk(uint8_t *data, size_t len) {
std::pair<UniqueCPtr<uint8_t[]>, size_t> Chunk::inflateChunk(uint8_t *data, size_t len) {
size_t outlen = 0;
uint8_t *output = nullptr;
@ -67,7 +67,7 @@ std::tuple<UniqueCPtr<uint8_t[]>, size_t> Chunk::inflateChunk(uint8_t *data, siz
inflateEnd(&stream);
return std::make_tuple(UniqueCPtr<uint8_t[]>(output), stream.total_out);
return std::make_pair(UniqueCPtr<uint8_t[]>(output), stream.total_out);
}
Chunk::Chunk(uint8_t *buffer, size_t buflen) {
@ -89,12 +89,12 @@ Chunk::Chunk(uint8_t *buffer, size_t buflen) {
std::cerr << "Chunk has size " << size << " (" << len << " inflated)" << std::endl;
Buffer nbt(data.get(), len);
std::pair<std::string, std::shared_ptr<const NBT::Tag>> tag = NBT::Tag::readNamedTag(&nbt);
std::pair<std::string, std::shared_ptr<NBT::Tag>> tag = NBT::Tag::readNamedTag(&nbt);
if (tag.first != "")
throw std::invalid_argument("non-empty root tag");
std::shared_ptr<const NBT::CompoundTag>::operator=(std::dynamic_pointer_cast<const NBT::CompoundTag>(tag.second));
content = std::move(tag.second);
if (!(*this) || tag.first != "")
throw std::invalid_argument("invalid root tag");
}
}