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

Remove superfluous early returns

Browse Source
This commit is contained in:
Christian Semmler 2024-04-15 07:32:02 -04:00
parent c4b03404c7
commit fa74c40652
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
LEGO1/lego/legoomni/src/paths/legopathactor.cpp
View File

@ -236,7 +236,7 @@ MxS32 LegoPathActor::VTable0x8c(float p_time, Matrix4& p_transform)
MxS32 result = VTable0x68(p4, p2, p3); MxS32 result = VTable0x68(p4, p2, p3);
if (result > 0) { if (result < 0) {
p2 = p4; p2 = p4;
m_unk0xe9 = 0; m_unk0xe9 = 0;
result = 0; result = 0;
@ -290,15 +290,8 @@ MxS32 LegoPathActor::VTable0x8c(float p_time, Matrix4& p_transform)
pos = p2; pos = p2;
return result; return result;
} }
else {
return -1;
} }
} else if (p_time >= 0 && m_worldSpeed > 0) {
else {
if (p_time < 0 || m_worldSpeed <= 0) {
return -1;
}
float f = (m_BADuration - m_unk0x7c) / m_worldSpeed + m_lastTime; float f = (m_BADuration - m_unk0x7c) / m_worldSpeed + m_lastTime;
if (f < p_time) { if (f < p_time) {
@ -355,6 +348,7 @@ void LegoPathActor::VTable0x74(Matrix4& p_transform)
else { else {
m_roi->WrappedSetLocalTransform(p_transform); m_roi->WrappedSetLocalTransform(p_transform);
m_roi->VTable0x14(); m_roi->VTable0x14();
if (m_cameraFlag) { if (m_cameraFlag) {
FUN_10010c30(); FUN_10010c30();
} }