From a84709ad04bd273d2a831a4b290ea56fb3745dbd Mon Sep 17 00:00:00 2001 From: jonschz Date: Tue, 11 Jun 2024 20:27:43 +0200 Subject: [PATCH] address review comments, part 2 [skip ci] --- LEGO1/lego/legoomni/include/ambulance.h | 2 +- LEGO1/lego/legoomni/include/gasstation.h | 2 +- LEGO1/lego/legoomni/include/hospital.h | 2 +- LEGO1/lego/legoomni/include/isle.h | 2 +- .../legoomni/include/legoanimationmanager.h | 2 +- LEGO1/lego/legoomni/include/legocarbuild.h | 2 +- LEGO1/lego/legoomni/include/legorace.h | 20 ++--- LEGO1/lego/legoomni/include/legostate.h | 14 ++-- LEGO1/lego/legoomni/include/pizza.h | 22 ++--- LEGO1/lego/legoomni/include/pizzeria.h | 2 +- LEGO1/lego/legoomni/include/police.h | 2 +- LEGO1/lego/legoomni/include/towtrack.h | 2 +- LEGO1/lego/legoomni/src/actors/ambulance.cpp | 48 +++++------ LEGO1/lego/legoomni/src/actors/pizza.cpp | 12 +-- LEGO1/lego/legoomni/src/actors/pizzeria.cpp | 10 +-- LEGO1/lego/legoomni/src/actors/towtrack.cpp | 48 +++++------ .../lego/legoomni/src/build/legocarbuild.cpp | 4 +- .../src/common/legoanimationmanager.cpp | 4 +- LEGO1/lego/legoomni/src/race/legorace.cpp | 6 +- LEGO1/lego/legoomni/src/worlds/gasstation.cpp | 28 +++---- LEGO1/lego/legoomni/src/worlds/hospital.cpp | 32 +++---- LEGO1/lego/legoomni/src/worlds/isle.cpp | 84 +++++++++---------- LEGO1/lego/legoomni/src/worlds/police.cpp | 10 +-- 23 files changed, 180 insertions(+), 180 deletions(-) diff --git a/LEGO1/lego/legoomni/include/ambulance.h b/LEGO1/lego/legoomni/include/ambulance.h index 3c6d8f0b..79091329 100644 --- a/LEGO1/lego/legoomni/include/ambulance.h +++ b/LEGO1/lego/legoomni/include/ambulance.h @@ -25,7 +25,7 @@ class AmbulanceMissionState : public LegoState { return !strcmp(p_name, AmbulanceMissionState::ClassName()) || LegoState::IsA(p_name); } - MxResult Serialize(LegoFile* p_legoFile) override; // vtable+0x1c + MxResult Serialize(LegoFile* p_file) override; // vtable+0x1c inline MxS16 GetHighScore(MxU8 p_actorId) { diff --git a/LEGO1/lego/legoomni/include/gasstation.h b/LEGO1/lego/legoomni/include/gasstation.h index 6a37db84..75234a25 100644 --- a/LEGO1/lego/legoomni/include/gasstation.h +++ b/LEGO1/lego/legoomni/include/gasstation.h @@ -33,7 +33,7 @@ class GasStationState : public LegoState { return !strcmp(p_name, GasStationState::ClassName()) || LegoState::IsA(p_name); } - MxResult Serialize(LegoFile* p_legoFile) override; // vtable+0x1c + MxResult Serialize(LegoFile* p_file) override; // vtable+0x1c // SYNTHETIC: LEGO1 0x10006290 // GasStationState::`scalar deleting destructor' diff --git a/LEGO1/lego/legoomni/include/hospital.h b/LEGO1/lego/legoomni/include/hospital.h index 32377fe3..4c453240 100644 --- a/LEGO1/lego/legoomni/include/hospital.h +++ b/LEGO1/lego/legoomni/include/hospital.h @@ -36,7 +36,7 @@ class HospitalState : public LegoState { return !strcmp(p_name, HospitalState::ClassName()) || LegoState::IsA(p_name); } - MxResult Serialize(LegoFile* p_legoFile) override; // vtable+0x1c + MxResult Serialize(LegoFile* p_file) override; // vtable+0x1c // SYNTHETIC: LEGO1 0x100764c0 // HospitalState::`scalar deleting destructor' diff --git a/LEGO1/lego/legoomni/include/isle.h b/LEGO1/lego/legoomni/include/isle.h index ee7a6363..223e0568 100644 --- a/LEGO1/lego/legoomni/include/isle.h +++ b/LEGO1/lego/legoomni/include/isle.h @@ -89,7 +89,7 @@ class Act1State : public LegoState { } MxBool SetFlag() override; // vtable+0x18 - MxResult Serialize(LegoFile* p_legoFile) override; // vtable+0x1c + MxResult Serialize(LegoFile* p_file) override; // vtable+0x1c void FUN_10034660(); void FUN_100346a0(); diff --git a/LEGO1/lego/legoomni/include/legoanimationmanager.h b/LEGO1/lego/legoomni/include/legoanimationmanager.h index 8e473077..7b98aba7 100644 --- a/LEGO1/lego/legoomni/include/legoanimationmanager.h +++ b/LEGO1/lego/legoomni/include/legoanimationmanager.h @@ -69,7 +69,7 @@ class AnimState : public LegoState { } MxBool SetFlag() override; // vtable+0x18 - MxResult Serialize(LegoFile* p_legoFile) override; // vtable+0x1c + MxResult Serialize(LegoFile* p_file) override; // vtable+0x1c void FUN_100651d0(MxU32, AnimInfo*, MxU32&); void FUN_10065240(MxU32, AnimInfo*, MxU32); diff --git a/LEGO1/lego/legoomni/include/legocarbuild.h b/LEGO1/lego/legoomni/include/legocarbuild.h index 30c064af..d11056c1 100644 --- a/LEGO1/lego/legoomni/include/legocarbuild.h +++ b/LEGO1/lego/legoomni/include/legocarbuild.h @@ -22,7 +22,7 @@ class LegoVehicleBuildState : public LegoState { return !strcmp(p_name, this->m_className.GetData()) || LegoState::IsA(p_name); } - MxResult Serialize(LegoFile* p_legoFile) override; // vtable+0x1c + MxResult Serialize(LegoFile* p_file) override; // vtable+0x1c // SYNTHETIC: LEGO1 0x100260a0 // LegoVehicleBuildState::`scalar deleting destructor' diff --git a/LEGO1/lego/legoomni/include/legorace.h b/LEGO1/lego/legoomni/include/legorace.h index 2da68867..ccc4b3be 100644 --- a/LEGO1/lego/legoomni/include/legorace.h +++ b/LEGO1/lego/legoomni/include/legorace.h @@ -25,20 +25,20 @@ class RaceState : public LegoState { inline MxS16 GetUnknown0x02() { return m_unk0x02; } inline MxS16 GetHighScore() { return m_score; } - inline MxResult Serialize(LegoFile* p_legoFile) + inline MxResult Serialize(LegoFile* p_file) { - if (p_legoFile->IsReadMode()) { - p_legoFile->Read(&m_id, sizeof(m_id)); - p_legoFile->Read(&m_unk0x02, sizeof(m_unk0x02)); - p_legoFile->Read(&m_score, sizeof(m_score)); + if (p_file->IsReadMode()) { + p_file->Read(&m_id, sizeof(m_id)); + p_file->Read(&m_unk0x02, sizeof(m_unk0x02)); + p_file->Read(&m_score, sizeof(m_score)); } - else if (p_legoFile->IsWriteMode()) { + else if (p_file->IsWriteMode()) { MxS8 id = m_id; - p_legoFile->Write(&id, sizeof(id)); + p_file->Write(&id, sizeof(id)); MxS16 unk0x02 = m_unk0x02; - p_legoFile->Write(&unk0x02, sizeof(unk0x02)); + p_file->Write(&unk0x02, sizeof(unk0x02)); MxS16 score = m_score; - p_legoFile->Write(&score, sizeof(score)); + p_file->Write(&score, sizeof(score)); } return SUCCESS; @@ -65,7 +65,7 @@ class RaceState : public LegoState { return !strcmp(p_name, RaceState::ClassName()) || LegoState::IsA(p_name); } - MxResult Serialize(LegoFile* p_legoFile) override; // vtable+0x1c + MxResult Serialize(LegoFile* p_file) override; // vtable+0x1c Entry* GetState(MxU8 p_id); diff --git a/LEGO1/lego/legoomni/include/legostate.h b/LEGO1/lego/legoomni/include/legostate.h index a63ce5eb..20bc5f1b 100644 --- a/LEGO1/lego/legoomni/include/legostate.h +++ b/LEGO1/lego/legoomni/include/legostate.h @@ -58,16 +58,16 @@ class LegoState : public MxCore { inline void SetUnknown0x08(MxS16 p_unk0x08) { m_nextIndex = p_unk0x08; } - inline MxResult ReadFromFile(LegoFile* p_legoFile) + inline MxResult ReadFromFile(LegoFile* p_file) { - p_legoFile->Read(&m_nextIndex, sizeof(m_nextIndex)); + p_file->Read(&m_nextIndex, sizeof(m_nextIndex)); return SUCCESS; } - inline MxResult WriteToFile(LegoFile* p_legoFile) + inline MxResult WriteToFile(LegoFile* p_file) { MxS16 write = m_nextIndex; - p_legoFile->Write(&write, sizeof(write)); + p_file->Write(&write, sizeof(write)); return SUCCESS; } @@ -101,10 +101,10 @@ class LegoState : public MxCore { virtual MxBool SetFlag() { return FALSE; } // vtable+0x18 // FUNCTION: LEGO1 0x10005fb0 - virtual MxResult Serialize(LegoFile* p_legoFile) + virtual MxResult Serialize(LegoFile* p_file) { - if (p_legoFile->IsWriteMode()) { - p_legoFile->WriteString(ClassName()); + if (p_file->IsWriteMode()) { + p_file->WriteString(ClassName()); } return SUCCESS; } // vtable+0x1c diff --git a/LEGO1/lego/legoomni/include/pizza.h b/LEGO1/lego/legoomni/include/pizza.h index 48d89c50..db8cac0b 100644 --- a/LEGO1/lego/legoomni/include/pizza.h +++ b/LEGO1/lego/legoomni/include/pizza.h @@ -15,25 +15,25 @@ class PizzaMissionState : public LegoState { // SIZE 0x20 struct Entry { public: - inline MxResult WriteToFile(LegoFile* p_legoFile) + inline MxResult WriteToFile(LegoFile* p_file) { MxS16 unk0x06 = m_unk0x06; - p_legoFile->Write(&unk0x06, sizeof(unk0x06)); + p_file->Write(&unk0x06, sizeof(unk0x06)); MxS16 unk0x14 = m_unk0x14; - p_legoFile->Write(&unk0x14, sizeof(unk0x14)); + p_file->Write(&unk0x14, sizeof(unk0x14)); MxS16 unk0x16 = m_unk0x16; - p_legoFile->Write(&unk0x16, sizeof(unk0x16)); + p_file->Write(&unk0x16, sizeof(unk0x16)); MxS16 score = m_score; - p_legoFile->Write(&score, sizeof(score)); + p_file->Write(&score, sizeof(score)); return SUCCESS; } - inline MxResult ReadFromFile(LegoFile* p_legoFile) + inline MxResult ReadFromFile(LegoFile* p_file) { - p_legoFile->Read(&m_unk0x06, sizeof(m_unk0x06)); - p_legoFile->Read(&m_unk0x14, sizeof(m_unk0x14)); - p_legoFile->Read(&m_unk0x16, sizeof(m_unk0x16)); - p_legoFile->Read(&m_score, sizeof(m_score)); + p_file->Read(&m_unk0x06, sizeof(m_unk0x06)); + p_file->Read(&m_unk0x14, sizeof(m_unk0x14)); + p_file->Read(&m_unk0x16, sizeof(m_unk0x16)); + p_file->Read(&m_score, sizeof(m_score)); return SUCCESS; } @@ -65,7 +65,7 @@ class PizzaMissionState : public LegoState { return !strcmp(p_name, PizzaMissionState::ClassName()) || LegoState::IsA(p_name); } - MxResult Serialize(LegoFile* p_legoFile) override; // vtable+0x1c + MxResult Serialize(LegoFile* p_file) override; // vtable+0x1c inline MxS16 GetHighScore(MxU8 p_id) { return GetState(p_id)->m_score; } diff --git a/LEGO1/lego/legoomni/include/pizzeria.h b/LEGO1/lego/legoomni/include/pizzeria.h index 46150249..2008f629 100644 --- a/LEGO1/lego/legoomni/include/pizzeria.h +++ b/LEGO1/lego/legoomni/include/pizzeria.h @@ -35,7 +35,7 @@ class PizzeriaState : public LegoState { return !strcmp(p_name, PizzeriaState::ClassName()) || LegoState::IsA(p_name); } - MxResult Serialize(LegoFile* p_legoFile) override; // vtable+0x1c + MxResult Serialize(LegoFile* p_file) override; // vtable+0x1c // SYNTHETIC: LEGO1 0x10017ce0 // PizzeriaState::`scalar deleting destructor' diff --git a/LEGO1/lego/legoomni/include/police.h b/LEGO1/lego/legoomni/include/police.h index 4c8c34eb..83394b1a 100644 --- a/LEGO1/lego/legoomni/include/police.h +++ b/LEGO1/lego/legoomni/include/police.h @@ -31,7 +31,7 @@ class PoliceState : public LegoState { return !strcmp(p_name, PoliceState::ClassName()) || LegoState::IsA(p_name); } - MxResult Serialize(LegoFile* p_legoFile) override; // vtable+0x1c + MxResult Serialize(LegoFile* p_file) override; // vtable+0x1c // SYNTHETIC: LEGO1 0x1005e920 // PoliceState::`scalar deleting destructor' diff --git a/LEGO1/lego/legoomni/include/towtrack.h b/LEGO1/lego/legoomni/include/towtrack.h index 31c1dc4b..3b3faafe 100644 --- a/LEGO1/lego/legoomni/include/towtrack.h +++ b/LEGO1/lego/legoomni/include/towtrack.h @@ -24,7 +24,7 @@ class TowTrackMissionState : public LegoState { return !strcmp(p_name, TowTrackMissionState::ClassName()) || LegoState::IsA(p_name); } - MxResult Serialize(LegoFile* p_legoFile) override; // vtable+0x1c + MxResult Serialize(LegoFile* p_file) override; // vtable+0x1c inline MxS16 GetHighScore(MxU8 p_id) { diff --git a/LEGO1/lego/legoomni/src/actors/ambulance.cpp b/LEGO1/lego/legoomni/src/actors/ambulance.cpp index 3361f366..f5be2c5e 100644 --- a/LEGO1/lego/legoomni/src/actors/ambulance.cpp +++ b/LEGO1/lego/legoomni/src/actors/ambulance.cpp @@ -643,44 +643,44 @@ AmbulanceMissionState::AmbulanceMissionState() } // FUNCTION: LEGO1 0x10037440 -MxResult AmbulanceMissionState::Serialize(LegoFile* p_legoFile) +MxResult AmbulanceMissionState::Serialize(LegoFile* p_file) { - LegoState::Serialize(p_legoFile); + LegoState::Serialize(p_file); - if (p_legoFile->IsReadMode()) { - p_legoFile->Read(&m_unk0x10, sizeof(m_unk0x10)); - p_legoFile->Read(&m_unk0x12, sizeof(m_unk0x12)); - p_legoFile->Read(&m_unk0x14, sizeof(m_unk0x14)); - p_legoFile->Read(&m_unk0x16, sizeof(m_unk0x16)); - p_legoFile->Read(&m_unk0x18, sizeof(m_unk0x18)); - p_legoFile->Read(&m_score1, sizeof(m_score1)); - p_legoFile->Read(&m_score2, sizeof(m_score2)); - p_legoFile->Read(&m_score3, sizeof(m_score3)); - p_legoFile->Read(&m_score4, sizeof(m_score4)); - p_legoFile->Read(&m_score5, sizeof(m_score5)); + if (p_file->IsReadMode()) { + p_file->Read(&m_unk0x10, sizeof(m_unk0x10)); + p_file->Read(&m_unk0x12, sizeof(m_unk0x12)); + p_file->Read(&m_unk0x14, sizeof(m_unk0x14)); + p_file->Read(&m_unk0x16, sizeof(m_unk0x16)); + p_file->Read(&m_unk0x18, sizeof(m_unk0x18)); + p_file->Read(&m_score1, sizeof(m_score1)); + p_file->Read(&m_score2, sizeof(m_score2)); + p_file->Read(&m_score3, sizeof(m_score3)); + p_file->Read(&m_score4, sizeof(m_score4)); + p_file->Read(&m_score5, sizeof(m_score5)); } - else if (p_legoFile->IsWriteMode()) { + else if (p_file->IsWriteMode()) { MxS16 write; write = m_unk0x10; - p_legoFile->Write(&write, sizeof(write)); + p_file->Write(&write, sizeof(write)); write = m_unk0x12; - p_legoFile->Write(&write, sizeof(write)); + p_file->Write(&write, sizeof(write)); write = m_unk0x14; - p_legoFile->Write(&write, sizeof(write)); + p_file->Write(&write, sizeof(write)); write = m_unk0x16; - p_legoFile->Write(&write, sizeof(write)); + p_file->Write(&write, sizeof(write)); write = m_unk0x18; - p_legoFile->Write(&write, sizeof(write)); + p_file->Write(&write, sizeof(write)); write = m_score1; - p_legoFile->Write(&write, sizeof(write)); + p_file->Write(&write, sizeof(write)); write = m_score2; - p_legoFile->Write(&write, sizeof(write)); + p_file->Write(&write, sizeof(write)); write = m_score3; - p_legoFile->Write(&write, sizeof(write)); + p_file->Write(&write, sizeof(write)); write = m_score4; - p_legoFile->Write(&write, sizeof(write)); + p_file->Write(&write, sizeof(write)); write = m_score5; - p_legoFile->Write(&write, sizeof(write)); + p_file->Write(&write, sizeof(write)); } return SUCCESS; diff --git a/LEGO1/lego/legoomni/src/actors/pizza.cpp b/LEGO1/lego/legoomni/src/actors/pizza.cpp index b998ff60..76588406 100644 --- a/LEGO1/lego/legoomni/src/actors/pizza.cpp +++ b/LEGO1/lego/legoomni/src/actors/pizza.cpp @@ -106,18 +106,18 @@ PizzaMissionState::PizzaMissionState() } // FUNCTION: LEGO1 0x100393c0 -MxResult PizzaMissionState::Serialize(LegoFile* p_legoFile) +MxResult PizzaMissionState::Serialize(LegoFile* p_file) { - LegoState::Serialize(p_legoFile); + LegoState::Serialize(p_file); - if (p_legoFile->IsReadMode()) { + if (p_file->IsReadMode()) { for (MxS16 i = 0; i < 5; i++) { - m_state[i].ReadFromFile(p_legoFile); + m_state[i].ReadFromFile(p_file); } } - else if (p_legoFile->IsWriteMode()) { + else if (p_file->IsWriteMode()) { for (MxS16 i = 0; i < 5; i++) { - m_state[i].WriteToFile(p_legoFile); + m_state[i].WriteToFile(p_file); } } diff --git a/LEGO1/lego/legoomni/src/actors/pizzeria.cpp b/LEGO1/lego/legoomni/src/actors/pizzeria.cpp index 6659c368..1b0525b1 100644 --- a/LEGO1/lego/legoomni/src/actors/pizzeria.cpp +++ b/LEGO1/lego/legoomni/src/actors/pizzeria.cpp @@ -77,17 +77,17 @@ MxU32 PizzeriaState::FUN_10017d70() } // FUNCTION: LEGO1 0x10017da0 -MxResult PizzeriaState::Serialize(LegoFile* p_legoFile) +MxResult PizzeriaState::Serialize(LegoFile* p_file) { - LegoState::Serialize(p_legoFile); - if (p_legoFile->IsReadMode()) { + LegoState::Serialize(p_file); + if (p_file->IsReadMode()) { for (MxS16 i = 0; i < 5; i++) { - m_unk0x08[i].ReadFromFile(p_legoFile); + m_unk0x08[i].ReadFromFile(p_file); } } else { for (MxS16 i = 0; i < 5; i++) { - m_unk0x08[i].WriteToFile(p_legoFile); + m_unk0x08[i].WriteToFile(p_file); } } diff --git a/LEGO1/lego/legoomni/src/actors/towtrack.cpp b/LEGO1/lego/legoomni/src/actors/towtrack.cpp index 1643230a..65899080 100644 --- a/LEGO1/lego/legoomni/src/actors/towtrack.cpp +++ b/LEGO1/lego/legoomni/src/actors/towtrack.cpp @@ -158,52 +158,52 @@ TowTrackMissionState::TowTrackMissionState() } // FUNCTION: LEGO1 0x1004dde0 -MxResult TowTrackMissionState::Serialize(LegoFile* p_legoFile) +MxResult TowTrackMissionState::Serialize(LegoFile* p_file) { - LegoState::Serialize(p_legoFile); + LegoState::Serialize(p_file); - if (p_legoFile->IsReadMode()) { - p_legoFile->Read(&m_unk0x12, sizeof(m_unk0x12)); - p_legoFile->Read(&m_unk0x14, sizeof(m_unk0x14)); - p_legoFile->Read(&m_unk0x16, sizeof(m_unk0x16)); - p_legoFile->Read(&m_unk0x18, sizeof(m_unk0x18)); - p_legoFile->Read(&m_unk0x1a, sizeof(m_unk0x1a)); - p_legoFile->Read(&m_score1, sizeof(m_score1)); - p_legoFile->Read(&m_score2, sizeof(m_score2)); - p_legoFile->Read(&m_score3, sizeof(m_score3)); - p_legoFile->Read(&m_score4, sizeof(m_score4)); - p_legoFile->Read(&m_score5, sizeof(m_score5)); + if (p_file->IsReadMode()) { + p_file->Read(&m_unk0x12, sizeof(m_unk0x12)); + p_file->Read(&m_unk0x14, sizeof(m_unk0x14)); + p_file->Read(&m_unk0x16, sizeof(m_unk0x16)); + p_file->Read(&m_unk0x18, sizeof(m_unk0x18)); + p_file->Read(&m_unk0x1a, sizeof(m_unk0x1a)); + p_file->Read(&m_score1, sizeof(m_score1)); + p_file->Read(&m_score2, sizeof(m_score2)); + p_file->Read(&m_score3, sizeof(m_score3)); + p_file->Read(&m_score4, sizeof(m_score4)); + p_file->Read(&m_score5, sizeof(m_score5)); } - else if (p_legoFile->IsWriteMode()) { + else if (p_file->IsWriteMode()) { MxU16 write = m_unk0x12; - p_legoFile->Write(&write, sizeof(m_unk0x12)); + p_file->Write(&write, sizeof(m_unk0x12)); write = m_unk0x14; - p_legoFile->Write(&write, sizeof(m_unk0x12)); + p_file->Write(&write, sizeof(m_unk0x12)); write = m_unk0x16; - p_legoFile->Write(&write, sizeof(m_unk0x12)); + p_file->Write(&write, sizeof(m_unk0x12)); write = m_unk0x18; - p_legoFile->Write(&write, sizeof(m_unk0x12)); + p_file->Write(&write, sizeof(m_unk0x12)); write = m_unk0x1a; - p_legoFile->Write(&write, sizeof(m_unk0x12)); + p_file->Write(&write, sizeof(m_unk0x12)); write = m_score1; - p_legoFile->Write(&write, sizeof(m_unk0x12)); + p_file->Write(&write, sizeof(m_unk0x12)); write = m_score2; - p_legoFile->Write(&write, sizeof(m_unk0x12)); + p_file->Write(&write, sizeof(m_unk0x12)); write = m_score3; - p_legoFile->Write(&write, sizeof(m_unk0x12)); + p_file->Write(&write, sizeof(m_unk0x12)); write = m_score4; - p_legoFile->Write(&write, sizeof(m_unk0x12)); + p_file->Write(&write, sizeof(m_unk0x12)); write = m_score5; - p_legoFile->Write(&write, sizeof(m_unk0x12)); + p_file->Write(&write, sizeof(m_unk0x12)); } return SUCCESS; diff --git a/LEGO1/lego/legoomni/src/build/legocarbuild.cpp b/LEGO1/lego/legoomni/src/build/legocarbuild.cpp index 68bdc755..6eb264cd 100644 --- a/LEGO1/lego/legoomni/src/build/legocarbuild.cpp +++ b/LEGO1/lego/legoomni/src/build/legocarbuild.cpp @@ -74,8 +74,8 @@ LegoVehicleBuildState::LegoVehicleBuildState(const char* p_classType) } // STUB: LEGO1 0x10026120 -MxResult LegoVehicleBuildState::Serialize(LegoFile* p_legoFile) +MxResult LegoVehicleBuildState::Serialize(LegoFile* p_file) { // TODO - return LegoState::Serialize(p_legoFile); + return LegoState::Serialize(p_file); } diff --git a/LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp b/LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp index dce362c3..2d85a646 100644 --- a/LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp +++ b/LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp @@ -2851,10 +2851,10 @@ void AnimState::FUN_10065240(MxU32, AnimInfo*, MxU32) } // STUB: LEGO1 0x100652d0 -MxResult AnimState::Serialize(LegoFile* p_legoFile) +MxResult AnimState::Serialize(LegoFile* p_file) { // TODO - return LegoState::Serialize(p_legoFile); + return LegoState::Serialize(p_file); } // STUB: LEGO1 0x100654f0 diff --git a/LEGO1/lego/legoomni/src/race/legorace.cpp b/LEGO1/lego/legoomni/src/race/legorace.cpp index 521a60cd..ccb6ceda 100644 --- a/LEGO1/lego/legoomni/src/race/legorace.cpp +++ b/LEGO1/lego/legoomni/src/race/legorace.cpp @@ -135,12 +135,12 @@ RaceState::RaceState() } // FUNCTION: LEGO1 0x10016140 -MxResult RaceState::Serialize(LegoFile* p_legoFile) +MxResult RaceState::Serialize(LegoFile* p_file) { - LegoState::Serialize(p_legoFile); + LegoState::Serialize(p_file); for (MxS16 i = 0; i < 5; i++) { - m_state[i].Serialize(p_legoFile); + m_state[i].Serialize(p_file); } return SUCCESS; diff --git a/LEGO1/lego/legoomni/src/worlds/gasstation.cpp b/LEGO1/lego/legoomni/src/worlds/gasstation.cpp index c20dde57..19998596 100644 --- a/LEGO1/lego/legoomni/src/worlds/gasstation.cpp +++ b/LEGO1/lego/legoomni/src/worlds/gasstation.cpp @@ -436,29 +436,29 @@ GasStationState::GasStationState() } // FUNCTION: LEGO1 0x10006300 -MxResult GasStationState::Serialize(LegoFile* p_legoFile) +MxResult GasStationState::Serialize(LegoFile* p_file) { - LegoState::Serialize(p_legoFile); + LegoState::Serialize(p_file); - if (p_legoFile->IsWriteMode()) { + if (p_file->IsWriteMode()) { MxS16 write; write = m_unk0x18; - p_legoFile->Write(&write, sizeof(write)); + p_file->Write(&write, sizeof(write)); write = m_unk0x1a; - p_legoFile->Write(&write, sizeof(write)); + p_file->Write(&write, sizeof(write)); write = m_unk0x1c; - p_legoFile->Write(&write, sizeof(write)); + p_file->Write(&write, sizeof(write)); write = m_unk0x1e; - p_legoFile->Write(&write, sizeof(write)); + p_file->Write(&write, sizeof(write)); write = m_unk0x20; - p_legoFile->Write(&write, sizeof(write)); + p_file->Write(&write, sizeof(write)); } - else if (p_legoFile->IsReadMode()) { - p_legoFile->Read(&m_unk0x18, sizeof(m_unk0x18)); - p_legoFile->Read(&m_unk0x1a, sizeof(m_unk0x1a)); - p_legoFile->Read(&m_unk0x1c, sizeof(m_unk0x1c)); - p_legoFile->Read(&m_unk0x1e, sizeof(m_unk0x1e)); - p_legoFile->Read(&m_unk0x20, sizeof(m_unk0x20)); + else if (p_file->IsReadMode()) { + p_file->Read(&m_unk0x18, sizeof(m_unk0x18)); + p_file->Read(&m_unk0x1a, sizeof(m_unk0x1a)); + p_file->Read(&m_unk0x1c, sizeof(m_unk0x1c)); + p_file->Read(&m_unk0x1e, sizeof(m_unk0x1e)); + p_file->Read(&m_unk0x20, sizeof(m_unk0x20)); } return SUCCESS; diff --git a/LEGO1/lego/legoomni/src/worlds/hospital.cpp b/LEGO1/lego/legoomni/src/worlds/hospital.cpp index 47b6beed..9668a06e 100644 --- a/LEGO1/lego/legoomni/src/worlds/hospital.cpp +++ b/LEGO1/lego/legoomni/src/worlds/hospital.cpp @@ -684,33 +684,33 @@ HospitalState::HospitalState() } // FUNCTION: LEGO1 0x10076530 -MxResult HospitalState::Serialize(LegoFile* p_legoFile) +MxResult HospitalState::Serialize(LegoFile* p_file) { - LegoState::Serialize(p_legoFile); + LegoState::Serialize(p_file); - if (p_legoFile->IsWriteMode()) { + if (p_file->IsWriteMode()) { MxS16 write; write = m_unk0x0c; - p_legoFile->Write(&write, sizeof(m_unk0x0c)); + p_file->Write(&write, sizeof(m_unk0x0c)); write = m_unk0x0e; - p_legoFile->Write(&write, sizeof(m_unk0x0e)); + p_file->Write(&write, sizeof(m_unk0x0e)); write = m_unk0x10; - p_legoFile->Write(&write, sizeof(m_unk0x10)); + p_file->Write(&write, sizeof(m_unk0x10)); write = m_unk0x12; - p_legoFile->Write(&write, sizeof(m_unk0x12)); + p_file->Write(&write, sizeof(m_unk0x12)); write = m_unk0x14; - p_legoFile->Write(&write, sizeof(m_unk0x14)); + p_file->Write(&write, sizeof(m_unk0x14)); write = m_unk0x16; - p_legoFile->Write(&write, sizeof(m_unk0x16)); + p_file->Write(&write, sizeof(m_unk0x16)); } - else if (p_legoFile->IsReadMode()) { - p_legoFile->Read(&m_unk0x0c, sizeof(m_unk0x0c)); - p_legoFile->Read(&m_unk0x0e, sizeof(m_unk0x0e)); - p_legoFile->Read(&m_unk0x10, sizeof(m_unk0x10)); - p_legoFile->Read(&m_unk0x12, sizeof(m_unk0x12)); - p_legoFile->Read(&m_unk0x14, sizeof(m_unk0x14)); - p_legoFile->Read(&m_unk0x16, sizeof(m_unk0x16)); + else if (p_file->IsReadMode()) { + p_file->Read(&m_unk0x0c, sizeof(m_unk0x0c)); + p_file->Read(&m_unk0x0e, sizeof(m_unk0x0e)); + p_file->Read(&m_unk0x10, sizeof(m_unk0x10)); + p_file->Read(&m_unk0x12, sizeof(m_unk0x12)); + p_file->Read(&m_unk0x14, sizeof(m_unk0x14)); + p_file->Read(&m_unk0x16, sizeof(m_unk0x16)); } return SUCCESS; diff --git a/LEGO1/lego/legoomni/src/worlds/isle.cpp b/LEGO1/lego/legoomni/src/worlds/isle.cpp index d6a066fc..0a62ab1b 100644 --- a/LEGO1/lego/legoomni/src/worlds/isle.cpp +++ b/LEGO1/lego/legoomni/src/worlds/isle.cpp @@ -1314,138 +1314,138 @@ Act1State::Act1State() : m_unk0x00c(0), m_unk0x00e(0), m_unk0x008(NULL), m_unk0x } // FUNCTION: LEGO1 0x10033ac0 -MxResult Act1State::Serialize(LegoFile* p_legoFile) +MxResult Act1State::Serialize(LegoFile* p_file) { - LegoState::Serialize(p_legoFile); + LegoState::Serialize(p_file); - m_unk0x024.Serialize(p_legoFile); - m_unk0x070.Serialize(p_legoFile); - m_unk0x0bc.Serialize(p_legoFile); - m_unk0x108.Serialize(p_legoFile); - m_unk0x164.Serialize(p_legoFile); - m_unk0x1bc.Serialize(p_legoFile); - m_unk0x210.Serialize(p_legoFile); + m_unk0x024.Serialize(p_file); + m_unk0x070.Serialize(p_file); + m_unk0x0bc.Serialize(p_file); + m_unk0x108.Serialize(p_file); + m_unk0x164.Serialize(p_file); + m_unk0x1bc.Serialize(p_file); + m_unk0x210.Serialize(p_file); - if (p_legoFile->IsWriteMode()) { + if (p_file->IsWriteMode()) { if (m_unk0x108.GetName()->Compare("") != 0) { if (m_unk0x154) { - WriteNamedTexture(p_legoFile, m_unk0x154); + WriteNamedTexture(p_file, m_unk0x154); } else { - FUN_1003f540(p_legoFile, "chwind.gif"); + FUN_1003f540(p_file, "chwind.gif"); } if (m_unk0x158) { - WriteNamedTexture(p_legoFile, m_unk0x158); + WriteNamedTexture(p_file, m_unk0x158); } else { - FUN_1003f540(p_legoFile, "chjetl.gif"); + FUN_1003f540(p_file, "chjetl.gif"); } if (m_unk0x15c) { - WriteNamedTexture(p_legoFile, m_unk0x15c); + WriteNamedTexture(p_file, m_unk0x15c); } else { - FUN_1003f540(p_legoFile, "chjetr.gif"); + FUN_1003f540(p_file, "chjetr.gif"); } } if (m_unk0x164.GetName()->Compare("") != 0) { if (m_unk0x1b0) { - WriteNamedTexture(p_legoFile, m_unk0x1b0); + WriteNamedTexture(p_file, m_unk0x1b0); } else { - FUN_1003f540(p_legoFile, "jsfrnt.gif"); + FUN_1003f540(p_file, "jsfrnt.gif"); } if (m_unk0x1b4) { - WriteNamedTexture(p_legoFile, m_unk0x1b4); + WriteNamedTexture(p_file, m_unk0x1b4); } else { - FUN_1003f540(p_legoFile, "jswnsh.gif"); + FUN_1003f540(p_file, "jswnsh.gif"); } } if (m_unk0x1bc.GetName()->Compare("") != 0) { if (m_unk0x208) { - WriteNamedTexture(p_legoFile, m_unk0x208); + WriteNamedTexture(p_file, m_unk0x208); } else { - FUN_1003f540(p_legoFile, "dbfrfn.gif"); + FUN_1003f540(p_file, "dbfrfn.gif"); } } if (m_unk0x210.GetName()->Compare("") != 0) { if (m_unk0x25c) { - WriteNamedTexture(p_legoFile, m_unk0x25c); + WriteNamedTexture(p_file, m_unk0x25c); } else { - FUN_1003f540(p_legoFile, "rcfrnt.gif"); + FUN_1003f540(p_file, "rcfrnt.gif"); } if (m_unk0x260) { - WriteNamedTexture(p_legoFile, m_unk0x260); + WriteNamedTexture(p_file, m_unk0x260); } else { - FUN_1003f540(p_legoFile, "rcback.gif"); + FUN_1003f540(p_file, "rcback.gif"); } if (m_unk0x264) { - WriteNamedTexture(p_legoFile, m_unk0x264); + WriteNamedTexture(p_file, m_unk0x264); } else { - FUN_1003f540(p_legoFile, "rctail.gif"); + FUN_1003f540(p_file, "rctail.gif"); } } - p_legoFile->Write(&m_unk0x010, sizeof(m_unk0x010)); - p_legoFile->Write(&m_unk0x022, sizeof(m_unk0x022)); + p_file->Write(&m_unk0x010, sizeof(m_unk0x010)); + p_file->Write(&m_unk0x022, sizeof(m_unk0x022)); } - else if (p_legoFile->IsReadMode()) { + else if (p_file->IsReadMode()) { if (m_unk0x108.GetName()->Compare("") != 0) { - m_unk0x154 = ReadNamedTexture(p_legoFile); + m_unk0x154 = ReadNamedTexture(p_file); if (m_unk0x154 == NULL) { return FAILURE; } - m_unk0x158 = ReadNamedTexture(p_legoFile); + m_unk0x158 = ReadNamedTexture(p_file); if (m_unk0x158 == NULL) { return FAILURE; } - m_unk0x15c = ReadNamedTexture(p_legoFile); + m_unk0x15c = ReadNamedTexture(p_file); if (m_unk0x15c == NULL) { return FAILURE; } } if (m_unk0x164.GetName()->Compare("") != 0) { - m_unk0x1b0 = ReadNamedTexture(p_legoFile); + m_unk0x1b0 = ReadNamedTexture(p_file); if (m_unk0x1b0 == NULL) { return FAILURE; } - m_unk0x1b4 = ReadNamedTexture(p_legoFile); + m_unk0x1b4 = ReadNamedTexture(p_file); if (m_unk0x1b4 == NULL) { return FAILURE; } } if (m_unk0x1bc.GetName()->Compare("") != 0) { - m_unk0x208 = ReadNamedTexture(p_legoFile); + m_unk0x208 = ReadNamedTexture(p_file); if (m_unk0x208 == NULL) { return FAILURE; } } if (m_unk0x210.GetName()->Compare("") != 0) { - m_unk0x25c = ReadNamedTexture(p_legoFile); + m_unk0x25c = ReadNamedTexture(p_file); if (m_unk0x25c == NULL) { return FAILURE; } - m_unk0x260 = ReadNamedTexture(p_legoFile); + m_unk0x260 = ReadNamedTexture(p_file); if (m_unk0x260 == NULL) { return FAILURE; } - m_unk0x264 = ReadNamedTexture(p_legoFile); + m_unk0x264 = ReadNamedTexture(p_file); if (m_unk0x264 == NULL) { return FAILURE; } } - p_legoFile->Read(&m_unk0x010, sizeof(m_unk0x010)); - p_legoFile->Read(&m_unk0x022, sizeof(m_unk0x022)); + p_file->Read(&m_unk0x010, sizeof(m_unk0x010)); + p_file->Read(&m_unk0x022, sizeof(m_unk0x022)); } // TODO diff --git a/LEGO1/lego/legoomni/src/worlds/police.cpp b/LEGO1/lego/legoomni/src/worlds/police.cpp index 66422959..788ac80e 100644 --- a/LEGO1/lego/legoomni/src/worlds/police.cpp +++ b/LEGO1/lego/legoomni/src/worlds/police.cpp @@ -206,16 +206,16 @@ PoliceState::PoliceState() } // FUNCTION: LEGO1 0x1005e990 -MxResult PoliceState::Serialize(LegoFile* p_legoFile) +MxResult PoliceState::Serialize(LegoFile* p_file) { - LegoState::Serialize(p_legoFile); + LegoState::Serialize(p_file); - if (p_legoFile->IsReadMode()) { - p_legoFile->Read(&m_policeScript, sizeof(m_policeScript)); + if (p_file->IsReadMode()) { + p_file->Read(&m_policeScript, sizeof(m_policeScript)); } else { PoliceScript::Script policeScript = m_policeScript; - p_legoFile->Write(&policeScript, sizeof(m_policeScript)); + p_file->Write(&policeScript, sizeof(m_policeScript)); } return SUCCESS;