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 4 Packages Projects Releases Wiki Activity

Merge branch 'master' into spl

Browse Source
This commit is contained in:
Christian Semmler 2025-01-08 17:28:59 -07:00 committed by GitHub
commit 9816ae9844
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
LEGO1/lego/legoomni/src/actors/islepathactor.cpp
View File

@ -19,9 +19,6 @@
DECOMP_SIZE_ASSERT(IslePathActor, 0x160)
DECOMP_SIZE_ASSERT(IslePathActor::SpawnLocation, 0x38)
// GLOBAL: LEGO1 0x10102b28
IslePathActor::SpawnLocation g_spawnLocations[IslePathActor::c_LOCATIONS_NUM];
// FUNCTION: LEGO1 0x1001a200
IslePathActor::IslePathActor()
{
@ -157,6 +154,9 @@ void IslePathActor::Exit()
FUN_1003eda0();
}
// GLOBAL: LEGO1 0x10102b28
IslePathActor::SpawnLocation g_spawnLocations[IslePathActor::c_LOCATIONS_NUM];
// FUNCTION: LEGO1 0x1001a700
void IslePathActor::RegisterSpawnLocations()
{

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) {
return SUCCESS;
if (p_bool) {
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) {
return SUCCESS;
if (p_bool) {
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]; }
};
#ifdef COMPAT_MODE
#include "matrix4d.inl.h"
#endif
#endif // MATRIX_H

6
LEGO1/realtime/vector.h
View File

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

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

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