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

Merge branch 'master' into order-animactor

Browse Source
This commit is contained in:
Christian Semmler 2025-01-08 17:16:01 -07:00 committed by GitHub
commit 786e5afe0e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
LEGO1/lego/legoomni/src/race/legoracers.cpp
View File

@ -517,11 +517,12 @@ MxResult LegoRaceCar::HitActor(LegoPathActor* p_actor, MxBool p_bool)
} }
} }
if (p_bool && m_worldSpeed != 0) { if (p_bool) {
return SUCCESS; return m_worldSpeed != 0 ? SUCCESS : FAILURE;
}
else {
return FAILURE;
} }
return FAILURE;
} }
} }
@ -717,11 +718,12 @@ MxResult LegoJetski::HitActor(LegoPathActor* p_actor, MxBool p_bool)
} }
} }
if (p_bool && m_worldSpeed != 0) { if (p_bool) {
return SUCCESS; return m_worldSpeed != 0 ? SUCCESS : FAILURE;
}
else {
return FAILURE;
} }
return FAILURE;
} }
} }

4
LEGO1/realtime/matrix.h
View File

@ -52,4 +52,8 @@ class Matrix4 {
const float* operator[](int idx) const { return m_data[idx]; } const float* operator[](int idx) const { return m_data[idx]; }
}; };
#ifdef COMPAT_MODE
#include "matrix4d.inl.h"
#endif
#endif // MATRIX_H #endif // MATRIX_H

6
LEGO1/realtime/vector.h
View File

@ -148,4 +148,10 @@ class Vector4 : public Vector3 {
friend class Mx4DPointFloat; friend class Mx4DPointFloat;
}; };
#ifdef COMPAT_MODE
#include "vector2d.inl.h"
#include "vector3d.inl.h"
#include "vector4d.inl.h"
#endif
#endif // VECTOR_H #endif // VECTOR_H

3
LEGO1/realtime/vector4d.inl.h
View File

@ -3,6 +3,9 @@
#include "vector.h" #include "vector.h"
#include <math.h>
#include <memory.h>
// FUNCTION: LEGO1 0x10002870 // FUNCTION: LEGO1 0x10002870
void Vector4::AddImpl(const float* p_value) void Vector4::AddImpl(const float* p_value)
{ {