From e9467864d867f989d531c33f1adab4f61caa9040 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Sun, 16 Mar 2025 14:57:23 -0700
Subject: [PATCH] Match `LegoHideAnimPresenter::FUN_1006db60` (#1414)
* Match `LegoHideAnimPresenter::FUN_1006db60`
* Remove comment
---
.../lego/legoomni/src/video/legohideanimpresenter.cpp | 3 +--
LEGO1/lego/sources/anim/legoanim.h | 3 +++
LEGO1/lego/sources/geom/legowegedge.h | 11 ++++++++++-
3 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/LEGO1/lego/legoomni/src/video/legohideanimpresenter.cpp b/LEGO1/lego/legoomni/src/video/legohideanimpresenter.cpp
index 0aef42bd..64a06a08 100644
--- a/LEGO1/lego/legoomni/src/video/legohideanimpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/video/legohideanimpresenter.cpp
@@ -118,8 +118,7 @@ void LegoHideAnimPresenter::FUN_1006db60(LegoTreeNode* p_node, LegoTime p_time)
if (boundary != NULL) {
newB = data->FUN_100a0990(p_time);
- boundary->GetFlag0x10();
- // TODO: Match
+ previousB = boundary->GetFlag0x10();
boundary->SetFlag0x10(newB);
}
}
diff --git a/LEGO1/lego/sources/anim/legoanim.h b/LEGO1/lego/sources/anim/legoanim.h
index 00cbafdb..0df350a9 100644
--- a/LEGO1/lego/sources/anim/legoanim.h
+++ b/LEGO1/lego/sources/anim/legoanim.h
@@ -189,6 +189,7 @@ public:
// FUNCTION: BETA10 0x1005abc0
LegoU16 GetUnknown0x20() { return m_unk0x20; }
+ // FUNCTION: BETA10 0x1005d5c0
LegoU16 GetUnknown0x22() { return m_unk0x22; }
// FUNCTION: BETA10 0x10073b80
@@ -222,6 +223,8 @@ public:
{
return CreateLocalTransform((LegoFloat) p_time, p_matrix);
}
+
+ // FUNCTION: BETA10 0x1005d580
LegoBool FUN_100a0990(LegoTime p_time) { return FUN_100a0990((LegoFloat) p_time); }
inline static void GetTranslation(
diff --git a/LEGO1/lego/sources/geom/legowegedge.h b/LEGO1/lego/sources/geom/legowegedge.h
index af32c3ea..7ff23c10 100644
--- a/LEGO1/lego/sources/geom/legowegedge.h
+++ b/LEGO1/lego/sources/geom/legowegedge.h
@@ -45,7 +45,15 @@ public:
LegoS32 VTable0x04() override; // vtable+0x04
// FUNCTION: BETA10 0x100270c0
- LegoU32 GetFlag0x10() { return m_flags & c_bit5 ? FALSE : TRUE; }
+ LegoU32 GetFlag0x10()
+ {
+ if (m_flags & c_bit5) {
+ return FALSE;
+ }
+ else {
+ return TRUE;
+ }
+ }
// TODO: Other BETA10 reference at 0x1001c9e0, not sure what is going on
// FUNCTION: BETA10 0x1001ff80
@@ -57,6 +65,7 @@ public:
// FUNCTION: BETA10 0x1001c9b0
const LegoChar* GetName() { return m_name; }
+ // FUNCTION: BETA10 0x1005d5f0
void SetFlag0x10(LegoU32 p_disable)
{
if (p_disable) {