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

Add BETA10 macro to enable conditional compilation for BETA10 targets

Browse Source
This commit is contained in:
Christian Semmler 2024-12-24 08:44:19 -07:00
parent bb29d289fe
commit 570458de7e
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -483,6 +483,7 @@ if(ISLE_BUILD_BETA10)
OUT_TARGETS beta10_targets OUT_TARGETS beta10_targets
) )
reccmp_add_target(beta10 ID BETA10) reccmp_add_target(beta10 ID BETA10)
target_compile_definitions(beta10 PRIVATE BETA10)
endif() endif()
if (ISLE_BUILD_APP) if (ISLE_BUILD_APP)

12
LEGO1/lego/legoomni/src/actors/act2actor.cpp
View File

@ -200,7 +200,7 @@ void Act2Actor::Animate(float p_time)
{ {
int dummy1; // for BETA10, not sure what it is being used for int dummy1; // for BETA10, not sure what it is being used for
#ifdef NDEBUG #ifndef BETA10
MxFloat local48float = 0.0f; MxFloat local48float = 0.0f;
if (g_unk0x100f0f1c != 0.0f) { if (g_unk0x100f0f1c != 0.0f) {
local48float = p_time - g_unk0x100f0f1c; local48float = p_time - g_unk0x100f0f1c;
@ -221,14 +221,14 @@ void Act2Actor::Animate(float p_time)
m_unk0x20 = 0; m_unk0x20 = 0;
} }
else { else {
#ifdef NDEBUG #ifndef BETA10
m_unk0x20 += local48float; m_unk0x20 += local48float;
#endif #endif
MxMatrix matrix = m_roi->GetLocal2World(); MxMatrix matrix = m_roi->GetLocal2World();
matrix[3][1] += 3.0f; matrix[3][1] += 3.0f;
m_roi->UpdateTransformationRelativeToParent(matrix); m_roi->UpdateTransformationRelativeToParent(matrix);
#ifdef NDEBUG #ifndef BETA10
LegoROI* brickstrROI = FindROI("brickstr"); LegoROI* brickstrROI = FindROI("brickstr");
MxMatrix brickstrMatrix = brickstrROI->GetLocal2World(); MxMatrix brickstrMatrix = brickstrROI->GetLocal2World();
brickstrMatrix[3][1] += 3.0f; brickstrMatrix[3][1] += 3.0f;
@ -272,7 +272,7 @@ void Act2Actor::Animate(float p_time)
CurrentWorld()->RemoveActor(this); CurrentWorld()->RemoveActor(this);
return; return;
} }
#ifdef NDEBUG #ifndef BETA10
else if (m_unk0x1e == 4) { else if (m_unk0x1e == 4) {
if (m_worldSpeed == 0.0f) { if (m_worldSpeed == 0.0f) {
return; return;
@ -340,7 +340,7 @@ void Act2Actor::Animate(float p_time)
FUN_100199f0(0); FUN_100199f0(0);
} }
else else
#ifdef NDEBUG #ifndef BETA10
if (p_time - m_unk0x24 > 3000.0f) { if (p_time - m_unk0x24 > 3000.0f) {
#endif #endif
SetWorldSpeed(m_unk0x28 - 1); SetWorldSpeed(m_unk0x28 - 1);
@ -350,7 +350,7 @@ void Act2Actor::Animate(float p_time)
if (((LegoAct2*) CurrentWorld())->FUN_100516b0() == SUCCESS) { if (((LegoAct2*) CurrentWorld())->FUN_100516b0() == SUCCESS) {
FUN_100199f0(1); FUN_100199f0(1);
} }
#ifdef NDEBUG #ifndef BETA10
} }
#endif #endif
} }

7
LEGO1/lego/legoomni/src/build/legocarbuild.cpp
View File

@ -945,7 +945,7 @@ MxS32 LegoCarBuild::FUN_10024850(MxLong p_x, MxLong p_y)
return result; return result;
} }
#ifdef NDEBUG #ifndef BETA10
// FUNCTION: LEGO1 0x10024890 // FUNCTION: LEGO1 0x10024890
undefined4 LegoCarBuild::FUN_10024890(MxParam* p_param) undefined4 LegoCarBuild::FUN_10024890(MxParam* p_param)
@ -1494,8 +1494,7 @@ void LegoCarBuild::FUN_10025720(undefined4 p_param)
m_unk0x10a = 0; m_unk0x10a = 0;
MxS32 uVar6; MxS32 uVar6;
#ifdef NDEBUG #ifndef BETA10
if (GameState()->GetCurrentAct() == LegoGameState::e_act2) { if (GameState()->GetCurrentAct() == LegoGameState::e_act2) {
// This is most likely related to the helicopter rebuild in Act 2 // This is most likely related to the helicopter rebuild in Act 2
switch (p_param) { switch (p_param) {
@ -1597,7 +1596,7 @@ void LegoCarBuild::FUN_10025720(undefined4 p_param)
assert(m_numAnimsRun >= 0); assert(m_numAnimsRun >= 0);
return; return;
} }
#ifdef NDEBUG #ifndef BETA10
} }
#endif #endif

2
LEGO1/lego/legoomni/src/build/legocarbuildpresenter.cpp
View File

@ -147,7 +147,7 @@ void LegoCarBuildAnimPresenter::ReadyTickle()
return; return;
} }
#ifdef NDEBUG #ifndef BETA10
if (!m_anim) { if (!m_anim) {
return; return;
} }

2
LEGO1/lego/legoomni/src/entity/legojetskiraceactor.cpp
View File

@ -100,7 +100,7 @@ MxS32 LegoJetskiRaceActor::VTable0x1c(LegoPathBoundary* p_boundary, LegoEdge* p_
} }
if (VTable0x80(m_roi->GetWorldPosition(), worldDirection, a, c)) { if (VTable0x80(m_roi->GetWorldPosition(), worldDirection, a, c)) {
#ifdef NDEBUG #ifndef BETA10
m_unk0x7c = 0; m_unk0x7c = 0;
return 0; return 0;
#else #else

2
LEGO1/lego/legoomni/src/race/legoracespecial.cpp
View File

@ -271,7 +271,7 @@ MxResult LegoCarRaceActor::VTable0x9c()
MxResult res = VTable0x80(m_roi->GetWorldPosition(), point4, point1, point5); MxResult res = VTable0x80(m_roi->GetWorldPosition(), point4, point1, point5);
#ifndef NDEBUG // BETA10 only #ifdef BETA10
if (res) { if (res) {
assert(0); assert(0);
return -1; return -1;