From b974b1ea59efac4a14a929b917df152d06487201 Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Wed, 14 Mar 2012 21:21:03 +0000 Subject: Unified the chunk data to use the BLOCKDATA datatype. git-svn-id: http://mc-server.googlecode.com/svn/trunk@413 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/WSSCompact.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'source/WSSCompact.cpp') diff --git a/source/WSSCompact.cpp b/source/WSSCompact.cpp index ae920e55f..8c27dba51 100644 --- a/source/WSSCompact.cpp +++ b/source/WSSCompact.cpp @@ -734,12 +734,14 @@ bool cWSSCompact::LoadChunkFromData(const cChunkCoords & a_Chunk, int & a_Uncomp } } + BLOCKTYPE * BlockData = (BLOCKTYPE *)UncompressedData.data(); + a_World->ChunkDataLoaded( a_Chunk.m_ChunkX, a_Chunk.m_ChunkY, a_Chunk.m_ChunkZ, - UncompressedData.data(), - UncompressedData.data() + cChunkDef::MetaOffset, - UncompressedData.data() + cChunkDef::LightOffset, - UncompressedData.data() + cChunkDef::SkyLightOffset, + BlockData, + BlockData + cChunkDef::MetaOffset, + BlockData + cChunkDef::LightOffset, + BlockData + cChunkDef::SkyLightOffset, NULL, Entities, BlockEntities @@ -788,7 +790,7 @@ bool cWSSCompact::cPAKFile::SaveChunkToData(const cChunkCoords & a_Chunk, cWorld } AString Data; - Data.assign(Serializer.GetBlockData(), cChunkDef::BlockDataSize); + Data.assign((const char *)Serializer.GetBlockData(), cChunkDef::BlockDataSize); if (Serializer.HasJsonData()) { AString JsonData; -- cgit v1.2.3