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

Order functions in Act1State

Browse Source
This commit is contained in:
Christian Semmler 2025-01-16 17:24:35 -07:00
parent 70b0f76fa1
commit 8108eac88c
5 changed files with 43 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
LEGO1/lego/legoomni/include/legonamedplane.h
View File

@ -6,8 +6,7 @@
#include "mxstring.h" #include "mxstring.h"
// SIZE 0x4c // SIZE 0x4c
class LegoNamedPlane { struct LegoNamedPlane {
public:
// FUNCTION: LEGO1 0x10033800 // FUNCTION: LEGO1 0x10033800
LegoNamedPlane() {} LegoNamedPlane() {}
@ -26,7 +25,6 @@ class LegoNamedPlane {
// TODO: Unclear whether this was defined // TODO: Unclear whether this was defined
MxBool IsPresent() { return strcmp(m_name.GetData(), "") != 0; } MxBool IsPresent() { return strcmp(m_name.GetData(), "") != 0; }
void Reset() { m_name = ""; }
// FUNCTION: LEGO1 0x100344d0 // FUNCTION: LEGO1 0x100344d0
MxResult Serialize(LegoStorage* p_storage) MxResult Serialize(LegoStorage* p_storage)
@ -47,7 +45,6 @@ class LegoNamedPlane {
return SUCCESS; return SUCCESS;
} }
// private:
MxString m_name; // 0x00 MxString m_name; // 0x00
Mx3DPointFloat m_position; // 0x10 Mx3DPointFloat m_position; // 0x10
Mx3DPointFloat m_direction; // 0x24 Mx3DPointFloat m_direction; // 0x24

2
LEGO1/lego/legoomni/include/legopathactor.h
View File

@ -6,7 +6,7 @@
#include "mxtypes.h" #include "mxtypes.h"
struct LegoEdge; struct LegoEdge;
class LegoNamedPlane; struct LegoNamedPlane;
class LegoPathBoundary; class LegoPathBoundary;
class LegoPathController; class LegoPathController;
struct LegoPathEdgeContainer; struct LegoPathEdgeContainer;

8
LEGO1/lego/legoomni/src/build/legocarbuild.cpp
View File

@ -1165,7 +1165,7 @@ undefined4 LegoCarBuild::FUN_10024c20(LegoEventNotificationParam* p_param)
} }
gameState->m_helicopter = (Helicopter*) entity; gameState->m_helicopter = (Helicopter*) entity;
gameState->m_helicopterPlane.Reset(); gameState->m_helicopterPlane.m_name = "";
break; break;
case LegoGameState::e_dunecarbuild: case LegoGameState::e_dunecarbuild:
if (gameState->m_dunebuggy) { if (gameState->m_dunebuggy) {
@ -1173,7 +1173,7 @@ undefined4 LegoCarBuild::FUN_10024c20(LegoEventNotificationParam* p_param)
} }
gameState->m_dunebuggy = (DuneBuggy*) entity; gameState->m_dunebuggy = (DuneBuggy*) entity;
gameState->m_dunebuggyPlane.Reset(); gameState->m_dunebuggyPlane.m_name = "";
break; break;
case LegoGameState::e_jetskibuild: case LegoGameState::e_jetskibuild:
if (gameState->m_jetski) { if (gameState->m_jetski) {
@ -1181,7 +1181,7 @@ undefined4 LegoCarBuild::FUN_10024c20(LegoEventNotificationParam* p_param)
} }
gameState->m_jetski = (Jetski*) entity; gameState->m_jetski = (Jetski*) entity;
gameState->m_jetskiPlane.Reset(); gameState->m_jetskiPlane.m_name = "";
break; break;
case LegoGameState::e_racecarbuild: case LegoGameState::e_racecarbuild:
if (gameState->m_racecar) { if (gameState->m_racecar) {
@ -1189,7 +1189,7 @@ undefined4 LegoCarBuild::FUN_10024c20(LegoEventNotificationParam* p_param)
} }
gameState->m_racecar = (RaceCar*) entity; gameState->m_racecar = (RaceCar*) entity;
gameState->m_racecarPlane.Reset(); gameState->m_racecarPlane.m_name = "";
break; break;
} }

36
LEGO1/lego/legoomni/src/worlds/isle.cpp
View File

