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

Fixes

Browse Source
This commit is contained in:
Christian Semmler 2024-03-24 17:16:43 -04:00
parent 0d277f3ceb
commit 6691adb0e0
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
LEGO1/lego/legoomni/include/legopathcontroller.h
View File

@ -4,6 +4,7 @@
#include "decomp.h" #include "decomp.h"
#include "legopathactor.h" #include "legopathactor.h"
#include "mxcore.h" #include "mxcore.h"
class LegoPathBoundary; class LegoPathBoundary;
class LegoWorld; class LegoWorld;
@ -38,7 +39,7 @@ class LegoPathController : public MxCore {
undefined4 FUN_10046770(LegoPathActor* p_actor); undefined4 FUN_10046770(LegoPathActor* p_actor);
MxResult FUN_10046b30(LegoPathBoundary** p_path, MxS32& p_value); MxResult FUN_10046b30(LegoPathBoundary** p_path, MxS32& p_value);
void Enable(MxBool p_enable); void Enable(MxBool p_enable);
void FUN_10046bb0(LegoWorld* world); void FUN_10046bb0(LegoWorld* p_world);
private: private:
undefined4 m_unk0x08; // 0x08 undefined4 m_unk0x08; // 0x08

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

@ -9,7 +9,7 @@ DECOMP_SIZE_ASSERT(LegoPathPresenter, 0x54)
// STRING: LEGO1 0x10101ef0 // STRING: LEGO1 0x10101ef0
// GLOBAL: LEGO1 0x101020c4 // GLOBAL: LEGO1 0x101020c4
char* g_triggersSource = "TRIGGERS_SOURCE"; const char* g_triggersSource = "TRIGGERS_SOURCE";
// FUNCTION: LEGO1 0x100448d0 // FUNCTION: LEGO1 0x100448d0
LegoPathPresenter::LegoPathPresenter() LegoPathPresenter::LegoPathPresenter()
@ -68,11 +68,14 @@ void LegoPathPresenter::Destroy()
void LegoPathPresenter::ReadyTickle() void LegoPathPresenter::ReadyTickle()
{ {
LegoWorld* currentWorld = CurrentWorld(); LegoWorld* currentWorld = CurrentWorld();
if (currentWorld) { if (currentWorld) {
MxStreamChunk* chunk = m_subscriber->PopData(); MxStreamChunk* chunk = m_subscriber->PopData();
if (chunk) { if (chunk) {
LegoPathController* controller = new LegoPathController(); LegoPathController* controller = new LegoPathController();
if (controller == NULL) {
if (controller != NULL) {
EndAction(); EndAction();
} }
else { else {
@ -126,7 +129,7 @@ void LegoPathPresenter::ParseExtra()
strupr(extraCopy); strupr(extraCopy);
if (KeyValueStringParse(output, g_triggersSource, extraCopy) != 0) { if (KeyValueStringParse(output, g_triggersSource, extraCopy) != FALSE) {
m_trigger = MxAtomId(output, e_lowerCase2); m_trigger = MxAtomId(output, e_lowerCase2);
} }
} }