diff --git a/ISLE/isleapp.cpp b/ISLE/isleapp.cpp index baf689ce..ab0d2290 100644 --- a/ISLE/isleapp.cpp +++ b/ISLE/isleapp.cpp @@ -787,7 +787,7 @@ inline void IsleApp::Tick(BOOL sleepIfNotNextFrame) MxStreamController* stream = Streamer()->Open("\\lego\\scripts\\isle\\isle", MxStreamer::e_DiskStream); MxDSAction ds; - if (1) { + if (!stream) { stream = Streamer()->Open("\\lego\\scripts\\nocd", MxStreamer::e_DiskStream); if (!stream) { return; diff --git a/LEGO1/mxdsbuffer.cpp b/LEGO1/mxdsbuffer.cpp index a1209557..afe87a87 100644 --- a/LEGO1/mxdsbuffer.cpp +++ b/LEGO1/mxdsbuffer.cpp @@ -136,7 +136,7 @@ MxResult MxDSBuffer::FUN_100c67b0( do { while (TRUE) { - data = (MxU8*) SwapBuffers(); + data = (MxU8*) SkipToData(); if (data == NULL) { return SUCCESS; } @@ -292,7 +292,7 @@ MxCore* MxDSBuffer::ReadChunk(MxDSBuffer* p_buffer, MxU32* p_chunkData, MxU16 p_ } // FUNCTION: LEGO1 0x100c6df0 -MxU8* MxDSBuffer::SwapBuffers() +MxU8* MxDSBuffer::SkipToData() { MxU8* result = NULL; diff --git a/LEGO1/mxdsbuffer.h b/LEGO1/mxdsbuffer.h index f3141b21..e9fe2675 100644 --- a/LEGO1/mxdsbuffer.h +++ b/LEGO1/mxdsbuffer.h @@ -53,7 +53,7 @@ class MxDSBuffer : public MxCore { MxStreamChunk* p_header ); static MxCore* ReadChunk(MxDSBuffer* p_buffer, MxU32* p_chunkData, MxU16 p_flags); - MxU8* SwapBuffers(); + MxU8* SkipToData(); MxU8 ReleaseRef(MxDSChunk*); void AddRef(MxDSChunk* p_chunk); MxResult CalcBytesRemaining(MxU8* p_data);