isledecomp/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2024-11-26 17:36:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

rename MxTransitionManager transitions (#655)

Browse source
This commit is contained in:
Ramen2X 2024-03-11 04:57:58 -04:00 committed by GitHub
parent 5eb74c06fd
commit 6dfee432ea
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 43 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
LEGO1/lego/legoomni/include/mxtransitionmanager.h
View file

@ -37,8 +37,8 @@ class MxTransitionManager : public MxCore {
e_notTransitioning = 0, e_notTransitioning = 0,
e_noAnimation, e_noAnimation,
e_dissolve, e_dissolve,
e_pixelation, e_mosaic,
e_screenWipe, e_wipeDown,
e_windows, e_windows,
e_broken // Unknown what this is supposed to be, it locks the game up e_broken // Unknown what this is supposed to be, it locks the game up
}; };
@ -53,11 +53,11 @@ class MxTransitionManager : public MxCore {
private: private:
void EndTransition(MxBool p_notifyWorld); void EndTransition(MxBool p_notifyWorld);
void TransitionNone(); void TransitionNone();
void TransitionDissolve(); void DissolveTransition();
void TransitionPixelation(); void MosaicTransition();
void TransitionWipe(); void WipeDownTransition();
void TransitionWindows(); void WindowsTransition();
void TransitionBroken(); void BrokenTransition();
void SubmitCopyRect(LPDDSURFACEDESC p_ddsc); void SubmitCopyRect(LPDDSURFACEDESC p_ddsc);
void SetupCopyRect(LPDDSURFACEDESC p_ddsc); void SetupCopyRect(LPDDSURFACEDESC p_ddsc);

6
LEGO1/lego/legoomni/src/actors/helicopter.cpp
View file

@ -116,7 +116,7 @@ MxU32 Helicopter::VTable0xcc()
VTable0xe8(0x29, TRUE, 7); VTable0xe8(0x29, TRUE, 7);
((Isle*) CurrentWorld())->SetUnknown13c(0x3c); ((Isle*) CurrentWorld())->SetUnknown13c(0x3c);
FUN_10015820(TRUE, 0); FUN_10015820(TRUE, 0);
TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 50, FALSE, TRUE); TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, TRUE);
SetUnknownDC(4); SetUnknownDC(4);
PlayMusic(JukeboxScript::c_Jail_Music); PlayMusic(JukeboxScript::c_Jail_Music);
break; break;
@ -158,7 +158,7 @@ MxU32 Helicopter::VTable0xd4(LegoControlManagerEvent& p_param)
case 0x17: case 0x17:
if (*g_act3Script == script) { if (*g_act3Script == script) {
((Act3*) CurrentWorld())->SetUnkown4270(2); ((Act3*) CurrentWorld())->SetUnkown4270(2);
TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 50, FALSE, FALSE); TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, FALSE);
} }
else if (m_state->GetUnkown8() != 0) { else if (m_state->GetUnkown8() != 0) {
break; break;
@ -230,7 +230,7 @@ MxU32 Helicopter::VTable0xd4(LegoControlManagerEvent& p_param)
case 0x1c: case 0x1c:
if (GameState()->GetCurrentAct() == LegoGameState::e_act1) { if (GameState()->GetCurrentAct() == LegoGameState::e_act1) {
((Isle*) CurrentWorld())->SetUnknown13c(2); ((Isle*) CurrentWorld())->SetUnknown13c(2);
TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 50, FALSE, FALSE); TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, FALSE);
VTable0xe4(); VTable0xe4();
} }
ret = 1; ret = 1;

2
LEGO1/lego/legoomni/src/actors/jukeboxentity.cpp
View file

@ -37,7 +37,7 @@ MxLong JukeBoxEntity::Notify(MxParam& p_param)
} }
((Isle*) FindWorld(*g_isleScript, 0))->SetUnknown13c(0x35); ((Isle*) FindWorld(*g_isleScript, 0))->SetUnknown13c(0x35);
TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 50, FALSE, FALSE); TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, FALSE);
return 1; return 1;
} }

24
LEGO1/lego/legoomni/src/common/mxtransitionmanager.cpp
View file

