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

Order LegoCarBuild, LegoPlantManager

Browse Source
This commit is contained in:
Christian Semmler 2025-01-10 16:55:12 -07:00
parent ee2bcb4d53
commit 2743f281dd
5 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -321,8 +321,8 @@ function(add_lego_libraries NAME)
LEGO1/lego/legoomni/src/paths/legoanimactor.cpp LEGO1/lego/legoomni/src/paths/legoanimactor.cpp
LEGO1/lego/legoomni/src/entity/legoworld.cpp LEGO1/lego/legoomni/src/entity/legoworld.cpp
LEGO1/lego/legoomni/src/build/legocarbuild.cpp LEGO1/lego/legoomni/src/build/legocarbuild.cpp
LEGO1/lego/legoomni/src/actors/ambulance.cpp
LEGO1/lego/legoomni/src/common/legoplantmanager.cpp LEGO1/lego/legoomni/src/common/legoplantmanager.cpp
LEGO1/lego/legoomni/src/actors/ambulance.cpp
LEGO1/lego/legoomni/src/actors/bumpbouy.cpp LEGO1/lego/legoomni/src/actors/bumpbouy.cpp
LEGO1/modeldb/modeldb.cpp LEGO1/modeldb/modeldb.cpp
LEGO1/lego/legoomni/src/actors/pizza.cpp LEGO1/lego/legoomni/src/actors/pizza.cpp

5
LEGO1/lego/legoomni/include/legocarbuild.h
View File

@ -91,6 +91,10 @@ class LegoCarBuild : public LegoWorld {
LegoCarBuild(); LegoCarBuild();
~LegoCarBuild() override; ~LegoCarBuild() override;
// FUNCTION: LEGO1 0x10022930
// FUNCTION: BETA10 0x10070070
MxBool VTable0x5c() override { return TRUE; } // vtable+0x5c
// FUNCTION: LEGO1 0x10022940 // FUNCTION: LEGO1 0x10022940
// FUNCTION: BETA10 0x10070090 // FUNCTION: BETA10 0x10070090
const char* ClassName() const override // vtable+0x0c const char* ClassName() const override // vtable+0x0c
@ -110,7 +114,6 @@ class LegoCarBuild : public LegoWorld {
MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18 MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
void ReadyWorld() override; // vtable+0x50 void ReadyWorld() override; // vtable+0x50
MxBool VTable0x5c() override; // vtable+0x5c
MxBool Escape() override; // vtable+0x64 MxBool Escape() override; // vtable+0x64
void Enable(MxBool p_enable) override; // vtable+0x68 void Enable(MxBool p_enable) override; // vtable+0x68
virtual void VTable0x6c(); // vtable+0x6c virtual void VTable0x6c(); // vtable+0x6c

7
LEGO1/lego/legoomni/src/build/legocarbuild.cpp
View File

@ -130,13 +130,6 @@ LegoCarBuild::LegoCarBuild()
NotificationManager()->Register(this); NotificationManager()->Register(this);
} }
// FUNCTION: LEGO1 0x10022930
// FUNCTION: BETA10 0x10070070
MxBool LegoCarBuild::VTable0x5c()
{
return TRUE;
}
// FUNCTION: LEGO1 0x10022a80 // FUNCTION: LEGO1 0x10022a80
// FUNCTION: BETA10 0x1006aea3 // FUNCTION: BETA10 0x1006aea3
LegoCarBuild::~LegoCarBuild() LegoCarBuild::~LegoCarBuild()

1
LEGO1/lego/legoomni/src/common/legobuildingmanager.cpp
View File

@ -661,7 +661,6 @@ MxBool LegoBuildingManager::FUN_10030110(LegoBuildingInfo* p_data)
} }
// FUNCTION: LEGO1 0x10030150 // FUNCTION: LEGO1 0x10030150
// FUNCTION: BETA10 0x100644ff
void LegoBuildingManager::ScheduleAnimation(LegoEntity* p_entity, MxLong p_length, MxBool p_haveSound, MxBool p_unk0x28) void LegoBuildingManager::ScheduleAnimation(LegoEntity* p_entity, MxLong p_length, MxBool p_haveSound, MxBool p_unk0x28)
{ {
m_world = CurrentWorld(); m_world = CurrentWorld();

6
LEGO1/lego/legoomni/src/common/legoplantmanager.cpp
View File

@ -618,7 +618,11 @@ void LegoPlantManager::ScheduleAnimation(LegoEntity* p_entity, MxLong p_length)
entry->m_entity = p_entity; entry->m_entity = p_entity;
entry->m_roi = p_entity->GetROI(); entry->m_roi = p_entity->GetROI();
entry->m_time = Timer()->GetTime() + p_length + 1000;
MxLong time = Timer()->GetTime();
time += p_length;
entry->m_time = time + 1000;
FUN_100271b0(p_entity, -1); FUN_100271b0(p_entity, -1);
} }