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

Implement/match Act3Brickster::HitActor (#1212)

Browse Source 
* Implement/match `Act3Brickster::HitActor`

* Fixes

* Fixes

* Fixes

* Add `Act3Cop::VTable0x9c`

* Fix
This commit is contained in:
Christian Semmler
2024-12-12 09:10:44 -07:00
committed by GitHub
parent fe57a94416
commit aceba71fbb
25 changed files with 166 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
LEGO1/lego/legoomni/src/entity/act2brick.cpp
View File

@@ -107,7 +107,7 @@ void Act2Brick::FUN_1007a670(MxMatrix& p_param1, MxMatrix& p_param2, LegoPathBou
}
// FUNCTION: LEGO1 0x1007a750
MxResult Act2Brick::VTable0x94(LegoPathActor* p_actor, MxBool)
MxResult Act2Brick::HitActor(LegoPathActor* p_actor, MxBool)
{
MxLong time = Timer()->GetTime();
MxLong diff = time - g_lastHitActorTime;

2
LEGO1/lego/legoomni/src/entity/legojetski.cpp
View File

@@ -56,7 +56,7 @@ MxLong LegoJetski::Notify(MxParam& p_param)
}
// STUB: LEGO1 0x10013c40
MxResult LegoJetski::VTable0x94(LegoPathActor* p_actor, MxBool p_bool)
MxResult LegoJetski::HitActor(LegoPathActor* p_actor, MxBool p_bool)
{
// TODO
return 0;

4
LEGO1/lego/legoomni/src/entity/legojetskiraceactor.cpp
View File

@@ -168,9 +168,9 @@ MxU32 LegoJetskiRaceActor::VTable0x6c(
if (roi != NULL && (roi->GetVisibility() || actor->GetCameraFlag())) {
if (roi->FUN_100a9410(p_v1, p_v2, p_f1, p_f2, p_v3, m_collideBox && actor->GetCollideBox())) {
VTable0x94(actor, TRUE);
HitActor(actor, TRUE);
if (actor->VTable0x94(this, FALSE) < 0) {
if (actor->HitActor(this, FALSE) < 0) {
return 0;
}
else {