@ -64,19 +64,19 @@ MxResult MxTransitionManager::Tickle()
TransitionNone(); TransitionNone();
break; break;
case e_dissolve: case e_dissolve:
TransitionDissolve(); DissolveTransition();
break; break;
case e_pixelation: case e_mosaic:
TransitionPixelation(); MosaicTransition();
break; break;
case e_screenWipe: case e_wipeDown:
TransitionWipe(); WipeDownTransition();
break; break;
case e_windows: case e_windows:
TransitionWindows(); WindowsTransition();
break; break;
case e_broken: case e_broken:
TransitionBroken(); BrokenTransition();
break; break;
} }
return SUCCESS; return SUCCESS;
@ -165,7 +165,7 @@ void MxTransitionManager::TransitionNone()
} }
// FUNCTION: LEGO1 0x1004bd10 // FUNCTION: LEGO1 0x1004bd10
void MxTransitionManager::TransitionDissolve() void MxTransitionManager::DissolveTransition()
{ {
// If the animation is finished // If the animation is finished
if (m_animationTimer == 40) { if (m_animationTimer == 40) {
@ -251,7 +251,7 @@ void MxTransitionManager::TransitionDissolve()
} }
// FUNCTION: LEGO1 0x1004bed0 // FUNCTION: LEGO1 0x1004bed0
void MxTransitionManager::TransitionPixelation() void MxTransitionManager::MosaicTransition()
{ {
if (m_animationTimer == 16) { if (m_animationTimer == 16) {
m_animationTimer = 0; m_animationTimer = 0;
@ -355,7 +355,7 @@ void MxTransitionManager::TransitionPixelation()
} }
// FUNCTION: LEGO1 0x1004c170 // FUNCTION: LEGO1 0x1004c170
void MxTransitionManager::TransitionWipe() void MxTransitionManager::WipeDownTransition()
{ {
// If the animation is finished // If the animation is finished
if (m_animationTimer == 240) { if (m_animationTimer == 240) {
@ -394,7 +394,7 @@ void MxTransitionManager::TransitionWipe()
} }
// FUNCTION: LEGO1 0x1004c270 // FUNCTION: LEGO1 0x1004c270
void MxTransitionManager::TransitionWindows() void MxTransitionManager::WindowsTransition()
{ {
if (m_animationTimer == 240) { if (m_animationTimer == 240) {
m_animationTimer = 0; m_animationTimer = 0;
@ -440,7 +440,7 @@ void MxTransitionManager::TransitionWindows()
} }
// FUNCTION: LEGO1 0x1004c3e0 // FUNCTION: LEGO1 0x1004c3e0
void MxTransitionManager::TransitionBroken() void MxTransitionManager::BrokenTransition()
{ {
// This function has no actual animation logic. // This function has no actual animation logic.
// It also never calls EndTransition to // It also never calls EndTransition to

6
LEGO1/lego/legoomni/src/worlds/elevatorbottom.cpp
View file

@ -85,12 +85,12 @@ MxLong ElevatorBottom::HandleClick(LegoControlManagerEvent& p_param)
switch (p_param.GetClickedObjectId()) { switch (p_param.GetClickedObjectId()) {
case 1: case 1:
m_unk0xf8 = LegoGameState::e_infodoor; m_unk0xf8 = LegoGameState::e_infodoor;
TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 50, FALSE, FALSE); TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, FALSE);
result = 1; result = 1;
break; break;
case 2: case 2:
m_unk0xf8 = LegoGameState::e_infomain; m_unk0xf8 = LegoGameState::e_infomain;
TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 50, FALSE, FALSE); TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, FALSE);
result = 1; result = 1;
break; break;
case 3: case 3:
@ -103,7 +103,7 @@ MxLong ElevatorBottom::HandleClick(LegoControlManagerEvent& p_param)
state->SetUnknown1c(1); state->SetUnknown1c(1);
m_unk0xf8 = LegoGameState::e_elevride; m_unk0xf8 = LegoGameState::e_elevride;
TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 50, FALSE, FALSE); TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, FALSE);
VariableTable()->SetVariable(g_varCAMERALOCATION, "LCAMZI1,90"); VariableTable()->SetVariable(g_varCAMERALOCATION, "LCAMZI1,90");
result = 1; result = 1;
break; break;

2
LEGO1/lego/legoomni/src/worlds/historybook.cpp
View file

@ -51,7 +51,7 @@ MxLong HistoryBook::Notify(MxParam& p_param)
switch (((MxNotificationParam&) p_param).GetNotification()) { switch (((MxNotificationParam&) p_param).GetNotification()) {
case c_notificationButtonUp: case c_notificationButtonUp:
m_transitionDestination = LegoGameState::Area::e_infoscor; m_transitionDestination = LegoGameState::Area::e_infoscor;
TransitionManager()->StartTransition(MxTransitionManager::TransitionType::e_pixelation, 50, FALSE, FALSE); TransitionManager()->StartTransition(MxTransitionManager::TransitionType::e_mosaic, 50, FALSE, FALSE);
break; break;
case c_notificationTransitioned: case c_notificationTransitioned:
GameState()->SwitchArea(m_transitionDestination); GameState()->SwitchArea(m_transitionDestination);

10
LEGO1/lego/legoomni/src/worlds/infocenter.cpp
View file

@ -301,7 +301,7 @@ MxLong Infocenter::HandleEndAction(MxEndActionNotificationParam& p_param)
case 4: case 4:
if (action->GetObjectId() == InfomainScript::c_GoTo_RegBook || if (action->GetObjectId() == InfomainScript::c_GoTo_RegBook ||
action->GetObjectId() == InfomainScript::c_GoTo_RegBook_Red) { action->GetObjectId() == InfomainScript::c_GoTo_RegBook_Red) {
TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 50, FALSE, FALSE); TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, FALSE);
m_infocenterState->SetUnknown0x74(14); m_infocenterState->SetUnknown0x74(14);
return 1; return 1;
} }
@ -311,7 +311,7 @@ MxLong Infocenter::HandleEndAction(MxEndActionNotificationParam& p_param)
if (GameState()->GetCurrentAct() != LegoGameState::e_act3 && m_selectedCharacter != e_noCharacter) { if (GameState()->GetCurrentAct() != LegoGameState::e_act3 && m_selectedCharacter != e_noCharacter) {
GameState()->SetActor(m_selectedCharacter); GameState()->SetActor(m_selectedCharacter);
} }
TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 50, FALSE, FALSE); TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, FALSE);
m_infocenterState->SetUnknown0x74(14); m_infocenterState->SetUnknown0x74(14);
return 1; return 1;
} }
@ -331,7 +331,7 @@ MxLong Infocenter::HandleEndAction(MxEndActionNotificationParam& p_param)
return 1; return 1;
case 12: case 12:
if (action->GetObjectId() == m_currentInfomainScript) { if (action->GetObjectId() == m_currentInfomainScript) {
TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 50, FALSE, FALSE); TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, FALSE);
} }
} }
@ -881,7 +881,7 @@ MxU8 Infocenter::HandleClick(LegoControlManagerEvent& p_param)
if (GameState()->GetCurrentAct() == LegoGameState::e_act1) { if (GameState()->GetCurrentAct() == LegoGameState::e_act1) {
m_radio.Stop(); m_radio.Stop();
TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 50, FALSE, FALSE); TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, FALSE);
m_transitionDestination = LegoGameState::e_elevbott; m_transitionDestination = LegoGameState::e_elevbott;
} }
else { else {
@ -896,7 +896,7 @@ MxU8 Infocenter::HandleClick(LegoControlManagerEvent& p_param)
if (GameState()->GetCurrentAct() == LegoGameState::e_act1) { if (GameState()->GetCurrentAct() == LegoGameState::e_act1) {
m_radio.Stop(); m_radio.Stop();
TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 50, FALSE, FALSE); TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, FALSE);
m_transitionDestination = LegoGameState::e_infoscor; m_transitionDestination = LegoGameState::e_infoscor;
} }
else { else {

8
LEGO1/lego/legoomni/src/worlds/infocenterdoor.cpp
View file

@ -97,17 +97,17 @@ MxLong InfocenterDoor::HandleClick(LegoControlManagerEvent& p_param)
switch (p_param.GetClickedObjectId()) { switch (p_param.GetClickedObjectId()) {
case 1: case 1:
m_unk0xf8 = LegoGameState::e_infoscor; m_unk0xf8 = LegoGameState::e_infoscor;
TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 50, FALSE, FALSE); TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, FALSE);
result = 1; result = 1;
break; break;
case 2: case 2:
m_unk0xf8 = LegoGameState::e_elevbott; m_unk0xf8 = LegoGameState::e_elevbott;
TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 50, FALSE, FALSE); TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, FALSE);
result = 1; result = 1;
break; break;
case 3: case 3:
m_unk0xf8 = LegoGameState::e_infomain; m_unk0xf8 = LegoGameState::e_infomain;
TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 50, FALSE, FALSE); TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, FALSE);
result = 1; result = 1;
break; break;
case 4: case 4:
@ -134,7 +134,7 @@ MxLong InfocenterDoor::HandleClick(LegoControlManagerEvent& p_param)
goto done; goto done;
} }
TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 50, FALSE, FALSE); TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, FALSE);
done: done:
result = 1; result = 1;

