isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-21 07:11:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert change to MxDSSource/MxDSFile Read export

Browse Source
This commit is contained in:
disinvite 2023-09-19 22:25:07 -04:00
parent b5e4b13a75
commit 830115044d
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
LEGO1/legoomni.cpp
View File

@ -159,15 +159,15 @@ MxDSObject *CreateStreamObject(MxDSFile *p_file, MxS16 p_ofs)
return NULL; return NULL;
} }
if (p_file->Read(&tmp_chunk.ckid, 8) == 0 && tmp_chunk.ckid == FOURCC('M', 'x', 'S', 't')) { if (p_file->Read((MxU8*)&tmp_chunk.ckid, 8) == 0 && tmp_chunk.ckid == FOURCC('M', 'x', 'S', 't')) {
if (p_file->Read(&tmp_chunk.ckid, 8) == 0 && tmp_chunk.ckid == FOURCC('M', 'x', 'O', 'b')) { if (p_file->Read((MxU8*)&tmp_chunk.ckid, 8) == 0 && tmp_chunk.ckid == FOURCC('M', 'x', 'O', 'b')) {
buf = new char[tmp_chunk.cksize]; buf = new char[tmp_chunk.cksize];
if (!buf) { if (!buf) {
return NULL; return NULL;
} }
if (p_file->Read(buf, tmp_chunk.cksize) != 0) { if (p_file->Read((MxU8*)buf, tmp_chunk.cksize) != 0) {
return NULL; return NULL;
} }

2
LEGO1/mxdsfile.cpp
View File

@ -47,7 +47,7 @@ MxLong MxDSFile::Open(MxULong uStyle)
} }
// OFFSET: LEGO1 0x100cc780 // OFFSET: LEGO1 0x100cc780
MxResult MxDSFile::Read(void *p_buf, MxULong p_nbytes) MxResult MxDSFile::Read(unsigned char *p_buf, MxULong p_nbytes)
{ {
if (m_io.Read(p_buf, p_nbytes) != p_nbytes) if (m_io.Read(p_buf, p_nbytes) != p_nbytes)
return FAILURE; return FAILURE;

2
LEGO1/mxdsfile.h
View File

@ -28,7 +28,7 @@ class MxDSFile : public MxDSSource
__declspec(dllexport) virtual MxLong Open(MxULong); // vtable+0x14 __declspec(dllexport) virtual MxLong Open(MxULong); // vtable+0x14
__declspec(dllexport) virtual MxLong Close(); // vtable+0x18 __declspec(dllexport) virtual MxLong Close(); // vtable+0x18
__declspec(dllexport) virtual MxResult Read(void *,MxULong); // vtable+0x20 __declspec(dllexport) virtual MxResult Read(unsigned char *,MxULong); // vtable+0x20
__declspec(dllexport) virtual MxLong Seek(MxLong,int); // vtable+0x24 __declspec(dllexport) virtual MxLong Seek(MxLong,int); // vtable+0x24
__declspec(dllexport) virtual MxULong GetBufferSize(); // vtable+0x28 __declspec(dllexport) virtual MxULong GetBufferSize(); // vtable+0x28
__declspec(dllexport) virtual MxULong GetStreamBuffersNum(); // vtable+0x2c __declspec(dllexport) virtual MxULong GetStreamBuffersNum(); // vtable+0x2c

2
LEGO1/mxdssource.h
View File

@ -29,7 +29,7 @@ class MxDSSource : public MxCore
virtual MxLong Open(MxULong) = 0; virtual MxLong Open(MxULong) = 0;
virtual MxLong Close() = 0; virtual MxLong Close() = 0;
virtual void SomethingWhichCallsRead(void* pUnknownObject); virtual void SomethingWhichCallsRead(void* pUnknownObject);
virtual MxResult Read(void *, MxULong) = 0; virtual MxResult Read(unsigned char *, MxULong) = 0;
virtual MxLong Seek(MxLong, int) = 0; virtual MxLong Seek(MxLong, int) = 0;
virtual MxULong GetBufferSize() = 0; virtual MxULong GetBufferSize() = 0;
virtual MxULong GetStreamBuffersNum() = 0; virtual MxULong GetStreamBuffersNum() = 0;