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

Implement/match LegoPathActor::ParseAction (#946)

Browse Source 
* Implement/match LegoPathActor::ParseAction

* Fix naming

* Space
This commit is contained in:
Christian Semmler
2024-05-24 13:07:45 -04:00
committed by GitHub
parent 6774784b37
commit db90807d53
25 changed files with 137 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
LEGO1/lego/legoomni/src/common/legogamestate.cpp
View File

@@ -172,7 +172,7 @@ void LegoGameState::SetActor(MxU8 p_actorId)
m_actorId = p_actorId;
}
IslePathActor* oldActor = CurrentActor();
LegoPathActor* oldActor = CurrentActor();
SetCurrentActor(NULL);
IslePathActor* newActor = new IslePathActor();
@@ -199,7 +199,7 @@ void LegoGameState::SetActor(MxU8 p_actorId)
// FUNCTION: LEGO1 0x10039910
void LegoGameState::RemoveActor()
{
IslePathActor* actor = CurrentActor();
LegoPathActor* actor = CurrentActor();
SetCurrentActor(NULL);
delete actor;
m_actorId = 0;
@@ -209,7 +209,7 @@ void LegoGameState::RemoveActor()
void LegoGameState::ResetROI()
{
if (m_actorId) {
IslePathActor* actor = CurrentActor();
LegoPathActor* actor = CurrentActor();
if (actor) {
LegoROI* roi = actor->GetROI();
@@ -906,11 +906,12 @@ void LegoGameState::SwitchArea(Area p_area)
AnimationManager()->Resume();
}
CurrentActor()->SpawnPlayer(
p_area,
TRUE,
IslePathActor::c_spawnBit1 | IslePathActor::c_playMusic | IslePathActor::c_spawnBit3
);
((IslePathActor*) CurrentActor())
->SpawnPlayer(
p_area,
TRUE,
IslePathActor::c_spawnBit1 | IslePathActor::c_playMusic | IslePathActor::c_spawnBit3
);
break;
}
case e_hospital:
@@ -922,11 +923,12 @@ void LegoGameState::SwitchArea(Area p_area)
SetCameraControllerFromIsle();
CurrentActor()->ResetWorldTransform(TRUE);
AnimationManager()->Resume();
CurrentActor()->SpawnPlayer(
p_area,
TRUE,
IslePathActor::c_spawnBit1 | IslePathActor::c_playMusic | IslePathActor::c_spawnBit3
);
((IslePathActor*) CurrentActor())
->SpawnPlayer(
p_area,
TRUE,
IslePathActor::c_spawnBit1 | IslePathActor::c_playMusic | IslePathActor::c_spawnBit3
);
break;
case e_police:
VideoManager()->SetUnk0x554(TRUE);