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

Add missing override

Browse Source
This commit is contained in:
Nathan 2024-03-25 22:58:53 -04:00
parent 91d848c66a
commit 33e95224ca
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,7 +23,7 @@ struct LegoAnimActorStruct {
class LegoAnimActor : public virtual LegoPathActor { class LegoAnimActor : public virtual LegoPathActor {
public: public:
LegoAnimActor() { m_curAnim = -1; } LegoAnimActor() { m_curAnim = -1; }
~LegoAnimActor(); ~LegoAnimActor() override;
// FUNCTION: LEGO1 0x1000fba0 // FUNCTION: LEGO1 0x1000fba0
inline const char* ClassName() const override // vtable+0x0c inline const char* ClassName() const override // vtable+0x0c

6
LEGO1/lego/legoomni/src/paths/legoanimactor.cpp
View File

@ -154,9 +154,9 @@ void LegoAnimActor::SetWorldSpeed(MxFloat p_worldSpeed)
m_worldSpeed = p_worldSpeed; m_worldSpeed = p_worldSpeed;
} }
MxU32 size; MxU32 size;
if (m_animMaps.begin() != NULL && (size = m_animMaps.size())) { if (m_animMaps.begin() && (size = m_animMaps.size())) {
m_curAnim = 0; m_curAnim = 0;
if (m_worldSpeed >= m_animMaps[(m_animMaps.begin() != NULL ? size : 0) - 1]->m_unk0x00) { if (m_worldSpeed >= m_animMaps[(m_animMaps.begin() ? size : 0) - 1]->m_unk0x00) {
if (!m_animMaps.begin()) { if (!m_animMaps.begin()) {
m_curAnim = -1; m_curAnim = -1;
} }
@ -166,7 +166,7 @@ void LegoAnimActor::SetWorldSpeed(MxFloat p_worldSpeed)
return; return;
} }
else { else {
for (MxU32 i = 0; m_animMaps.begin() != NULL && i < size; i++) { for (MxU32 i = 0; m_animMaps.begin() && i < size; i++) {
if (m_worldSpeed <= m_animMaps[i]->m_unk0x00) { if (m_worldSpeed <= m_animMaps[i]->m_unk0x00) {
m_curAnim = i; m_curAnim = i;
break; break;