mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-23 00:14:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add BETA10 matches on LegoWEGEdge and others (#1655)

Browse Source 
Co-authored-by: jonschz <jonschz@users.noreply.github.com>
This commit is contained in:
jonschz
2025-07-25 23:49:16 +02:00
committed by GitHub
parent a9e261606d
commit d555df6a58
10 changed files with 108 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,6 +31,7 @@ typedef set<LegoPathActor*, LegoPathActorSetCompare> LegoPathActorSet;
typedef set<LegoAnimPresenter*, LegoAnimPresenterSetCompare> LegoAnimPresenterSet;
// VTABLE: LEGO1 0x100d8618
// VTABLE: BETA10 0x101bdd58
// SIZE 0x74
class LegoPathBoundary : public LegoWEGEdge {
public:
@@ -57,6 +58,7 @@ public:
LegoAnimPresenterSet& GetPresenters() { return m_presenters; }
// SYNTHETIC: LEGO1 0x10047a80
// SYNTHETIC: BETA10 0x100bd300
// LegoPathBoundary::`vector deleting destructor'
private:

8
LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp
View File

@@ -2812,7 +2812,11 @@ MxResult LegoAnimationManager::FUN_10064880(const char* p_name, MxS32 p_unk0x0c,
// FUNCTION: BETA10 0x10045daf
void LegoAnimationManager::FUN_100648f0(LegoTranInfo* p_tranInfo, MxLong p_unk0x404)
{
if (m_unk0x402 && p_tranInfo->m_unk0x14) {
if (
#ifndef BETA10
m_unk0x402 &&
#endif
p_tranInfo->m_unk0x14) {
p_tranInfo->m_flags |= LegoTranInfo::c_bit1;
m_unk0x430 = TRUE;
m_unk0x42c = p_tranInfo;
@@ -2833,11 +2837,13 @@ void LegoAnimationManager::FUN_100648f0(LegoTranInfo* p_tranInfo, MxLong p_unk0x
if (location != NULL) {
CalcLocalTransform(location->m_position, location->m_direction, location->m_up, m_unk0x484);
m_unk0x4cc.SetStartEnd(m_unk0x43c, m_unk0x484);
#ifndef BETA10
m_unk0x4cc.NormalizeDirection();
}
else {
p_tranInfo->m_flags &= ~LegoTranInfo::c_bit1;
m_unk0x430 = FALSE;
#endif
}
Mx3DPointFloat vec;

2
LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp
View File

@@ -44,7 +44,7 @@ void LegoModelPresenter::Destroy(MxBool p_fromDestructor)
}
// FUNCTION: LEGO1 0x1007f6b0
// FUNCTION: BETA10 0x1009845e
// STUB: BETA10 0x1009845e
MxResult LegoModelPresenter::CreateROI(MxDSChunk* p_chunk)
{
MxResult result = FAILURE;

5
LEGO1/lego/legoomni/src/worlds/act3.cpp
View File

@@ -781,6 +781,7 @@ void Act3::GoodEnding(const Matrix4& p_destination)
m_cop2->SetActorState(LegoPathActor::c_disabled);
m_brickster->SetActorState(LegoPathActor::c_disabled);
#ifndef BETA10
m_unk0x4220.Clear();
m_copter->FUN_10004640(p_destination);
@@ -792,6 +793,10 @@ void Act3::GoodEnding(const Matrix4& p_destination)
m_copter->m_unk0x1a8,
m_copter->m_unk0x1f4
);
#else
m_state->m_unk0x08 = 2;
GameState()->SwitchArea(LegoGameState::Area::e_infomain);
#endif
}
// FUNCTION: LEGO1 0x10073500