Implement/match Act3::GoodEnding (#1218)

This commit is contained in:
Christian Semmler
2024-12-13 10:49:45 -07:00
committed by GitHub
parent de7bc813ca
commit 263d7d1e4f
11 changed files with 120 additions and 21 deletions

View File

@@ -125,8 +125,7 @@ public:
void SetBrickster(Act3Brickster* p_brickster);
void FUN_10073400();
void FUN_10073430();
void GoodEnding(const Matrix4& p_matrix);
static void DebugPrintf(const char* p_format, ...);
void GoodEnding(const Matrix4& p_destination);
// BETA indicates that the actors access certain members directly.
friend class Act3Brickster;
@@ -136,6 +135,15 @@ public:
protected:
MxLong HandleTransitionEnd();
static void DebugPrintf(const char* p_format, ...);
static void DebugCopter(
const Matrix4& p_copter,
const Matrix4& p_destination,
const Matrix4& p_startPosition,
const Matrix4& p_endPosition,
const UnknownMx4DPointFloat& p_unk0x1f4
);
Act3State* m_state; // 0xf8
Act3Ammo m_pizzas[MAX_PIZZAS]; // 0xfc
Act3Ammo m_donuts[MAX_DONUTS]; // 0x217c

View File

@@ -76,6 +76,7 @@ public:
void Exit() override; // vtable+0xe4
void CreateState();
void FUN_10004640(const Matrix4& p_matrix);
// SYNTHETIC: LEGO1 0x10003210
// Helicopter::`scalar deleting destructor'
@@ -84,6 +85,8 @@ public:
friend class Act3;
protected:
void FUN_100042a0(const Matrix4& p_matrix);
MxMatrix m_unk0x160; // 0x160
MxMatrix m_unk0x1a8; // 0x1a8
float m_unk0x1f0; // 0x1f0

View File

@@ -24,7 +24,7 @@ class LegoPathActor : public LegoActor {
public:
enum {
c_bit2 = 0x02,
c_bit3 = 0x04,
c_disable = 0x04,
c_bit9 = 0x100
};