diff --git a/LEGO1/mxdsbuffer.cpp b/LEGO1/mxdsbuffer.cpp index b3e028d8..70b439a4 100644 --- a/LEGO1/mxdsbuffer.cpp +++ b/LEGO1/mxdsbuffer.cpp @@ -469,7 +469,7 @@ MxResult MxDSBuffer::CalcBytesRemaining(MxU8* p_data) memcpy(m_pBuffer + m_writeOffset - m_bytesRemaining, ptr, bytesRead); if (m_writeOffset == m_bytesRemaining) - *(MxU32*) (m_pBuffer + 4) = *MxStreamChunk::IntoPlus18(m_pBuffer) + MxStreamChunk::ReturnE(); + *(MxU32*) (m_pBuffer + 4) = *MxStreamChunk::IntoPlus0x12(m_pBuffer) + MxStreamChunk::ReturnE(); m_bytesRemaining -= bytesRead; result = SUCCESS; diff --git a/LEGO1/mxstreamchunk.cpp b/LEGO1/mxstreamchunk.cpp index 0143c06b..f26f4d53 100644 --- a/LEGO1/mxstreamchunk.cpp +++ b/LEGO1/mxstreamchunk.cpp @@ -50,16 +50,16 @@ MxU32 MxStreamChunk::ReadChunkHeader(MxU8* p_chunkData) } // FUNCTION: LEGO1 0x100c30e0 -MxResult MxStreamChunk::SendChunk(MxStreamListMxDSSubscriber& p_subscriberList, MxBool p_preappend, MxS16 p_obj24val) +MxResult MxStreamChunk::SendChunk(MxStreamListMxDSSubscriber& p_subscriberList, MxBool p_append, MxS16 p_obj24val) { for (MxStreamListMxDSSubscriber::iterator it = p_subscriberList.begin(); it != p_subscriberList.end(); it++) { if ((*it)->GetObjectId() == m_objectId && (*it)->GetUnknown48() == p_obj24val) { - if ((m_flags & 2) != 0 && m_buffer) { + if (m_flags & MxDSChunk::Flag_Bit2 && m_buffer) { m_buffer->ReleaseRef(this); m_buffer = NULL; } - (*it)->AddChunk(this, p_preappend); + (*it)->AddChunk(this, p_append); return SUCCESS; } @@ -81,7 +81,7 @@ MxU16* MxStreamChunk::IntoFlags(MxU8* p_buffer) } // FUNCTION: LEGO1 0x100c31b0 -MxU32* MxStreamChunk::IntoPlus18(MxU8* p_buffer) +MxU32* MxStreamChunk::IntoPlus0x12(MxU8* p_buffer) { - return (MxU32*) (p_buffer + 18); + return (MxU32*) (p_buffer + 0x12); } diff --git a/LEGO1/mxstreamchunk.h b/LEGO1/mxstreamchunk.h index bad7c9cc..0d35ffd9 100644 --- a/LEGO1/mxstreamchunk.h +++ b/LEGO1/mxstreamchunk.h @@ -31,11 +31,11 @@ class MxStreamChunk : public MxDSChunk { MxResult ReadChunk(MxDSBuffer* p_buffer, MxU8* p_chunkData); MxU32 ReadChunkHeader(MxU8* p_chunkData); - MxResult SendChunk(MxStreamListMxDSSubscriber& p_subscriberList, MxBool p_preappend, MxS16 p_obj24val); + MxResult SendChunk(MxStreamListMxDSSubscriber& p_subscriberList, MxBool p_append, MxS16 p_obj24val); void SetBuffer(MxDSBuffer* p_buffer); static MxU16* IntoFlags(MxU8* p_buffer); - static MxU32* IntoPlus18(MxU8* p_buffer); + static MxU32* IntoPlus0x12(MxU8* p_buffer); // FUNCTION: LEGO1 0x100c3190 static MxU32* ReturnPlus10Ptr(MxU32* p_chunk) { return p_chunk + 10; }