mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-25 09:24:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use macros for Seek modes

Browse Source
This commit is contained in:
Christian Semmler
2024-12-16 13:50:57 -07:00
parent 615c3a5047
commit fdc79ce792
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp
View File

@@ -319,7 +319,7 @@ MxResult LegoWorldPresenter::FUN_10067360(ModelDbPart& p_part, FILE* p_wdbFile)
MxResult result; MxResult result;
MxU8* buff = new MxU8[p_part.m_partDataLength]; MxU8* buff = new MxU8[p_part.m_partDataLength];
fseek(p_wdbFile, p_part.m_partDataOffset, 0); fseek(p_wdbFile, p_part.m_partDataOffset, SEEK_SET);
if (fread(buff, p_part.m_partDataLength, 1, p_wdbFile) != 1) { if (fread(buff, p_part.m_partDataLength, 1, p_wdbFile) != 1) {
return FAILURE; return FAILURE;
} }
@@ -344,7 +344,7 @@ MxResult LegoWorldPresenter::FUN_100674b0(ModelDbModel& p_model, FILE* p_wdbFile
{ {
MxU8* buff = new MxU8[p_model.m_unk0x04]; MxU8* buff = new MxU8[p_model.m_unk0x04];
fseek(p_wdbFile, p_model.m_unk0x08, 0); fseek(p_wdbFile, p_model.m_unk0x08, SEEK_SET);
if (fread(buff, p_model.m_unk0x04, 1, p_wdbFile) != 1) { if (fread(buff, p_model.m_unk0x04, 1, p_wdbFile) != 1) {
return FAILURE; return FAILURE;
} }

2
LEGO1/omni/include/mxdsfile.h
View File

@@ -43,7 +43,7 @@ public:
MxResult Open(MxULong) override; // vtable+0x14 MxResult Open(MxULong) override; // vtable+0x14
MxResult Close() override; // vtable+0x18 MxResult Close() override; // vtable+0x18
MxResult Read(unsigned char*, MxULong) override; // vtable+0x20 MxResult Read(unsigned char*, MxULong) override; // vtable+0x20
MxResult Seek(MxLong, int) override; // vtable+0x24 MxResult Seek(MxLong, MxS32) override; // vtable+0x24
MxULong GetBufferSize() override; // vtable+0x28 MxULong GetBufferSize() override; // vtable+0x28
MxULong GetStreamBuffersNum() override; // vtable+0x2c MxULong GetStreamBuffersNum() override; // vtable+0x2c

2
LEGO1/omni/include/mxdssource.h
View File

@@ -31,7 +31,7 @@ public:
virtual MxLong Close() = 0; // vtable+0x18 virtual MxLong Close() = 0; // vtable+0x18
virtual MxResult ReadToBuffer(MxDSBuffer* p_buffer); // vtable+0x1c virtual MxResult ReadToBuffer(MxDSBuffer* p_buffer); // vtable+0x1c
virtual MxResult Read(unsigned char*, MxULong) = 0; // vtable+0x20 virtual MxResult Read(unsigned char*, MxULong) = 0; // vtable+0x20
virtual MxLong Seek(MxLong, int) = 0; // vtable+0x24 virtual MxLong Seek(MxLong, MxS32) = 0; // vtable+0x24
virtual MxULong GetBufferSize() = 0; // vtable+0x28 virtual MxULong GetBufferSize() = 0; // vtable+0x28
virtual MxULong GetStreamBuffersNum() = 0; // vtable+0x2c virtual MxULong GetStreamBuffersNum() = 0; // vtable+0x2c
virtual MxLong GetLengthInDWords(); // vtable+0x30 virtual MxLong GetLengthInDWords(); // vtable+0x30

4
LEGO1/omni/src/common/mxutilities.cpp
View File

@@ -12,7 +12,7 @@
#include <assert.h> #include <assert.h>
// GLOBAL: LEGO1 0x101020e8 // GLOBAL: LEGO1 0x101020e8
void (*g_omniUserMessage)(const char*, int) = NULL; void (*g_omniUserMessage)(const char*, MxS32) = NULL;
// FUNCTION: LEGO1 0x100b6e10 // FUNCTION: LEGO1 0x100b6e10
MxBool GetRectIntersection( MxBool GetRectIntersection(
@@ -166,7 +166,7 @@ MxDSObject* CreateStreamObject(MxDSFile* p_file, MxS16 p_ofs)
MxU8* buf; MxU8* buf;
_MMCKINFO tmpChunk; _MMCKINFO tmpChunk;
if (p_file->Seek(((MxLong*) p_file->GetBuffer())[p_ofs], 0)) { if (p_file->Seek(((MxLong*) p_file->GetBuffer())[p_ofs], SEEK_SET)) {
return NULL; return NULL;
} }

2
LEGO1/omni/src/stream/mxdiskstreamprovider.cpp
View File

@@ -245,7 +245,7 @@ void MxDiskStreamProvider::PerformWork()
buffer = streamingAction->GetUnknowna0(); buffer = streamingAction->GetUnknowna0();
if (m_pFile->GetPosition() == streamingAction->GetBufferOffset() || if (m_pFile->GetPosition() == streamingAction->GetBufferOffset() ||
m_pFile->Seek(streamingAction->GetBufferOffset(), 0) == 0) { m_pFile->Seek(streamingAction->GetBufferOffset(), SEEK_SET) == 0) {
buffer->SetUnknown14(m_pFile->GetPosition()); buffer->SetUnknown14(m_pFile->GetPosition());
if (m_pFile->ReadToBuffer(buffer) == SUCCESS) { if (m_pFile->ReadToBuffer(buffer) == SUCCESS) {

2
LEGO1/omni/src/stream/mxdsfile.cpp
View File

@@ -41,7 +41,7 @@ MxResult MxDSFile::Open(MxULong p_uStyle)
Close(); Close();
} }
else { else {
Seek(0, 0); Seek(0, SEEK_SET);
} }
return result; return result;