mirror of
https://github.com/isledecomp/isle.git
synced 2025-10-24 17:04:17 +00:00
Add BETA10 macro to enable conditional compilation for BETA10 targets (#1270)
* Add BETA10 macro to enable conditional compilation for BETA10 targets * Adjustments to CMakeLists.txt
This commit is contained in:
committed by
GitHub
parent
2cdbd1b94f
commit
4c32abd16d
@@ -200,7 +200,7 @@ void Act2Actor::Animate(float p_time)
|
||||
{
|
||||
int dummy1; // for BETA10, not sure what it is being used for
|
||||
|
||||
#ifdef NDEBUG
|
||||
#ifndef BETA10
|
||||
MxFloat local48float = 0.0f;
|
||||
if (g_unk0x100f0f1c != 0.0f) {
|
||||
local48float = p_time - g_unk0x100f0f1c;
|
||||
@@ -221,14 +221,14 @@ void Act2Actor::Animate(float p_time)
|
||||
m_unk0x20 = 0;
|
||||
}
|
||||
else {
|
||||
#ifdef NDEBUG
|
||||
#ifndef BETA10
|
||||
m_unk0x20 += local48float;
|
||||
#endif
|
||||
MxMatrix matrix = m_roi->GetLocal2World();
|
||||
matrix[3][1] += 3.0f;
|
||||
m_roi->UpdateTransformationRelativeToParent(matrix);
|
||||
|
||||
#ifdef NDEBUG
|
||||
#ifndef BETA10
|
||||
LegoROI* brickstrROI = FindROI("brickstr");
|
||||
MxMatrix brickstrMatrix = brickstrROI->GetLocal2World();
|
||||
brickstrMatrix[3][1] += 3.0f;
|
||||
@@ -272,7 +272,7 @@ void Act2Actor::Animate(float p_time)
|
||||
CurrentWorld()->RemoveActor(this);
|
||||
return;
|
||||
}
|
||||
#ifdef NDEBUG
|
||||
#ifndef BETA10
|
||||
else if (m_unk0x1e == 4) {
|
||||
if (m_worldSpeed == 0.0f) {
|
||||
return;
|
||||
@@ -340,7 +340,7 @@ void Act2Actor::Animate(float p_time)
|
||||
FUN_100199f0(0);
|
||||
}
|
||||
else
|
||||
#ifdef NDEBUG
|
||||
#ifndef BETA10
|
||||
if (p_time - m_unk0x24 > 3000.0f) {
|
||||
#endif
|
||||
SetWorldSpeed(m_unk0x28 - 1);
|
||||
@@ -350,7 +350,7 @@ void Act2Actor::Animate(float p_time)
|
||||
if (((LegoAct2*) CurrentWorld())->FUN_100516b0() == SUCCESS) {
|
||||
FUN_100199f0(1);
|
||||
}
|
||||
#ifdef NDEBUG
|
||||
#ifndef BETA10
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -945,7 +945,7 @@ MxS32 LegoCarBuild::FUN_10024850(MxLong p_x, MxLong p_y)
|
||||
return result;
|
||||
}
|
||||
|
||||
#ifdef NDEBUG
|
||||
#ifndef BETA10
|
||||
|
||||
// FUNCTION: LEGO1 0x10024890
|
||||
undefined4 LegoCarBuild::FUN_10024890(MxParam* p_param)
|
||||
@@ -1492,8 +1492,7 @@ void LegoCarBuild::FUN_10025720(undefined4 p_param)
|
||||
m_unk0x10a = 0;
|
||||
MxS32 uVar6;
|
||||
|
||||
#ifdef NDEBUG
|
||||
|
||||
#ifndef BETA10
|
||||
if (GameState()->GetCurrentAct() == LegoGameState::e_act2) {
|
||||
// This is most likely related to the helicopter rebuild in Act 2
|
||||
switch (p_param) {
|
||||
@@ -1595,7 +1594,7 @@ void LegoCarBuild::FUN_10025720(undefined4 p_param)
|
||||
assert(m_numAnimsRun >= 0);
|
||||
return;
|
||||
}
|
||||
#ifdef NDEBUG
|
||||
#ifndef BETA10
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
@@ -147,7 +147,7 @@ void LegoCarBuildAnimPresenter::ReadyTickle()
|
||||
return;
|
||||
}
|
||||
|
||||
#ifdef NDEBUG
|
||||
#ifndef BETA10
|
||||
if (!m_anim) {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -100,7 +100,7 @@ MxS32 LegoJetskiRaceActor::VTable0x1c(LegoPathBoundary* p_boundary, LegoEdge* p_
|
||||
}
|
||||
|
||||
if (VTable0x80(m_roi->GetWorldPosition(), worldDirection, a, c)) {
|
||||
#ifdef NDEBUG
|
||||
#ifndef BETA10
|
||||
m_unk0x7c = 0;
|
||||
return 0;
|
||||
#else
|
||||
|
||||
@@ -271,7 +271,7 @@ MxResult LegoCarRaceActor::VTable0x9c()
|
||||
|
||||
MxResult res = VTable0x80(m_roi->GetWorldPosition(), point4, point1, point5);
|
||||
|
||||
#ifndef NDEBUG // BETA10 only
|
||||
#ifdef BETA10
|
||||
if (res) {
|
||||
assert(0);
|
||||
return -1;
|
||||
|
||||
Reference in New Issue
Block a user