isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2024-11-29 11:06:05 -05:00
Code Issues Projects Releases Packages Wiki Activity

LegoActor: destructor, SetROI (#588)

Browse source 
* LegoActor: destructor, SetROI

* Fixes

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
This commit is contained in:
Joshua Peisach 2024-02-23 12:51:49 -05:00 committed by GitHub
parent 6b1c75ab5a
commit 51520aaae6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 32 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
LEGO1/lego/legoomni/include/legoactor.h
View file

@ -2,6 +2,7 @@
#define LEGOACTOR_H #define LEGOACTOR_H
#include "decomp.h" #include "decomp.h"
#include "legocachesound.h"
#include "legoentity.h" #include "legoentity.h"
// VTABLE: LEGO1 0x100d6d68 // VTABLE: LEGO1 0x100d6d68
@ -29,22 +30,27 @@ class LegoActor : public LegoEntity {
// FUNCTION: LEGO1 0x10002cc0 // FUNCTION: LEGO1 0x10002cc0
virtual MxFloat VTable0x50() { return m_unk0x68; } // vtable+0x50 virtual MxFloat VTable0x50() { return m_unk0x68; } // vtable+0x50
// FUNCTION: LEGO1 0x10002cd0 // FUNCTION: LEGO1 0x10002cd0
virtual void VTable0x54(MxFloat p_unk0x68) { m_unk0x68 = p_unk0x68; } // vtable+0x54 virtual void VTable0x54(MxFloat p_unk0x68) { m_unk0x68 = p_unk0x68; } // vtable+0x54
// FUNCTION: LEGO1 0x10002ce0 // FUNCTION: LEGO1 0x10002ce0
virtual void VTable0x58(MxFloat p_unk0x70) { m_unk0x70 = p_unk0x70; } // vtable+0x58 virtual void VTable0x58(MxFloat p_unk0x70) { m_unk0x70 = p_unk0x70; } // vtable+0x58
// FUNCTION: LEGO1 0x10002cf0 // FUNCTION: LEGO1 0x10002cf0
virtual MxFloat VTable0x5c() { return m_unk0x70; } // vtable+0x5c virtual MxFloat VTable0x5c() { return m_unk0x70; } // vtable+0x5c
// FUNCTION: LEGO1 0x10002d00 // FUNCTION: LEGO1 0x10002d00
virtual MxU8 VTable0x60() { return m_unk0x74; } // vtable+0x60 virtual MxU8 VTable0x60() { return m_unk0x74; } // vtable+0x60
// FUNCTION: LEGO1 0x10002d10 // FUNCTION: LEGO1 0x10002d10
virtual void VTable0x64(MxU8 p_unk0x74) { m_unk0x74 = p_unk0x74; } // vtable+0x64 virtual void VTable0x64(MxU8 p_unk0x74) { m_unk0x74 = p_unk0x74; } // vtable+0x64
private: private:
MxFloat m_unk0x68; // 0x68 MxFloat m_unk0x68; // 0x68
undefined4 m_unk0x6c; // 0x6c LegoCacheSound* m_sound; // 0x6c
MxFloat m_unk0x70; // 0x70 MxFloat m_unk0x70; // 0x70
MxU8 m_unk0x74; // 0x74 MxU8 m_unk0x74; // 0x74
}; };
// SYNTHETIC: LEGO1 0x1002d300 // SYNTHETIC: LEGO1 0x1002d300

27
LEGO1/lego/legoomni/src/entity/legoactor.cpp
View file

@ -2,20 +2,25 @@
DECOMP_SIZE_ASSERT(LegoActor, 0x78) DECOMP_SIZE_ASSERT(LegoActor, 0x78)
// GLOBAL: LEGO1 0x100f32d0
const char* g_unk0x100f32d0[] = {"none", "pepper", "mama", "papa", "nick", "laura", "The_Brickster!"};
// FUNCTION: LEGO1 0x1002d110 // FUNCTION: LEGO1 0x1002d110
LegoActor::LegoActor() LegoActor::LegoActor()
{ {
m_unk0x68 = 0.0f; m_unk0x68 = 0.0f;
m_unk0x6c = 0; m_sound = NULL;
m_unk0x70 = 0.0f; m_unk0x70 = 0.0f;
m_unk0x10 = 0; m_unk0x10 = 0;
m_unk0x74 = 0; m_unk0x74 = 0;
} }
// STUB: LEGO1 0x1002d320 // FUNCTION: LEGO1 0x1002d320
LegoActor::~LegoActor() LegoActor::~LegoActor()
{ {
// TODO if (m_sound) {
m_sound->FUN_10006b80();
}
} }
// STUB: LEGO1 0x1002d390 // STUB: LEGO1 0x1002d390
@ -24,8 +29,20 @@ void LegoActor::ParseAction(char*)
// TODO // TODO
} }
// STUB: LEGO1 0x1002d670 // FUNCTION: LEGO1 0x1002d670
void LegoActor::SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_bool2) void LegoActor::SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_bool2)
{ {
// TODO if (p_roi) {
const char* name = p_roi->GetName();
for (MxU32 i = 1; i <= _countof(g_unk0x100f32d0) - 1; i++) {
if (!strcmpi(name, g_unk0x100f32d0[i])) {
m_unk0x59 = 0;
m_unk0x74 = i;
break;
}
}
}
LegoEntity::SetROI(p_roi, p_bool1, p_bool2);
} }