2
LEGO1/lego/legoomni/src/worlds/jukebox.cpp
View file

@ -212,7 +212,7 @@ MxBool JukeBox::HandleClick(LegoControlManagerEvent& p_param)
Act1State* act1State = (Act1State*) gameState->GetState("Act1State"); Act1State* act1State = (Act1State*) gameState->GetState("Act1State");
act1State->SetUnknown18(11); act1State->SetUnknown18(11);
m_transitionDestination = LegoGameState::Area::e_unk54; m_transitionDestination = LegoGameState::Area::e_unk54;
TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 50, 0, FALSE); TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, 0, FALSE);
break; break;
} }
} }

6
LEGO1/lego/legoomni/src/worlds/police.cpp
View file

@ -111,7 +111,7 @@ MxLong Police::HandleClick(LegoControlManagerEvent& p_param)
BackgroundAudioManager()->Stop(); BackgroundAudioManager()->Stop();
m_transitionDestination = LegoGameState::Area::e_polidoor; m_transitionDestination = LegoGameState::Area::e_polidoor;
TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 50, FALSE, FALSE); TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, FALSE);
break; break;
case PoliceScript::c_Info_Ctl: case PoliceScript::c_Info_Ctl:
if (m_policeState->GetUnknown0x0c() == 1) { if (m_policeState->GetUnknown0x0c() == 1) {
@ -120,7 +120,7 @@ MxLong Police::HandleClick(LegoControlManagerEvent& p_param)
BackgroundAudioManager()->Stop(); BackgroundAudioManager()->Stop();
m_transitionDestination = LegoGameState::Area::e_infomain; m_transitionDestination = LegoGameState::Area::e_infomain;
TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 50, FALSE, FALSE); TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, FALSE);
break; break;
case PoliceScript::c_Door_Ctl: case PoliceScript::c_Door_Ctl:
if (m_policeState->GetUnknown0x0c() == 1) { if (m_policeState->GetUnknown0x0c() == 1) {
@ -129,7 +129,7 @@ MxLong Police::HandleClick(LegoControlManagerEvent& p_param)
BackgroundAudioManager()->Stop(); BackgroundAudioManager()->Stop();
m_transitionDestination = LegoGameState::Area::e_copter; m_transitionDestination = LegoGameState::Area::e_copter;
TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 50, FALSE, FALSE); TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, FALSE);
break; break;
case PoliceScript::c_Donut_Ctl: case PoliceScript::c_Donut_Ctl:
m_policeState->FUN_1005ea40(); m_policeState->FUN_1005ea40();

