isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2024-12-18 03:56:24 -05:00
Code Issues Projects Releases Packages Wiki Activity

Implement/match Act3Cop::Animate (#1233)

Browse source 
* Implement/match `Act3Cop::Animate`

* Fix
This commit is contained in:
Christian Semmler 2024-12-15 11:48:47 -07:00 committed by GitHub
parent 73b9e9a06f
commit 615c3a5047
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 32 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
LEGO1/lego/legoomni/src/actors/act3actors.cpp
View file

@ -235,7 +235,6 @@ void Act3Cop::ParseAction(char* p_extra)
for (MxS32 j = 0; j < boundary->GetNumEdges(); j++) { for (MxS32 j = 0; j < boundary->GetNumEdges(); j++) {
Mx4DPointFloat* edgeNormal = boundary->GetEdgeNormal(j); Mx4DPointFloat* edgeNormal = boundary->GetEdgeNormal(j);
if (point.Dot(edgeNormal, &point) + edgeNormal->index_operator(3) < -0.001) { if (point.Dot(edgeNormal, &point) + edgeNormal->index_operator(3) < -0.001) {
MxTrace("Bad Act3 cop destination %d\n", i); MxTrace("Bad Act3 cop destination %d\n", i);
break; break;
} }
@ -275,10 +274,40 @@ void Act3Cop::ParseAction(char* p_extra)
assert(m_eatAnim); assert(m_eatAnim);
} }
// STUB: LEGO1 0x100401f0 // FUNCTION: LEGO1 0x100401f0
// FUNCTION: BETA10 0x10018abf
void Act3Cop::Animate(float p_time) void Act3Cop::Animate(float p_time)
{ {
// TODO Act3Actor::Animate(p_time);
if (m_unk0x20 > 0.0f && m_unk0x20 < m_lastTime) {
SetWorldSpeed(2.0f);
m_unk0x20 = -1.0f;
}
Act3Brickster* brickster = ((Act3*) m_world)->m_brickster;
if (brickster != NULL && brickster->GetROI() != NULL && m_roi != NULL) {
Mx3DPointFloat local34(brickster->GetROI()->GetLocal2World()[3]);
local34 -= m_roi->GetLocal2World()[3];
float distance = local34.LenSquared();
if (distance < 4.0f) {
((Act3*) m_world)->GoodEnding(brickster->GetROI()->GetLocal2World());
return;
}
if (distance < 25.0f) {
brickster->SetActorState(c_disabled);
FUN_10040360();
return;
}
}
if (m_grec == NULL) {
FUN_10040360();
}
} }
// FUNCTION: LEGO1 0x10040350 // FUNCTION: LEGO1 0x10040350