isledecomp/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2024-11-22 07:28:00 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Implement/match Act2GenActor::VTable0x94 (#1138)

Browse source
This commit is contained in:
Christian Semmler 2024-11-10 08:43:07 -07:00 committed by GitHub
parent 2c10c8e344
commit 0b94b4803b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 29 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
LEGO1/lego/legoomni/include/act2genactor.h
View file

@ -6,10 +6,13 @@
// VTABLE: LEGO1 0x100d4ed8 // VTABLE: LEGO1 0x100d4ed8
// SIZE 0x154 // SIZE 0x154
class Act2GenActor : public LegoPathActor { class Act2GenActor : public LegoPathActor {
MxResult VTable0x94(LegoPathActor*, MxBool) override; // vtable+0x94 MxResult VTable0x94(LegoPathActor* p_actor, MxBool) override; // vtable+0x94
// SYNTHETIC: LEGO1 0x1000f5a0 // SYNTHETIC: LEGO1 0x1000f5a0
// Act2GenActor::`scalar deleting destructor' // Act2GenActor::`scalar deleting destructor'
private:
static MxLong g_lastHitActorTime;
}; };
#endif // ACT2GENACTOR_H #endif // ACT2GENACTOR_H

28
LEGO1/lego/legoomni/src/actors/act2genactor.cpp
View file

@ -1,10 +1,32 @@
#include "act2genactor.h" #include "act2genactor.h"
#include "legocachesoundmanager.h"
#include "legosoundmanager.h"
#include "misc.h"
#include "mxmisc.h"
#include "mxtimer.h"
#include "roi/legoroi.h"
DECOMP_SIZE_ASSERT(Act2GenActor, 0x154) DECOMP_SIZE_ASSERT(Act2GenActor, 0x154)
// STUB: LEGO1 0x10018740 // GLOBAL: LEGO1 0x100f0f18
MxResult Act2GenActor::VTable0x94(LegoPathActor*, MxBool) MxLong Act2GenActor::g_lastHitActorTime = 0;
// FUNCTION: LEGO1 0x10018740
// FUNCTION: BETA10 0x1000c7a0
MxResult Act2GenActor::VTable0x94(LegoPathActor* p_actor, MxBool)
{ {
// TODO MxLong time = Timer()->GetTime();
MxLong diff = time - g_lastHitActorTime;
if (strcmp(p_actor->GetROI()->GetName(), "pepper")) {
return SUCCESS;
}
g_lastHitActorTime = time;
if (diff > 1000) {
SoundManager()->GetCacheSoundManager()->Play("hitactor", NULL, FALSE);
}
return SUCCESS; return SUCCESS;
} }