isledecomp/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2024-12-18 03:43:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Implement/match LegoAct2::BadEnding (#1217)

Browse source 
* Implement/match `LegoAct2::BadEnding`

* Name some vars
This commit is contained in:
Christian Semmler 2024-12-13 09:26:06 -07:00 committed by GitHub
parent 32392a8e55
commit de7bc813ca
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 41 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
LEGO1/lego/legoomni/include/act2actor.h
View file

@ -10,11 +10,11 @@
// SIZE 0x1a8
class Act2Actor : public LegoAnimActor {
public:
struct UnknownListStructure {
struct Location {
MxFloat m_position[3]; // 0x00
MxFloat m_direction[3]; // 0x0c
const char* m_boundary; // 0x18
undefined m_unk0x1c; // 0x1c
MxBool m_unk0x1c; // 0x1c
};
Act2Actor();
@ -31,9 +31,9 @@ class Act2Actor : public LegoAnimActor {
void FUN_10019250(MxFloat p_speed, MxFloat p_param2);
void FUN_10019520();
void FUN_10019560();
undefined4 FUN_10019700(MxFloat p_param);
MxU32 FUN_10019700(MxFloat p_param);
void FUN_100199f0(MxS8 p_param);
void FUN_100192a0(undefined4 p_param);
void FUN_100192a0(undefined4 p_location);
LegoEntity* FUN_10019b90(undefined* p_param);
// SYNTHETIC: LEGO1 0x1001a0a0

7
LEGO1/lego/legoomni/include/legoact2.h
View file

@ -40,9 +40,12 @@ class LegoAct2State : public LegoState {
// SYNTHETIC: LEGO1 0x1000e040
// LegoAct2State::`scalar deleting destructor'
// FUNCTION: BETA10 0x100151b0
void SetUnknown0x08(undefined4 p_unk0x08) { m_unk0x08 = p_unk0x08; }
undefined4 GetUnknown0x08() { return m_unk0x08; }
// TODO: Most likely getters/setters are not used according to BETA.
// TODO: Most likely getters/setters are not used according to BETA. (?)
undefined4 m_unk0x08; // 0x08
MxBool m_enabled; // 0x0c
@ -70,7 +73,7 @@ class LegoAct2 : public LegoWorld {
MxResult FUN_100516b0();
void FUN_100517b0();
undefined4 FUN_10051f20();
MxResult BadEnding();
MxResult FUN_10052560(
Act2mainScript::Script p_objectId,
MxBool p_param2,

30
LEGO1/lego/legoomni/src/actors/act2actor.cpp
View file

@ -20,11 +20,11 @@
#include <vec.h>
DECOMP_SIZE_ASSERT(Act2Actor, 0x1a8)
DECOMP_SIZE_ASSERT(Act2Actor::UnknownListStructure, 0x20)
DECOMP_SIZE_ASSERT(Act2Actor::Location, 0x20)
// GLOBAL: LEGO1 0x100f0db8
// GLOBAL: BETA10 0x101dbd00
Act2Actor::UnknownListStructure g_unk0x100f0db8[] = {
Act2Actor::Location g_brickstrLocations[] = {
{{-47.92, 7.0699968, -31.58}, {-0.999664, 0.0, -0.025916}, "edg01_27", FALSE},
{{-70.393349, 8.07, 3.151935}, {-0.90653503, 0.0, 0.422131}, "int06", FALSE},
{{-47.74, 4.079995, -52.3}, {-0.98293, 0.0, -0.18398}, "edg01_08", FALSE},
@ -87,7 +87,7 @@ Act2Actor::Act2Actor()
// Odd: The code says < 10, but there are 11 entries in the array
for (MxS32 i = 0; i < 10; i++) {
g_unk0x100f0db8[i].m_unk0x1c = 0;
g_brickstrLocations[i].m_unk0x1c = FALSE;
}
}
@ -221,7 +221,7 @@ void Act2Actor::VTable0x70(float p_time)
m_unk0x30 = m_unk0x2c - 1300.0f;
}
if (FUN_10019700(p_time) == 1) {
if (FUN_10019700(p_time) == TRUE) {
return;
}
}
@ -345,7 +345,7 @@ void Act2Actor::SetWorldSpeed(MxFloat p_worldSpeed)
// FUNCTION: LEGO1 0x100192a0
// FUNCTION: BETA10 0x1000d4d6
void Act2Actor::FUN_100192a0(undefined4 p_param)
void Act2Actor::FUN_100192a0(undefined4 p_location)
{
Mx3DPointFloat newPosition(0.0, 0.0, 0.0);
Mx3DPointFloat newDirection(0.0, 0.0, 0.0);
@ -357,9 +357,9 @@ void Act2Actor::FUN_100192a0(undefined4 p_param)
m_grec = new LegoPathEdgeContainer();
assert(m_grec);
newPosition = g_unk0x100f0db8[p_param].m_position;
newDirection = g_unk0x100f0db8[p_param].m_direction;
LegoPathBoundary* newBoundary = m_pathController->GetPathBoundary(g_unk0x100f0db8[p_param].m_boundary);
newPosition = g_brickstrLocations[p_location].m_position;
newDirection = g_brickstrLocations[p_location].m_direction;
LegoPathBoundary* newBoundary = m_pathController->GetPathBoundary(g_brickstrLocations[p_location].m_boundary);
MxResult sts = m_pathController->FUN_10048310(
m_grec,
@ -487,8 +487,8 @@ MxS32 Act2Actor::VTable0xa0()
undefined4 firstChoice = newLocation;
if (m_unk0x48 < 7 || g_unk0x100f0db8[m_unk0x1d].m_unk0x1c) {
while (g_unk0x100f0db8[newLocation].m_unk0x1c || m_unk0x1d == newLocation) {
if (m_unk0x48 < 7 || g_brickstrLocations[m_unk0x1d].m_unk0x1c) {
while (g_brickstrLocations[newLocation].m_unk0x1c || m_unk0x1d == newLocation) {
if (newLocation == 7) {
newLocation = 0;
}
@ -513,7 +513,7 @@ MxS32 Act2Actor::VTable0xa0()
// FUNCTION: LEGO1 0x10019700
// FUNCTION: BETA10 0x1000dd27
undefined4 Act2Actor::FUN_10019700(MxFloat p_param)
MxU32 Act2Actor::FUN_10019700(MxFloat p_param)
{
if (!m_unk0x4c) {
g_unk0x100f0f20 = FALSE;
@ -527,10 +527,10 @@ undefined4 Act2Actor::FUN_10019700(MxFloat p_param)
m_unk0x1e = 1;
if (m_unk0x1d == 8) {
((LegoAct2*) CurrentWorld())->FUN_10051f20();
((LegoAct2*) CurrentWorld())->BadEnding();
}
return 1;
return TRUE;
}
if (!g_unk0x100f0f28 && m_unk0x30 < p_param) {
@ -553,7 +553,7 @@ undefined4 Act2Actor::FUN_10019700(MxFloat p_param)
m_unk0x30 = m_unk0x2c - 1300.0f;
g_unk0x100f0f24 = FALSE;
g_unk0x100f0f28 = FALSE;
return 0;
return FALSE;
}
m_lastTime = p_param;
@ -585,7 +585,7 @@ undefined4 Act2Actor::FUN_10019700(MxFloat p_param)
LegoROI::FUN_100a8e80(root->GetChild(i), matrix, time, m_shootAnim->GetROIMap());
}
return 0;
return FALSE;
}
// FUNCTION: LEGO1 0x100199f0

22
LEGO1/lego/legoomni/src/worlds/legoact2.cpp
View file

@ -928,12 +928,24 @@ void LegoAct2::SpawnBricks()
m_nextBrick++;
}
// STUB: LEGO1 0x10051f20
// STUB: BETA10 0x10013f48
undefined4 LegoAct2::FUN_10051f20()
// FUNCTION: LEGO1 0x10051f20
// FUNCTION: BETA10 0x10013f48
MxResult LegoAct2::BadEnding()
{
// TODO
return 0;
for (MxS32 i = 0; i < (MxS32) sizeOfArray(m_bricks); i++) {
m_bricks[i].Remove();
}
LegoPathActor* actor = m_unk0x1138;
actor->SetState(LegoPathActor::c_bit3);
m_gameState->SetUnknown0x08(104);
m_destLocation = LegoGameState::e_infomain;
TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, FALSE);
MxTrace("Bad End of Act2\n");
m_unk0x10c4 = 14;
return SUCCESS;
}
// FUNCTION: LEGO1 0x10051fa0