mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-26 18:04:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement/match Act3Brickster::FUN_100417c0 (#1240)

Browse Source 
* Implement/match `Act3Brickster::FUN_100417c0`

* Move function

* Rename var

* Revert "Rename var"

This reverts commit c9ca75ae7f.
This commit is contained in:
Christian Semmler
2024-12-19 12:22:34 -07:00
committed by GitHub
parent 18fc084a3f
commit cb38cf7673
9 changed files with 277 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
LEGO1/lego/legoomni/include/act3.h
View File

@@ -130,6 +130,7 @@ public:
void FUN_10073400();
void FUN_10073430();
void GoodEnding(const Matrix4& p_destination);
void BadEnding(const Matrix4& p_destination);
void FUN_10073a60();
// BETA indicates that the following classes access certain members directly.

6
LEGO1/lego/legoomni/include/act3actors.h
View File

@@ -153,7 +153,7 @@ public:
void Animate(float p_time) override; // vtable+0x70
// LegoAnimActor vtable
virtual MxResult FUN_10042ce0(Act3Ammo* p_ammo); // vtable+0x10
virtual MxResult EatPizza(Act3Ammo* p_ammo); // vtable+0x10
MxFloat GetUnknown0x2c() { return m_unk0x2c; }
@@ -163,8 +163,8 @@ public:
// Act3Shark::`scalar deleting destructor'
private:
list<Act3Ammo*> m_unk0x1c; // 0x1c
Act3Ammo* m_unk0x28; // 0x28
list<Act3Ammo*> m_eatPizzas; // 0x1c
Act3Ammo* m_nextPizza; // 0x28
MxFloat m_unk0x2c; // 0x2c
LegoWorld* m_world; // 0x30
LegoAnimActorStruct* m_unk0x34; // 0x34

12
LEGO1/lego/legoomni/include/act3ammo.h
View File

@@ -15,7 +15,7 @@ public:
c_donut = 0x02,
c_valid = 0x04,
c_bit4 = 0x08,
c_bit5 = 0x10
c_sharkFood = 0x10
};
Act3Ammo();
@@ -64,17 +64,17 @@ public:
// FUNCTION: BETA10 0x10021d90
MxU32 IsBit4() { return m_ammoFlag & c_bit4; }
void SetBit5(MxBool p_bit5)
void SetSharkFood(MxBool p_sharkFood)
{
if (p_bit5) {
m_ammoFlag |= c_bit5;
if (p_sharkFood) {
m_ammoFlag |= c_sharkFood;
}
else {
m_ammoFlag &= ~c_bit5;
m_ammoFlag &= ~c_sharkFood;
}
}
MxU32 IsBit5() { return m_ammoFlag & c_bit5; }
MxU32 IsSharkFood() { return m_ammoFlag & c_sharkFood; }
MxFloat GetUnknown0x158() { return m_unk0x158; }

1
LEGO1/lego/legoomni/include/helicopter.h
View File

@@ -77,6 +77,7 @@ public:
void CreateState();
void FUN_10004640(const Matrix4& p_matrix);
void FUN_10004670(const Matrix4& p_matrix);
// SYNTHETIC: LEGO1 0x10003210
// Helicopter::`scalar deleting destructor'

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

@@ -137,6 +137,7 @@ public:
// FUNCTION: LEGO1 0x10002de0
virtual void VTable0xc8(MxU8 p_unk0x148) { m_unk0x148 = p_unk0x148; } // vtable+0xc8
// FUNCTION: BETA10 0x1001ca40
LegoPathBoundary* GetBoundary() { return m_boundary; }
// FUNCTION: BETA10 0x1001c860