mirror of
https://github.com/isledecomp/isle.git
synced 2025-10-23 08:24:16 +00:00
Clear unknowns in Isle
(#1660)
This commit is contained in:
@@ -156,12 +156,12 @@ public:
|
|||||||
void VTable0x60() override; // vtable+0x60
|
void VTable0x60() override; // vtable+0x60
|
||||||
MxBool Escape() override; // vtable+0x64
|
MxBool Escape() override; // vtable+0x64
|
||||||
void Enable(MxBool p_enable) override; // vtable+0x68
|
void Enable(MxBool p_enable) override; // vtable+0x68
|
||||||
virtual void VTable0x6c(LegoPathActor* p_actor); // vtable+0x6c
|
virtual void RemoveVehicle(LegoPathActor* p_actor); // vtable+0x6c
|
||||||
|
|
||||||
void SetDestLocation(LegoGameState::Area p_destLocation) { m_destLocation = p_destLocation; }
|
void SetDestLocation(LegoGameState::Area p_destLocation) { m_destLocation = p_destLocation; }
|
||||||
MxBool HasHelicopter() { return m_helicopter != NULL; }
|
MxBool HasHelicopter() { return m_helicopter != NULL; }
|
||||||
|
|
||||||
void FUN_10033350();
|
void SwitchToInfocenter();
|
||||||
|
|
||||||
friend class Act1State;
|
friend class Act1State;
|
||||||
|
|
||||||
@@ -175,13 +175,13 @@ protected:
|
|||||||
MxLong HandleTransitionEnd();
|
MxLong HandleTransitionEnd();
|
||||||
void HandleElevatorEndAction();
|
void HandleElevatorEndAction();
|
||||||
void UpdateGlobe();
|
void UpdateGlobe();
|
||||||
void FUN_10032620();
|
void CheckAreaExiting();
|
||||||
void CreateState();
|
void CreateState();
|
||||||
void FUN_10032d30(
|
void TransitionToOverlay(
|
||||||
IsleScript::Script p_script,
|
IsleScript::Script p_script,
|
||||||
JukeboxScript::Script p_music,
|
JukeboxScript::Script p_music,
|
||||||
const char* p_cameraLocation,
|
const char* p_cameraLocation,
|
||||||
MxBool p_und
|
MxBool p_setCamera
|
||||||
);
|
);
|
||||||
|
|
||||||
Act1State* m_act1state; // 0xf8
|
Act1State* m_act1state; // 0xf8
|
||||||
|
@@ -49,7 +49,7 @@ MxLong InfoCenterEntity::HandleClick(LegoEventNotificationParam& p_param)
|
|||||||
}
|
}
|
||||||
|
|
||||||
Isle* isle = (Isle*) FindWorld(*g_isleScript, IsleScript::c__Isle);
|
Isle* isle = (Isle*) FindWorld(*g_isleScript, IsleScript::c__Isle);
|
||||||
isle->FUN_10033350();
|
isle->SwitchToInfocenter();
|
||||||
isle->SetDestLocation(LegoGameState::Area::e_infomain);
|
isle->SetDestLocation(LegoGameState::Area::e_infomain);
|
||||||
|
|
||||||
Act1State* act1state = (Act1State*) GameState()->GetState("Act1State");
|
Act1State* act1state = (Act1State*) GameState()->GetState("Act1State");
|
||||||
|
@@ -1164,28 +1164,28 @@ void LegoGameState::Init()
|
|||||||
Helicopter* copter = (Helicopter*) isle->Find(*g_copterScript, CopterScript::c_Helicopter_Actor);
|
Helicopter* copter = (Helicopter*) isle->Find(*g_copterScript, CopterScript::c_Helicopter_Actor);
|
||||||
if (copter) {
|
if (copter) {
|
||||||
isle->RemoveActor(copter);
|
isle->RemoveActor(copter);
|
||||||
isle->VTable0x6c(copter);
|
isle->RemoveVehicle(copter);
|
||||||
delete copter;
|
delete copter;
|
||||||
}
|
}
|
||||||
|
|
||||||
DuneBuggy* dunebuggy = (DuneBuggy*) isle->Find(*g_dunecarScript, DunecarScript::c_DuneBugy_Actor);
|
DuneBuggy* dunebuggy = (DuneBuggy*) isle->Find(*g_dunecarScript, DunecarScript::c_DuneBugy_Actor);
|
||||||
if (dunebuggy) {
|
if (dunebuggy) {
|
||||||
isle->RemoveActor(dunebuggy);
|
isle->RemoveActor(dunebuggy);
|
||||||
isle->VTable0x6c(dunebuggy);
|
isle->RemoveVehicle(dunebuggy);
|
||||||
delete dunebuggy;
|
delete dunebuggy;
|
||||||
}
|
}
|
||||||
|
|
||||||
Jetski* jetski = (Jetski*) isle->Find(*g_jetskiScript, JetskiScript::c_Jetski_Actor);
|
Jetski* jetski = (Jetski*) isle->Find(*g_jetskiScript, JetskiScript::c_Jetski_Actor);
|
||||||
if (jetski) {
|
if (jetski) {
|
||||||
isle->RemoveActor(jetski);
|
isle->RemoveActor(jetski);
|
||||||
isle->VTable0x6c(jetski);
|
isle->RemoveVehicle(jetski);
|
||||||
delete jetski;
|
delete jetski;
|
||||||
}
|
}
|
||||||
|
|
||||||
RaceCar* racecar = (RaceCar*) isle->Find(*g_racecarScript, RacecarScript::c_RaceCar_Actor);
|
RaceCar* racecar = (RaceCar*) isle->Find(*g_racecarScript, RacecarScript::c_RaceCar_Actor);
|
||||||
if (racecar) {
|
if (racecar) {
|
||||||
isle->RemoveActor(racecar);
|
isle->RemoveActor(racecar);
|
||||||
isle->VTable0x6c(racecar);
|
isle->RemoveVehicle(racecar);
|
||||||
delete racecar;
|
delete racecar;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -81,7 +81,7 @@ Isle::~Isle()
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (UserActor() != NULL) {
|
if (UserActor() != NULL) {
|
||||||
VTable0x6c(UserActor());
|
RemoveVehicle(UserActor());
|
||||||
}
|
}
|
||||||
|
|
||||||
NotificationManager()->Unregister(this);
|
NotificationManager()->Unregister(this);
|
||||||
@@ -275,7 +275,7 @@ void Isle::ReadyWorld()
|
|||||||
}
|
}
|
||||||
else if (GameState()->GetLoadedAct() != LegoGameState::e_act1) {
|
else if (GameState()->GetLoadedAct() != LegoGameState::e_act1) {
|
||||||
EnableAnimations(TRUE);
|
EnableAnimations(TRUE);
|
||||||
FUN_10032620();
|
CheckAreaExiting();
|
||||||
m_act1state->PlaceActors();
|
m_act1state->PlaceActors();
|
||||||
Disable(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
|
Disable(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
|
||||||
}
|
}
|
||||||
@@ -584,7 +584,7 @@ void Isle::Enable(MxBool p_enable)
|
|||||||
actor->SetActorState(LegoPathActor::c_initial);
|
actor->SetActorState(LegoPathActor::c_initial);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
FUN_10032620();
|
CheckAreaExiting();
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (GameState()->m_currentArea) {
|
switch (GameState()->m_currentArea) {
|
||||||
@@ -858,7 +858,7 @@ void Isle::Enable(MxBool p_enable)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// FUNCTION: LEGO1 0x10032620
|
// FUNCTION: LEGO1 0x10032620
|
||||||
void Isle::FUN_10032620()
|
void Isle::CheckAreaExiting()
|
||||||
{
|
{
|
||||||
VideoManager()->Get3DManager()->SetFrustrum(90.0, 0.1, 250.0);
|
VideoManager()->Get3DManager()->SetFrustrum(90.0, 0.1, 250.0);
|
||||||
|
|
||||||
@@ -909,17 +909,27 @@ MxLong Isle::HandleTransitionEnd()
|
|||||||
case LegoGameState::e_elevride:
|
case LegoGameState::e_elevride:
|
||||||
m_act1state->m_unk0x01f = TRUE;
|
m_act1state->m_unk0x01f = TRUE;
|
||||||
VariableTable()->SetVariable("VISIBILITY", "Hide infocen");
|
VariableTable()->SetVariable("VISIBILITY", "Hide infocen");
|
||||||
FUN_10032d30(IsleScript::c_ElevRide_Background_Bitmap, JukeboxScript::c_Elevator_Music, "LCAMZI1,90", FALSE);
|
TransitionToOverlay(
|
||||||
|
IsleScript::c_ElevRide_Background_Bitmap,
|
||||||
|
JukeboxScript::c_Elevator_Music,
|
||||||
|
"LCAMZI1,90",
|
||||||
|
FALSE
|
||||||
|
);
|
||||||
break;
|
break;
|
||||||
case LegoGameState::e_elevride2:
|
case LegoGameState::e_elevride2:
|
||||||
FUN_10032d30(IsleScript::c_ElevRide_Background_Bitmap, JukeboxScript::c_Elevator_Music, "LCAMZI2,90", FALSE);
|
TransitionToOverlay(
|
||||||
|
IsleScript::c_ElevRide_Background_Bitmap,
|
||||||
|
JukeboxScript::c_Elevator_Music,
|
||||||
|
"LCAMZI2,90",
|
||||||
|
FALSE
|
||||||
|
);
|
||||||
|
|
||||||
if (m_destLocation == LegoGameState::e_undefined) {
|
if (m_destLocation == LegoGameState::e_undefined) {
|
||||||
((MxStillPresenter*) Find(m_atomId, IsleScript::c_Meter3_Bitmap))->Enable(TRUE);
|
((MxStillPresenter*) Find(m_atomId, IsleScript::c_Meter3_Bitmap))->Enable(TRUE);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case LegoGameState::e_elevopen:
|
case LegoGameState::e_elevopen:
|
||||||
FUN_10032d30(
|
TransitionToOverlay(
|
||||||
IsleScript::c_ElevOpen_Background_Bitmap,
|
IsleScript::c_ElevOpen_Background_Bitmap,
|
||||||
JukeboxScript::c_InfoCenter_3rd_Floor_Music,
|
JukeboxScript::c_InfoCenter_3rd_Floor_Music,
|
||||||
"LCAMZIS,90",
|
"LCAMZIS,90",
|
||||||
@@ -927,7 +937,7 @@ MxLong Isle::HandleTransitionEnd()
|
|||||||
);
|
);
|
||||||
break;
|
break;
|
||||||
case LegoGameState::e_seaview:
|
case LegoGameState::e_seaview:
|
||||||
FUN_10032d30(
|
TransitionToOverlay(
|
||||||
IsleScript::c_SeaView_Background_Bitmap,
|
IsleScript::c_SeaView_Background_Bitmap,
|
||||||
JukeboxScript::c_InfoCenter_3rd_Floor_Music,
|
JukeboxScript::c_InfoCenter_3rd_Floor_Music,
|
||||||
"LCAMZIE,90",
|
"LCAMZIE,90",
|
||||||
@@ -935,7 +945,7 @@ MxLong Isle::HandleTransitionEnd()
|
|||||||
);
|
);
|
||||||
break;
|
break;
|
||||||
case LegoGameState::e_observe:
|
case LegoGameState::e_observe:
|
||||||
FUN_10032d30(
|
TransitionToOverlay(
|
||||||
IsleScript::c_Observe_Background_Bitmap,
|
IsleScript::c_Observe_Background_Bitmap,
|
||||||
JukeboxScript::c_InfoCenter_3rd_Floor_Music,
|
JukeboxScript::c_InfoCenter_3rd_Floor_Music,
|
||||||
"LCAMZIW,90",
|
"LCAMZIW,90",
|
||||||
@@ -943,7 +953,7 @@ MxLong Isle::HandleTransitionEnd()
|
|||||||
);
|
);
|
||||||
break;
|
break;
|
||||||
case LegoGameState::e_elevdown:
|
case LegoGameState::e_elevdown:
|
||||||
FUN_10032d30(
|
TransitionToOverlay(
|
||||||
IsleScript::c_ElevDown_Background_Bitmap,
|
IsleScript::c_ElevDown_Background_Bitmap,
|
||||||
JukeboxScript::c_InfoCenter_3rd_Floor_Music,
|
JukeboxScript::c_InfoCenter_3rd_Floor_Music,
|
||||||
"LCAMZIN,90",
|
"LCAMZIN,90",
|
||||||
@@ -953,7 +963,7 @@ MxLong Isle::HandleTransitionEnd()
|
|||||||
case LegoGameState::e_garadoor:
|
case LegoGameState::e_garadoor:
|
||||||
m_act1state->m_unk0x01f = TRUE;
|
m_act1state->m_unk0x01f = TRUE;
|
||||||
VariableTable()->SetVariable("VISIBILITY", "Hide Gas");
|
VariableTable()->SetVariable("VISIBILITY", "Hide Gas");
|
||||||
FUN_10032d30(IsleScript::c_GaraDoor_Background_Bitmap, JukeboxScript::c_JBMusic2, "LCAMZG1,90", FALSE);
|
TransitionToOverlay(IsleScript::c_GaraDoor_Background_Bitmap, JukeboxScript::c_JBMusic2, "LCAMZG1,90", FALSE);
|
||||||
break;
|
break;
|
||||||
case LegoGameState::e_garageExited:
|
case LegoGameState::e_garageExited:
|
||||||
GameState()->SwitchArea(m_destLocation);
|
GameState()->SwitchArea(m_destLocation);
|
||||||
@@ -978,7 +988,7 @@ MxLong Isle::HandleTransitionEnd()
|
|||||||
case LegoGameState::e_polidoor:
|
case LegoGameState::e_polidoor:
|
||||||
m_act1state->m_unk0x01f = TRUE;
|
m_act1state->m_unk0x01f = TRUE;
|
||||||
VariableTable()->SetVariable("VISIBILITY", "Hide Policsta");
|
VariableTable()->SetVariable("VISIBILITY", "Hide Policsta");
|
||||||
FUN_10032d30(
|
TransitionToOverlay(
|
||||||
IsleScript::c_PoliDoor_Background_Bitmap,
|
IsleScript::c_PoliDoor_Background_Bitmap,
|
||||||
JukeboxScript::c_PoliceStation_Music,
|
JukeboxScript::c_PoliceStation_Music,
|
||||||
"LCAMZP1,90",
|
"LCAMZP1,90",
|
||||||
@@ -987,7 +997,7 @@ MxLong Isle::HandleTransitionEnd()
|
|||||||
break;
|
break;
|
||||||
case LegoGameState::e_bike:
|
case LegoGameState::e_bike:
|
||||||
m_act1state->m_unk0x01f = TRUE;
|
m_act1state->m_unk0x01f = TRUE;
|
||||||
FUN_10032d30(IsleScript::c_BikeDashboard_Bitmap, JukeboxScript::c_MusicTheme1, NULL, TRUE);
|
TransitionToOverlay(IsleScript::c_BikeDashboard_Bitmap, JukeboxScript::c_MusicTheme1, NULL, TRUE);
|
||||||
|
|
||||||
if (!m_act1state->m_unk0x01f) {
|
if (!m_act1state->m_unk0x01f) {
|
||||||
m_bike->ActivateSceneActions();
|
m_bike->ActivateSceneActions();
|
||||||
@@ -995,7 +1005,7 @@ MxLong Isle::HandleTransitionEnd()
|
|||||||
break;
|
break;
|
||||||
case LegoGameState::e_dunecar:
|
case LegoGameState::e_dunecar:
|
||||||
m_act1state->m_unk0x01f = TRUE;
|
m_act1state->m_unk0x01f = TRUE;
|
||||||
FUN_10032d30(IsleScript::c_DuneCarFuelMeter, JukeboxScript::c_MusicTheme1, NULL, TRUE);
|
TransitionToOverlay(IsleScript::c_DuneCarFuelMeter, JukeboxScript::c_MusicTheme1, NULL, TRUE);
|
||||||
|
|
||||||
if (!m_act1state->m_unk0x01f) {
|
if (!m_act1state->m_unk0x01f) {
|
||||||
m_dunebuggy->ActivateSceneActions();
|
m_dunebuggy->ActivateSceneActions();
|
||||||
@@ -1003,7 +1013,7 @@ MxLong Isle::HandleTransitionEnd()
|
|||||||
break;
|
break;
|
||||||
case LegoGameState::e_motocycle:
|
case LegoGameState::e_motocycle:
|
||||||
m_act1state->m_unk0x01f = TRUE;
|
m_act1state->m_unk0x01f = TRUE;
|
||||||
FUN_10032d30(IsleScript::c_MotoBikeDashboard_Bitmap, JukeboxScript::c_MusicTheme1, NULL, TRUE);
|
TransitionToOverlay(IsleScript::c_MotoBikeDashboard_Bitmap, JukeboxScript::c_MusicTheme1, NULL, TRUE);
|
||||||
|
|
||||||
if (!m_act1state->m_unk0x01f) {
|
if (!m_act1state->m_unk0x01f) {
|
||||||
m_motocycle->ActivateSceneActions();
|
m_motocycle->ActivateSceneActions();
|
||||||
@@ -1011,11 +1021,11 @@ MxLong Isle::HandleTransitionEnd()
|
|||||||
break;
|
break;
|
||||||
case LegoGameState::e_copter:
|
case LegoGameState::e_copter:
|
||||||
m_act1state->m_unk0x01f = TRUE;
|
m_act1state->m_unk0x01f = TRUE;
|
||||||
FUN_10032d30(IsleScript::c_HelicopterDashboard_Bitmap, JukeboxScript::c_MusicTheme1, NULL, TRUE);
|
TransitionToOverlay(IsleScript::c_HelicopterDashboard_Bitmap, JukeboxScript::c_MusicTheme1, NULL, TRUE);
|
||||||
break;
|
break;
|
||||||
case LegoGameState::e_skateboard:
|
case LegoGameState::e_skateboard:
|
||||||
m_act1state->m_unk0x01f = TRUE;
|
m_act1state->m_unk0x01f = TRUE;
|
||||||
FUN_10032d30(IsleScript::c_SkatePizza_Bitmap, JukeboxScript::c_MusicTheme1, NULL, TRUE);
|
TransitionToOverlay(IsleScript::c_SkatePizza_Bitmap, JukeboxScript::c_MusicTheme1, NULL, TRUE);
|
||||||
|
|
||||||
if (!m_act1state->m_unk0x01f) {
|
if (!m_act1state->m_unk0x01f) {
|
||||||
m_skateboard->ActivateSceneActions();
|
m_skateboard->ActivateSceneActions();
|
||||||
@@ -1024,7 +1034,7 @@ MxLong Isle::HandleTransitionEnd()
|
|||||||
case LegoGameState::e_ambulance:
|
case LegoGameState::e_ambulance:
|
||||||
m_act1state->m_unk0x01f = TRUE;
|
m_act1state->m_unk0x01f = TRUE;
|
||||||
m_act1state->m_state = Act1State::e_ambulance;
|
m_act1state->m_state = Act1State::e_ambulance;
|
||||||
FUN_10032d30(IsleScript::c_AmbulanceFuelMeter, JukeboxScript::c_MusicTheme1, NULL, TRUE);
|
TransitionToOverlay(IsleScript::c_AmbulanceFuelMeter, JukeboxScript::c_MusicTheme1, NULL, TRUE);
|
||||||
|
|
||||||
if (!m_act1state->m_unk0x01f) {
|
if (!m_act1state->m_unk0x01f) {
|
||||||
m_ambulance->ActivateSceneActions();
|
m_ambulance->ActivateSceneActions();
|
||||||
@@ -1033,7 +1043,7 @@ MxLong Isle::HandleTransitionEnd()
|
|||||||
case LegoGameState::e_towtrack:
|
case LegoGameState::e_towtrack:
|
||||||
m_act1state->m_unk0x01f = TRUE;
|
m_act1state->m_unk0x01f = TRUE;
|
||||||
m_act1state->m_state = Act1State::e_towtrack;
|
m_act1state->m_state = Act1State::e_towtrack;
|
||||||
FUN_10032d30(IsleScript::c_TowFuelMeter, JukeboxScript::c_MusicTheme1, NULL, TRUE);
|
TransitionToOverlay(IsleScript::c_TowFuelMeter, JukeboxScript::c_MusicTheme1, NULL, TRUE);
|
||||||
|
|
||||||
if (!m_act1state->m_unk0x01f) {
|
if (!m_act1state->m_unk0x01f) {
|
||||||
m_towtrack->ActivateSceneActions();
|
m_towtrack->ActivateSceneActions();
|
||||||
@@ -1041,7 +1051,7 @@ MxLong Isle::HandleTransitionEnd()
|
|||||||
break;
|
break;
|
||||||
case LegoGameState::e_jetski:
|
case LegoGameState::e_jetski:
|
||||||
m_act1state->m_unk0x01f = TRUE;
|
m_act1state->m_unk0x01f = TRUE;
|
||||||
FUN_10032d30((IsleScript::Script) m_jetski->GetUnknown0x160(), JukeboxScript::c_MusicTheme1, NULL, TRUE);
|
TransitionToOverlay((IsleScript::Script) m_jetski->GetUnknown0x160(), JukeboxScript::c_MusicTheme1, NULL, TRUE);
|
||||||
|
|
||||||
if (!m_act1state->m_unk0x01f) {
|
if (!m_act1state->m_unk0x01f) {
|
||||||
m_jetski->ActivateSceneActions();
|
m_jetski->ActivateSceneActions();
|
||||||
@@ -1056,11 +1066,11 @@ MxLong Isle::HandleTransitionEnd()
|
|||||||
}
|
}
|
||||||
|
|
||||||
// FUNCTION: LEGO1 0x10032d30
|
// FUNCTION: LEGO1 0x10032d30
|
||||||
void Isle::FUN_10032d30(
|
void Isle::TransitionToOverlay(
|
||||||
IsleScript::Script p_script,
|
IsleScript::Script p_script,
|
||||||
JukeboxScript::Script p_music,
|
JukeboxScript::Script p_music,
|
||||||
const char* p_cameraLocation,
|
const char* p_cameraLocation,
|
||||||
MxBool p_und
|
MxBool p_setCamera
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
if (m_act1state->m_unk0x01f) {
|
if (m_act1state->m_unk0x01f) {
|
||||||
@@ -1071,7 +1081,7 @@ void Isle::FUN_10032d30(
|
|||||||
PlayMusic(p_music);
|
PlayMusic(p_music);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (p_und) {
|
if (p_setCamera) {
|
||||||
InputManager()->SetCamera(m_cameraController);
|
InputManager()->SetCamera(m_cameraController);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
@@ -1143,7 +1153,7 @@ void Isle::Add(MxCore* p_object)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// FUNCTION: LEGO1 0x10033050
|
// FUNCTION: LEGO1 0x10033050
|
||||||
void Isle::VTable0x6c(LegoPathActor* p_actor)
|
void Isle::RemoveVehicle(LegoPathActor* p_actor)
|
||||||
{
|
{
|
||||||
LegoWorld::Remove(p_actor);
|
LegoWorld::Remove(p_actor);
|
||||||
|
|
||||||
@@ -1245,7 +1255,7 @@ MxBool Isle::Escape()
|
|||||||
}
|
}
|
||||||
|
|
||||||
// FUNCTION: LEGO1 0x10033350
|
// FUNCTION: LEGO1 0x10033350
|
||||||
void Isle::FUN_10033350()
|
void Isle::SwitchToInfocenter()
|
||||||
{
|
{
|
||||||
if (m_act1state->m_state == Act1State::e_ambulance) {
|
if (m_act1state->m_state == Act1State::e_ambulance) {
|
||||||
if (UserActor() != NULL && !UserActor()->IsA("Ambulance")) {
|
if (UserActor() != NULL && !UserActor()->IsA("Ambulance")) {
|
||||||
@@ -1572,7 +1582,7 @@ void Act1State::RemoveActors()
|
|||||||
isle->m_helicopter->UpdatePlane(m_helicopterPlane);
|
isle->m_helicopter->UpdatePlane(m_helicopterPlane);
|
||||||
m_helicopter = isle->m_helicopter;
|
m_helicopter = isle->m_helicopter;
|
||||||
isle->RemoveActor(m_helicopter);
|
isle->RemoveActor(m_helicopter);
|
||||||
isle->VTable0x6c(m_helicopter);
|
isle->RemoveVehicle(m_helicopter);
|
||||||
m_helicopter->SetBoundary(NULL);
|
m_helicopter->SetBoundary(NULL);
|
||||||
m_helicopter->SetController(NULL);
|
m_helicopter->SetController(NULL);
|
||||||
}
|
}
|
||||||
@@ -1581,7 +1591,7 @@ void Act1State::RemoveActors()
|
|||||||
isle->m_jetski->UpdatePlane(m_jetskiPlane);
|
isle->m_jetski->UpdatePlane(m_jetskiPlane);
|
||||||
m_jetski = isle->m_jetski;
|
m_jetski = isle->m_jetski;
|
||||||
isle->RemoveActor(m_jetski);
|
isle->RemoveActor(m_jetski);
|
||||||
isle->VTable0x6c(m_jetski);
|
isle->RemoveVehicle(m_jetski);
|
||||||
m_jetski->SetBoundary(NULL);
|
m_jetski->SetBoundary(NULL);
|
||||||
m_jetski->SetController(NULL);
|
m_jetski->SetController(NULL);
|
||||||
}
|
}
|
||||||
@@ -1590,7 +1600,7 @@ void Act1State::RemoveActors()
|
|||||||
isle->m_dunebuggy->UpdatePlane(m_dunebuggyPlane);
|
isle->m_dunebuggy->UpdatePlane(m_dunebuggyPlane);
|
||||||
m_dunebuggy = isle->m_dunebuggy;
|
m_dunebuggy = isle->m_dunebuggy;
|
||||||
isle->RemoveActor(m_dunebuggy);
|
isle->RemoveActor(m_dunebuggy);
|
||||||
isle->VTable0x6c(m_dunebuggy);
|
isle->RemoveVehicle(m_dunebuggy);
|
||||||
m_dunebuggy->SetBoundary(NULL);
|
m_dunebuggy->SetBoundary(NULL);
|
||||||
m_dunebuggy->SetController(NULL);
|
m_dunebuggy->SetController(NULL);
|
||||||
}
|
}
|
||||||
@@ -1599,7 +1609,7 @@ void Act1State::RemoveActors()
|
|||||||
isle->m_racecar->UpdatePlane(m_racecarPlane);
|
isle->m_racecar->UpdatePlane(m_racecarPlane);
|
||||||
m_racecar = isle->m_racecar;
|
m_racecar = isle->m_racecar;
|
||||||
isle->RemoveActor(m_racecar);
|
isle->RemoveActor(m_racecar);
|
||||||
isle->VTable0x6c(m_racecar);
|
isle->RemoveVehicle(m_racecar);
|
||||||
m_racecar->SetBoundary(NULL);
|
m_racecar->SetBoundary(NULL);
|
||||||
m_racecar->SetController(NULL);
|
m_racecar->SetController(NULL);
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user