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

Match LegoActor in BETA10

Browse Source
This commit is contained in:
jonschz 2025-05-27 17:48:00 +02:00
parent 4186bae786
commit bdc4a93f30
5 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LEGO1/define.cpp
View File

@ -10,6 +10,7 @@ const char* g_strANIMATION = "ANIMATION";
// GLOBAL: LEGO1 0x10102050 // GLOBAL: LEGO1 0x10102050
// STRING: LEGO1 0x10102024 // STRING: LEGO1 0x10102024
// GLOBAL: BETA10 0x102028b4
const char* g_strATTACH_CAMERA = "ATTACH_CAMERA"; const char* g_strATTACH_CAMERA = "ATTACH_CAMERA";
// GLOBAL: LEGO1 0x10102054 // GLOBAL: LEGO1 0x10102054
@ -138,6 +139,7 @@ const char* g_strBMP_ISMAP = "BMP_ISMAP";
// GLOBAL: LEGO1 0x101020e4 // GLOBAL: LEGO1 0x101020e4
// STRING: LEGO1 0x10101eac // STRING: LEGO1 0x10101eac
// GLOBAL: BETA10 0x10202948
const char* g_parseExtraTokens = ":;"; const char* g_parseExtraTokens = ":;";
// GLOBAL: LEGO1 0x100f0c14 // GLOBAL: LEGO1 0x100f0c14

7
LEGO1/lego/legoomni/include/legoactor.h
View File

@ -34,6 +34,7 @@ class LegoActor : public LegoEntity {
} }
// FUNCTION: LEGO1 0x1002d220 // FUNCTION: LEGO1 0x1002d220
// FUNCTION: BETA10 0x10012530
MxBool IsA(const char* p_name) const override // vtable+0x10 MxBool IsA(const char* p_name) const override // vtable+0x10
{ {
return !strcmp(p_name, LegoActor::ClassName()) || LegoEntity::IsA(p_name); return !strcmp(p_name, LegoActor::ClassName()) || LegoEntity::IsA(p_name);
@ -43,18 +44,22 @@ class LegoActor : public LegoEntity {
void SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_bool2) override; // vtable+0x24 void SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_bool2) override; // vtable+0x24
// FUNCTION: LEGO1 0x10002cc0 // FUNCTION: LEGO1 0x10002cc0
// FUNCTION: BETA10 0x1000f3e0
virtual MxFloat GetSoundFrequencyFactor() { return m_frequencyFactor; } // vtable+0x50 virtual MxFloat GetSoundFrequencyFactor() { return m_frequencyFactor; } // vtable+0x50
// FUNCTION: LEGO1 0x10002cd0 // FUNCTION: LEGO1 0x10002cd0
// FUNCTION: BETA10 0x1000f410
virtual void SetSoundFrequencyFactor(MxFloat p_frequencyFactor) virtual void SetSoundFrequencyFactor(MxFloat p_frequencyFactor)
{ {
m_frequencyFactor = p_frequencyFactor; m_frequencyFactor = p_frequencyFactor;
} // vtable+0x54 } // vtable+0x54
// FUNCTION: LEGO1 0x10002ce0 // FUNCTION: LEGO1 0x10002ce0
// FUNCTION: BETA10 0x1000f440
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
// FUNCTION: BETA10 0x1000f470
virtual MxFloat VTable0x5c() { return m_unk0x70; } // vtable+0x5c virtual MxFloat VTable0x5c() { return m_unk0x70; } // vtable+0x5c
// FUNCTION: LEGO1 0x10002d00 // FUNCTION: LEGO1 0x10002d00
@ -62,6 +67,7 @@ class LegoActor : public LegoEntity {
virtual MxU8 GetActorId() { return m_actorId; } // vtable+0x60 virtual MxU8 GetActorId() { return m_actorId; } // vtable+0x60
// FUNCTION: LEGO1 0x10002d10 // FUNCTION: LEGO1 0x10002d10
// FUNCTION: BETA10 0x1000f4d0
virtual void SetActorId(MxU8 p_actorId) { m_actorId = p_actorId; } // vtable+0x64 virtual void SetActorId(MxU8 p_actorId) { m_actorId = p_actorId; } // vtable+0x64
static const char* GetActorName(MxU8 p_id); static const char* GetActorName(MxU8 p_id);
@ -76,6 +82,7 @@ class LegoActor : public LegoEntity {
}; };
// SYNTHETIC: LEGO1 0x1002d300 // SYNTHETIC: LEGO1 0x1002d300
// SYNTHETIC: BETA10 0x1003d900
// LegoActor::`scalar deleting destructor' // LegoActor::`scalar deleting destructor'
#endif // LEGOACTOR_H #endif // LEGOACTOR_H

1
LEGO1/lego/legoomni/src/actors/act2actor.cpp
View File

@ -133,7 +133,6 @@ Act2Actor::Act2Actor()
} }
// FUNCTION: LEGO1 0x10018940 // FUNCTION: LEGO1 0x10018940
// FUNCTION: BETA10 0x1003d65f
void Act2Actor::SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_bool2) void Act2Actor::SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_bool2)
{ {
LegoAnimActor::SetROI(p_roi, p_bool1, p_bool2); LegoAnimActor::SetROI(p_roi, p_bool1, p_bool2);

5
LEGO1/lego/legoomni/src/entity/legoactor.cpp
View File

@ -23,6 +23,7 @@ LegoActor::LegoActor()
} }
// FUNCTION: LEGO1 0x1002d320 // FUNCTION: LEGO1 0x1002d320
// FUNCTION: BETA10 0x1003d08b
LegoActor::~LegoActor() LegoActor::~LegoActor()
{ {
if (m_sound) { if (m_sound) {
@ -31,6 +32,7 @@ LegoActor::~LegoActor()
} }
// FUNCTION: LEGO1 0x1002d390 // FUNCTION: LEGO1 0x1002d390
// FUNCTION: BETA10 0x1003d10b
void LegoActor::ParseAction(char* p_extra) void LegoActor::ParseAction(char* p_extra)
{ {
MxFloat speed = 0.0F; MxFloat speed = 0.0F;
@ -90,6 +92,8 @@ void LegoActor::ParseAction(char* p_extra)
up[2] = atof(token); up[2] = atof(token);
} }
assert(token);
SetWorldTransform(location, direction, up); SetWorldTransform(location, direction, up);
} }
else { else {
@ -122,6 +126,7 @@ const char* LegoActor::GetActorName(MxU8 p_id)
} }
// FUNCTION: LEGO1 0x1002d670 // FUNCTION: LEGO1 0x1002d670
// FUNCTION: BETA10 0x1003d65f
void LegoActor::SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_bool2) void LegoActor::SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_bool2)
{ {
if (p_roi) { if (p_roi) {

3
LEGO1/library_msvc.h
View File

@ -840,6 +840,9 @@
// LIBRARY: BETA10 0x100f8ad0 // LIBRARY: BETA10 0x100f8ad0
// strcmp // strcmp
// LIBRARY: BETA10 0x100f9f60
// strtok
// LIBRARY: BETA10 0x100f9610 // LIBRARY: BETA10 0x100f9610
// rand // rand