isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-24 16:51:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix location of anim function

Browse Source
This commit is contained in:
Christian Semmler 2024-04-24 09:41:41 -04:00
parent 605d396eac
commit 15c8a0176c
7 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
LEGO1/lego/legoomni/include/legoanimpresenter.h
View File

@ -76,12 +76,10 @@ class LegoAnimPresenter : public MxVideoPresenter {
MxResult FUN_1006afc0(MxMatrix*& p_matrix, float p_und);
MxResult FUN_1006b140(LegoROI* p_roi);
void FUN_1006d680(LegoAnimActor* p_actor, MxFloat p_value);
const char* GetActionObjectName();
inline LegoAnim* GetAnimation() { return m_anim; }
const char* GetActionObjectName();
protected:
void Init();
void Destroy(MxBool p_fromDestructor);

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

@ -2,7 +2,6 @@
#define LEGOEXTRAACTOR_H
#include "legoanimactor.h"
#include "legoanimpresenter.h"
// VTABLE: LEGO1 0x100d6c00 LegoAnimActor
// VTABLE: LEGO1 0x100d6c10 LegoPathActor

2
LEGO1/lego/legoomni/include/legolocomotionanimpresenter.h
View File

@ -35,6 +35,8 @@ class LegoLocomotionAnimPresenter : public LegoLoopingAnimPresenter {
// SYNTHETIC: LEGO1 0x1006cfe0
// LegoLocomotionAnimPresenter::`scalar deleting destructor'
void FUN_1006d680(LegoAnimActor* p_actor, MxFloat p_value);
inline void DecrementUnknown0xd4()
{
if (m_unk0xd4) {

4
LEGO1/lego/legoomni/src/paths/legoanimactor.cpp
View File

@ -1,7 +1,7 @@
#include "legoanimactor.h"
#include "define.h"
#include "legoanimpresenter.h"
#include "legolocomotionanimpresenter.h"
#include "legoworld.h"
#include "misc.h"
#include "mxutilities.h"
@ -206,7 +206,7 @@ void LegoAnimActor::ParseAction(char* p_extra)
token = strtok(NULL, g_parseExtraTokens);
if (token) {
presenter->FUN_1006d680(this, atof(token));
((LegoLocomotionAnimPresenter*) presenter)->FUN_1006d680(this, atof(token));
}
}

9
LEGO1/lego/legoomni/src/paths/legoextraactor.cpp
View File

@ -1,5 +1,6 @@
#include "legoextraactor.h"
#include "legolocomotionanimpresenter.h"
#include "legosoundmanager.h"
#include "misc.h"
#include "mxmisc.h"
@ -11,10 +12,10 @@ DECOMP_SIZE_ASSERT(LegoExtraActor, 0x1dc)
LegoWorld* g_unk0x100f31d0 = NULL;
// GLOBAL: LEGO1 0x100f31d4
LegoAnimPresenter* m_assAnimP = NULL;
LegoLocomotionAnimPresenter* m_assAnimP = NULL;
// GLOBAL: LEGO1 0x100f31d8
LegoAnimPresenter* m_disAnimP = NULL;
LegoLocomotionAnimPresenter* m_disAnimP = NULL;
// GLOBAL: LEGO1 0x100f31dc
MxS32 g_unk0x100f31dc = 0;
@ -156,8 +157,8 @@ inline void LegoExtraActor::FUN_1002ad8a()
if (g_unk0x100f31d0 != w) {
g_unk0x100f31d0 = w;
m_assAnimP = (LegoAnimPresenter*) w->Find("LegoAnimPresenter", "BNsAss01");
m_disAnimP = (LegoAnimPresenter*) w->Find("LegoAnimPresenter", "BNsDis01");
m_assAnimP = (LegoLocomotionAnimPresenter*) w->Find("LegoAnimPresenter", "BNsAss01");
m_disAnimP = (LegoLocomotionAnimPresenter*) w->Find("LegoAnimPresenter", "BNsDis01");
}
if (!m_assAnim) {

6
LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp
View File

@ -942,9 +942,3 @@ MxResult LegoAnimPresenter::VTable0x98(LegoPathBoundary* p_boundary)
return SUCCESS;
}
// STUB: LEGO1 0x1006d680
void LegoAnimPresenter::FUN_1006d680(LegoAnimActor* p_actor, MxFloat p_value)
{
// TODO
}

6
LEGO1/lego/legoomni/src/video/legolocomotionanimpresenter.cpp
View File

@ -113,3 +113,9 @@ void LegoLocomotionAnimPresenter::EndAction()
MxVideoPresenter::EndAction();
}
}
// STUB: LEGO1 0x1006d680
void LegoLocomotionAnimPresenter::FUN_1006d680(LegoAnimActor* p_actor, MxFloat p_value)
{
// TODO
}