@ -1487,12 +1487,12 @@ void Act1State::StopCptClickDialogue()
// FUNCTION: LEGO1 0x100346d0 // FUNCTION: LEGO1 0x100346d0
MxBool Act1State::Reset() MxBool Act1State::Reset()
{ {
m_motocyclePlane.Reset(); m_motocyclePlane.m_name = "";
m_bikePlane.Reset(); m_bikePlane.m_name = "";
m_skateboardPlane.Reset(); m_skateboardPlane.m_name = "";
m_unk0x022 = FALSE; m_unk0x022 = FALSE;
m_helicopterPlane.Reset(); m_helicopterPlane.m_name = "";
if (m_helicopterWindshield) { if (m_helicopterWindshield) {
delete m_helicopterWindshield; delete m_helicopterWindshield;
m_helicopterWindshield = NULL; m_helicopterWindshield = NULL;
@ -1513,7 +1513,7 @@ MxBool Act1State::Reset()
m_helicopter = NULL; m_helicopter = NULL;
} }
m_jetskiPlane.Reset(); m_jetskiPlane.m_name = "";
if (m_jetskiFront) { if (m_jetskiFront) {
delete m_jetskiFront; delete m_jetskiFront;
m_jetskiFront = NULL; m_jetskiFront = NULL;
@ -1529,7 +1529,7 @@ MxBool Act1State::Reset()
m_jetski = NULL; m_jetski = NULL;
} }
m_dunebuggyPlane.Reset(); m_dunebuggyPlane.m_name = "";
if (m_dunebuggyFront) { if (m_dunebuggyFront) {
delete m_dunebuggyFront; delete m_dunebuggyFront;
m_dunebuggyFront = NULL; m_dunebuggyFront = NULL;
@ -1540,7 +1540,7 @@ MxBool Act1State::Reset()
m_dunebuggy = NULL; m_dunebuggy = NULL;
} }
m_racecarPlane.Reset(); m_racecarPlane.m_name = "";
if (m_racecarFront) { if (m_racecarFront) {
delete m_racecarFront; delete m_racecarFront;
m_racecarFront = NULL; m_racecarFront = NULL;
@ -1615,21 +1615,21 @@ void Act1State::PlaceActors()
{ {
Isle* isle = (Isle*) FindWorld(*g_isleScript, IsleScript::c__Isle); Isle* isle = (Isle*) FindWorld(*g_isleScript, IsleScript::c__Isle);
if (m_motocyclePlane.IsPresent()) { if (strcmp(m_motocyclePlane.m_name.GetData(), "")) {
isle->m_motocycle->PlaceActor(m_motocyclePlane); isle->m_motocycle->PlaceActor(m_motocyclePlane);
} }
else { else {
isle->PlaceActor(isle->m_motocycle, "INT43", 4, 0.5f, 1, 0.5f); isle->PlaceActor(isle->m_motocycle, "INT43", 4, 0.5f, 1, 0.5f);
} }
if (m_bikePlane.IsPresent()) { if (strcmp(m_bikePlane.m_name.GetData(), "")) {
isle->m_bike->PlaceActor(m_bikePlane); isle->m_bike->PlaceActor(m_bikePlane);
} }
else { else {
isle->PlaceActor(isle->m_bike, "INT44", 2, 0.5f, 0, 0.5f); isle->PlaceActor(isle->m_bike, "INT44", 2, 0.5f, 0, 0.5f);
} }
if (m_skateboardPlane.IsPresent()) { if (strcmp(m_skateboardPlane.m_name.GetData(), "")) {
isle->m_skateboard->PlaceActor(m_skateboardPlane); isle->m_skateboard->PlaceActor(m_skateboardPlane);
} }
else { else {
@ -1637,7 +1637,7 @@ void Act1State::PlaceActors()
} }
if (m_helicopter != NULL) { if (m_helicopter != NULL) {
if (!m_helicopterPlane.IsPresent()) { if (!strcmp(m_helicopterPlane.m_name.GetData(), "")) {
m_helicopter->SpawnPlayer(LegoGameState::e_unk40, FALSE, 0); m_helicopter->SpawnPlayer(LegoGameState::e_unk40, FALSE, 0);
} }
else { else {
@ -1654,7 +1654,7 @@ void Act1State::PlaceActors()
GetViewManager()->Add(m_helicopter->GetROI()); GetViewManager()->Add(m_helicopter->GetROI());
m_helicopter->GetROI()->SetVisibility(TRUE); m_helicopter->GetROI()->SetVisibility(TRUE);
m_helicopterPlane.Reset(); m_helicopterPlane.m_name = "";
m_helicopter = NULL; m_helicopter = NULL;
if (m_helicopterWindshield != NULL) { if (m_helicopterWindshield != NULL) {
@ -1677,7 +1677,7 @@ void Act1State::PlaceActors()
} }
if (m_jetski != NULL) { if (m_jetski != NULL) {
if (!m_jetskiPlane.IsPresent()) { if (!strcmp(m_jetskiPlane.m_name.GetData(), "")) {
m_jetski->SpawnPlayer(LegoGameState::e_unk45, FALSE, 0); m_jetski->SpawnPlayer(LegoGameState::e_unk45, FALSE, 0);
} }
else { else {
@ -1690,7 +1690,7 @@ void Act1State::PlaceActors()
GetViewManager()->Add(m_jetski->GetROI()); GetViewManager()->Add(m_jetski->GetROI());
m_jetski->GetROI()->SetVisibility(TRUE); m_jetski->GetROI()->SetVisibility(TRUE);
m_jetskiPlane.Reset(); m_jetskiPlane.m_name = "";
m_jetski = NULL; m_jetski = NULL;
if (m_jetskiFront != NULL) { if (m_jetskiFront != NULL) {
@ -1707,7 +1707,7 @@ void Act1State::PlaceActors()
} }
if (m_dunebuggy != NULL) { if (m_dunebuggy != NULL) {
if (!m_dunebuggyPlane.IsPresent()) { if (!strcmp(m_dunebuggyPlane.m_name.GetData(), "")) {
m_dunebuggy->SpawnPlayer(LegoGameState::e_unk43, FALSE, 0); m_dunebuggy->SpawnPlayer(LegoGameState::e_unk43, FALSE, 0);
} }
else { else {
@ -1724,7 +1724,7 @@ void Act1State::PlaceActors()
GetViewManager()->Add(m_dunebuggy->GetROI()); GetViewManager()->Add(m_dunebuggy->GetROI());
m_dunebuggy->GetROI()->SetVisibility(TRUE); m_dunebuggy->GetROI()->SetVisibility(TRUE);
m_dunebuggyPlane.Reset(); m_dunebuggyPlane.m_name = "";
m_dunebuggy = NULL; m_dunebuggy = NULL;
if (m_dunebuggyFront != NULL) { if (m_dunebuggyFront != NULL) {
@ -1735,7 +1735,7 @@ void Act1State::PlaceActors()
} }
if (m_racecar != NULL) { if (m_racecar != NULL) {
if (!m_racecarPlane.IsPresent()) { if (!strcmp(m_racecarPlane.m_name.GetData(), "")) {
m_racecar->SpawnPlayer(LegoGameState::e_unk44, FALSE, 0); m_racecar->SpawnPlayer(LegoGameState::e_unk44, FALSE, 0);
} }
else { else {
@ -1752,7 +1752,7 @@ void Act1State::PlaceActors()
GetViewManager()->Add(m_racecar->GetROI()); GetViewManager()->Add(m_racecar->GetROI());
m_racecar->GetROI()->SetVisibility(TRUE); m_racecar->GetROI()->SetVisibility(TRUE);
m_racecarPlane.Reset(); m_racecarPlane.m_name = "";
m_racecar = NULL; m_racecar = NULL;
if (m_racecarFront != NULL) { if (m_racecarFront != NULL) {

38
LEGO1/lego/sources/misc/legostorage.h
View File

@ -33,14 +33,6 @@ class LegoStorage {
// FUNCTION: LEGO1 0x10045af0 // FUNCTION: LEGO1 0x10045af0
virtual LegoBool IsReadMode() { return m_mode == c_read; } // vtable+0x18 virtual LegoBool IsReadMode() { return m_mode == c_read; } // vtable+0x18
// FUNCTION: LEGO1 0x10006030
// FUNCTION: BETA10 0x10017bb0
LegoStorage* WriteMxString(MxString p_data)
{
WriteString(p_data.GetData());
return this;
}
// FUNCTION: BETA10 0x10017c80 // FUNCTION: BETA10 0x10017c80
LegoStorage* WriteString(const char* p_data) LegoStorage* WriteString(const char* p_data)
{ {
@ -102,18 +94,11 @@ class LegoStorage {
return this; return this;
} }
// FUNCTION: LEGO1 0x10034470 // FUNCTION: LEGO1 0x10006030
LegoStorage* ReadMxString(MxString& p_data) // FUNCTION: BETA10 0x10017bb0
LegoStorage* WriteMxString(MxString p_data)
{ {
LegoS16 length; WriteString(p_data.GetData());
ReadS16(length);
char* text = new char[length + 1];
Read(text, length);
text[length] = '\0';
p_data = text;
delete[] text;
return this; return this;
} }
@ -178,6 +163,21 @@ class LegoStorage {
return this; return this;
} }
// FUNCTION: LEGO1 0x10034470
LegoStorage* ReadMxString(MxString& p_data)
{
LegoS16 length;
ReadS16(length);
char* text = new char[length + 1];
Read(text, length);
text[length] = '\0';
p_data = text;
delete[] text;
return this;
}
// SYNTHETIC: LEGO1 0x10045b00 // SYNTHETIC: LEGO1 0x10045b00
// LegoStorage::`scalar deleting destructor' // LegoStorage::`scalar deleting destructor'