fix formatting

This commit is contained in:
MishaProductions 2023-11-20 15:17:26 -05:00
parent b0ac583d34
commit e654b64e5d
2 changed files with 45 additions and 62 deletions

View File

@ -1,87 +1,73 @@
#include "legoactioncontrolpresenter.h" #include "legoactioncontrolpresenter.h"
#include "define.h"
#include "extra.h" #include "extra.h"
#include "legoomni.h" #include "legoomni.h"
#include "legoutil.h"
#include "mxmediapresenter.h" #include "mxmediapresenter.h"
#include "mxomni.h" #include "mxomni.h"
#include "mxticklemanager.h" #include "mxticklemanager.h"
#include "mxtypes.h" #include "mxtypes.h"
#include "legoutil.h"
#include "define.h"
#include <cstdlib> #include <cstdlib>
#include <cstring> #include <cstring>
// Only a `scalar deleting destructor' exists. // Only a `scalar deleting destructor' exists.
LegoActionControlPresenter::~LegoActionControlPresenter() LegoActionControlPresenter::~LegoActionControlPresenter() { Destroy(TRUE); }
{
Destroy(TRUE);
}
// OFFSET: LEGO1 0x10043ce0 STUB // OFFSET: LEGO1 0x10043ce0 STUB
void LegoActionControlPresenter::ReadyTickle() void LegoActionControlPresenter::ReadyTickle() {
{ // TODO
// TODO
} }
// OFFSET: LEGO1 0x10043d40 STUB // OFFSET: LEGO1 0x10043d40 STUB
void LegoActionControlPresenter::RepeatingTickle() void LegoActionControlPresenter::RepeatingTickle() {
{ // TODO
// TODO
} }
// OFFSET: LEGO1 0x10043df0 // OFFSET: LEGO1 0x10043df0
MxResult LegoActionControlPresenter::AddToManager() MxResult LegoActionControlPresenter::AddToManager() {
{ MxResult result = FAILURE;
MxResult result = FAILURE; if (TickleManager()) {
if (TickleManager()) result = SUCCESS;
{ TickleManager()->RegisterClient(this, 100);
result = SUCCESS; }
TickleManager()->RegisterClient(this, 100);
}
return result; return result;
} }
// OFFSET: LEGO1 0x10043e20 // OFFSET: LEGO1 0x10043e20
void LegoActionControlPresenter::Destroy(MxBool p_fromDestructor) void LegoActionControlPresenter::Destroy(MxBool p_fromDestructor) {
{ if (TickleManager()) {
if (TickleManager()) TickleManager()->UnregisterClient(this);
{ }
TickleManager()->UnregisterClient(this);
}
if (!p_fromDestructor) if (!p_fromDestructor) {
{ MxMediaPresenter::Destroy(FALSE);
MxMediaPresenter::Destroy(FALSE); }
}
} }
// OFFSET: LEGO1 0x10043e50 // OFFSET: LEGO1 0x10043e50
void LegoActionControlPresenter::ParseExtra() void LegoActionControlPresenter::ParseExtra() {
{ MxU32 len = m_action->GetExtraLength();
MxU32 len = m_action->GetExtraLength();
if (len == 0) if (len == 0)
return; return;
len &= MAXWORD; len &= MAXWORD;
char buf[1024]; char buf[1024];
memcpy(buf, m_action->GetExtraData(), len); memcpy(buf, m_action->GetExtraData(), len);
buf[len] = '\0'; buf[len] = '\0';
char output[1024]; char output[1024];
if (KeyValueStringParse(output, g_strACTION, buf)) if (KeyValueStringParse(output, g_strACTION, buf)) {
{ m_unk0x50 = MatchActionString(strtok(output, g_parseExtraTokens));
m_unk0x50 = MatchActionString(strtok(output, g_parseExtraTokens)); if (m_unk0x50 != ExtraActionType_exit) {
if (m_unk0x50 != ExtraActionType_exit) MakeSourceName(buf, strtok(NULL, g_parseExtraTokens));
{ m_unk0x54 = buf;
MakeSourceName(buf, strtok(NULL, g_parseExtraTokens)); m_unk0x54.ToLowerCase();
m_unk0x54 = buf; if (m_unk0x50 != ExtraActionType_run) {
m_unk0x54.ToLowerCase(); m_unk0x64 = atoi(strtok(NULL, g_parseExtraTokens));
if (m_unk0x50 != ExtraActionType_run) }
{ }
m_unk0x64 = atoi(strtok(NULL, g_parseExtraTokens)); }
}
}
}
} }

View File

@ -2,17 +2,14 @@
#define LEGOACTIONCONTROLPRESENTER_H #define LEGOACTIONCONTROLPRESENTER_H
#include "decomp.h" #include "decomp.h"
#include "mxmediapresenter.h"
#include "legoutil.h" #include "legoutil.h"
#include "mxmediapresenter.h"
// VTABLE 0x100d5118 // VTABLE 0x100d5118
// SIZE 0x68 // SIZE 0x68
class LegoActionControlPresenter : public MxMediaPresenter { class LegoActionControlPresenter : public MxMediaPresenter {
public: public:
inline LegoActionControlPresenter() inline LegoActionControlPresenter() { m_unk0x50 = ExtraActionType_none; }
{
m_unk0x50 = ExtraActionType_none;
}
virtual ~LegoActionControlPresenter() override; // vtable+0x00 virtual ~LegoActionControlPresenter() override; // vtable+0x00
// OFFSET: LEGO1 0x1000d0e0 // OFFSET: LEGO1 0x1000d0e0
inline virtual const char *ClassName() const override // vtable+0x0c inline virtual const char *ClassName() const override // vtable+0x0c
@ -29,11 +26,11 @@ class LegoActionControlPresenter : public MxMediaPresenter {
} }
virtual void ReadyTickle() override; // vtable+0x18 virtual void ReadyTickle() override; // vtable+0x18
virtual void RepeatingTickle() override; // vtable+0x24 virtual void RepeatingTickle() override; // vtable+0x24
virtual void ParseExtra(); // vtable+0x30 virtual void ParseExtra(); // vtable+0x30
virtual MxResult AddToManager() override; virtual MxResult AddToManager() override;
private: private:
virtual void Destroy(MxBool p_fromDestructor); //vtable+0x5c virtual void Destroy(MxBool p_fromDestructor); // vtable+0x5c
ExtraActionType m_unk0x50; ExtraActionType m_unk0x50;
MxString m_unk0x54; MxString m_unk0x54;
undefined4 m_unk0x64; undefined4 m_unk0x64;