6
LEGO1/lego/legoomni/src/worlds/score.cpp
View file

@ -122,7 +122,7 @@ MxLong Score::FUN_10001510(MxEndActionNotificationParam& p_param)
switch (action->GetObjectId()) { switch (action->GetObjectId()) {
case 10: case 10:
m_unk0xf8 = LegoGameState::e_histbook; m_unk0xf8 = LegoGameState::e_histbook;
TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 0x32, 0, 0); TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 0x32, 0, 0);
break; break;
case 0x1f5: case 0x1f5:
PlayMusic(JukeboxScript::c_InformationCenter_Music); PlayMusic(JukeboxScript::c_InformationCenter_Music);
@ -167,12 +167,12 @@ MxLong Score::FUN_100016d0(LegoControlManagerEvent& p_param)
case 1: case 1:
m_unk0xf8 = LegoGameState::e_infomain; m_unk0xf8 = LegoGameState::e_infomain;
DeleteScript(); DeleteScript();
TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 0x32, 0, 0); TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 0x32, 0, 0);
break; break;
case 2: case 2:
m_unk0xf8 = LegoGameState::e_infodoor; m_unk0xf8 = LegoGameState::e_infodoor;
DeleteScript(); DeleteScript();
TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 0x32, 0, 0); TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 0x32, 0, 0);
break; break;
case 3: { case 3: {
LegoInputManager* im = InputManager(); LegoInputManager* im = InputManager();