mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-23 00:14:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Name spawn areas (#1636)

Browse Source
This commit is contained in:
Fabian Neundorf
2025-07-19 16:29:34 +02:00
committed by GitHub
parent 73d9ef1d80
commit 9e860d910c
6 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
LEGO1/lego/legoomni/include/legogamestate.h
View File

@@ -103,19 +103,19 @@ public:
e_dunecarbuild, e_dunecarbuild,
e_jetskibuild, e_jetskibuild,
e_racecarbuild, e_racecarbuild,
e_unk40, e_helicopterSpawn,
e_unk41, e_unk41,
e_unk42, e_unk42,
e_unk43, e_dunebuggySpawn,
e_unk44, e_racecarSpawn,
e_unk45, e_jetskiSpawn,
e_act2main, e_act2main,
e_act3script, e_act3script,
e_unk48, e_unk48,
e_unk49, e_unk49,
e_unk50, e_unk50,
e_unk51, e_unk51,
e_unk52, e_towTrackHookedUp,
e_jukeboxw, e_jukeboxw,
e_jukeboxExterior, e_jukeboxExterior,
e_unk55, e_unk55,

2
LEGO1/lego/legoomni/src/actors/helicopter.cpp
View File

@@ -82,7 +82,7 @@ void Helicopter::Exit()
if (GameState()->GetCurrentAct() == LegoGameState::e_act1) { if (GameState()->GetCurrentAct() == LegoGameState::e_act1) {
SpawnPlayer( SpawnPlayer(
LegoGameState::e_unk40, LegoGameState::e_helicopterSpawn,
TRUE, TRUE,
IslePathActor::c_spawnBit1 | IslePathActor::c_playMusic | IslePathActor::c_spawnBit3 IslePathActor::c_spawnBit1 | IslePathActor::c_playMusic | IslePathActor::c_spawnBit3
); );

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

@@ -355,7 +355,7 @@ void IslePathActor::RegisterSpawnLocations()
JukeboxScript::c_PoliceStation_Music JukeboxScript::c_PoliceStation_Music
); );
g_spawnLocations[16] = SpawnLocation( g_spawnLocations[16] = SpawnLocation(
LegoGameState::e_unk40, LegoGameState::e_helicopterSpawn,
g_isleScript, g_isleScript,
0, 0,
"edg02_51", "edg02_51",
@@ -379,7 +379,7 @@ void IslePathActor::RegisterSpawnLocations()
JukeboxScript::c_noneJukebox JukeboxScript::c_noneJukebox
); );
g_spawnLocations[18] = SpawnLocation( g_spawnLocations[18] = SpawnLocation(
LegoGameState::e_unk43, LegoGameState::e_dunebuggySpawn,
g_isleScript, g_isleScript,
0, 0,
"edg02_35", "edg02_35",
@@ -391,7 +391,7 @@ void IslePathActor::RegisterSpawnLocations()
JukeboxScript::c_noneJukebox JukeboxScript::c_noneJukebox
); );
g_spawnLocations[19] = SpawnLocation( g_spawnLocations[19] = SpawnLocation(
LegoGameState::e_unk44, LegoGameState::e_racecarSpawn,
g_isleScript, g_isleScript,
0, 0,
"EDG03_01", "EDG03_01",
@@ -403,7 +403,7 @@ void IslePathActor::RegisterSpawnLocations()
JukeboxScript::c_noneJukebox JukeboxScript::c_noneJukebox
); );
g_spawnLocations[20] = SpawnLocation( g_spawnLocations[20] = SpawnLocation(
LegoGameState::e_unk45, LegoGameState::e_jetskiSpawn,
g_isleScript, g_isleScript,
0, 0,
"edg10_70", "edg10_70",
@@ -475,7 +475,7 @@ void IslePathActor::RegisterSpawnLocations()
JukeboxScript::c_noneJukebox JukeboxScript::c_noneJukebox
); );
g_spawnLocations[26] = SpawnLocation( g_spawnLocations[26] = SpawnLocation(
LegoGameState::e_unk52, LegoGameState::e_towTrackHookedUp,
g_isleScript, g_isleScript,
0, 0,
"edg02_19", "edg02_19",

2
LEGO1/lego/legoomni/src/actors/jetski.cpp
View File

@@ -67,7 +67,7 @@ void Jetski::Animate(float p_time)
// FUNCTION: LEGO1 0x1007e6f0 // FUNCTION: LEGO1 0x1007e6f0
void Jetski::Exit() void Jetski::Exit()
{ {
SpawnPlayer(LegoGameState::e_unk45, FALSE, c_spawnBit1 | c_playMusic | c_spawnBit3); SpawnPlayer(LegoGameState::e_jetskiSpawn, FALSE, c_spawnBit1 | c_playMusic | c_spawnBit3);
IslePathActor::Exit(); IslePathActor::Exit();
GameState()->m_currentArea = LegoGameState::e_jetski; GameState()->m_currentArea = LegoGameState::e_jetski;
RemoveFromWorld(); RemoveFromWorld();

2
LEGO1/lego/legoomni/src/actors/towtrack.cpp
View File

@@ -432,7 +432,7 @@ MxLong TowTrack::HandleClick()
} }
if (m_state->m_state == TowTrackMissionState::e_hookedUp) { if (m_state->m_state == TowTrackMissionState::e_hookedUp) {
SpawnPlayer(LegoGameState::e_unk52, TRUE, 0); SpawnPlayer(LegoGameState::e_towTrackHookedUp, TRUE, 0);
FindROI("rcred")->SetVisibility(FALSE); FindROI("rcred")->SetVisibility(FALSE);
} }
else { else {

10
LEGO1/lego/legoomni/src/worlds/isle.cpp
View File

@@ -577,7 +577,7 @@ void Isle::Enable(MxBool p_enable)
if (UserActor() != NULL && UserActor()->IsA("Jetski")) { if (UserActor() != NULL && UserActor()->IsA("Jetski")) {
IslePathActor* actor = (IslePathActor*) UserActor(); IslePathActor* actor = (IslePathActor*) UserActor();
actor->SpawnPlayer( actor->SpawnPlayer(
LegoGameState::e_unk45, LegoGameState::e_jetskiSpawn,
FALSE, FALSE,
IslePathActor::c_spawnBit1 | IslePathActor::c_playMusic | IslePathActor::c_spawnBit3 IslePathActor::c_spawnBit1 | IslePathActor::c_playMusic | IslePathActor::c_spawnBit3
); );
@@ -1633,7 +1633,7 @@ void Act1State::PlaceActors()
if (m_helicopter != NULL) { if (m_helicopter != NULL) {
if (!m_helicopterPlane.IsPresent()) { if (!m_helicopterPlane.IsPresent()) {
m_helicopter->SpawnPlayer(LegoGameState::e_unk40, FALSE, 0); m_helicopter->SpawnPlayer(LegoGameState::e_helicopterSpawn, FALSE, 0);
} }
else { else {
isle->PlaceActor(m_helicopter, m_helicopterPlane.GetName(), 0, 0.5f, 1, 0.5f); isle->PlaceActor(m_helicopter, m_helicopterPlane.GetName(), 0, 0.5f, 1, 0.5f);
@@ -1673,7 +1673,7 @@ void Act1State::PlaceActors()
if (m_jetski != NULL) { if (m_jetski != NULL) {
if (!m_jetskiPlane.IsPresent()) { if (!m_jetskiPlane.IsPresent()) {
m_jetski->SpawnPlayer(LegoGameState::e_unk45, FALSE, 0); m_jetski->SpawnPlayer(LegoGameState::e_jetskiSpawn, FALSE, 0);
} }
else { else {
isle->PlaceActor(m_jetski, m_jetskiPlane.GetName(), 0, 0.5f, 1, 0.5f); isle->PlaceActor(m_jetski, m_jetskiPlane.GetName(), 0, 0.5f, 1, 0.5f);
@@ -1703,7 +1703,7 @@ void Act1State::PlaceActors()
if (m_dunebuggy != NULL) { if (m_dunebuggy != NULL) {
if (!m_dunebuggyPlane.IsPresent()) { if (!m_dunebuggyPlane.IsPresent()) {
m_dunebuggy->SpawnPlayer(LegoGameState::e_unk43, FALSE, 0); m_dunebuggy->SpawnPlayer(LegoGameState::e_dunebuggySpawn, FALSE, 0);
} }
else { else {
isle->PlaceActor(m_dunebuggy, m_dunebuggyPlane.GetName(), 0, 0.5f, 1, 0.5f); isle->PlaceActor(m_dunebuggy, m_dunebuggyPlane.GetName(), 0, 0.5f, 1, 0.5f);
@@ -1731,7 +1731,7 @@ void Act1State::PlaceActors()
if (m_racecar != NULL) { if (m_racecar != NULL) {
if (!m_racecarPlane.IsPresent()) { if (!m_racecarPlane.IsPresent()) {
m_racecar->SpawnPlayer(LegoGameState::e_unk44, FALSE, 0); m_racecar->SpawnPlayer(LegoGameState::e_racecarSpawn, FALSE, 0);
} }
else { else {
isle->PlaceActor(m_racecar, m_racecarPlane.GetName(), 0, 0.5f, 1, 0.5f); isle->PlaceActor(m_racecar, m_racecarPlane.GetName(), 0, 0.5f, 1, 0.5f);