isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-28 18:51:16 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

WIP Fixes

Browse Source
This commit is contained in:
Christian Semmler 2024-01-17 08:37:52 -05:00
parent 42a538eea7
commit 7af27088f8
8 changed files with 270 additions and 258 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
LEGO1/lego/legoomni/include/infocenter.h
View File

@ -18,6 +18,36 @@ struct InfocenterUnkDataEntry {
// SIZE 0x1d8
class Infocenter : public LegoWorld {
public:
enum IntroScript {
e_noIntro = -1,
e_legoMovie,
e_mindscapeMovie,
e_introMovie,
e_outroMovie,
e_badEndMovie,
e_goodEndMovie
};
enum InfomainScript {
e_noInfomain = -1,
e_welcomeDialogue = 500,
e_randomDialogue1 = 502,
e_letsGetStarted = 504,
e_returnBack = 514,
e_exitConfirmation = 522,
e_goodEndingDialogue = 539,
e_badEndingDialogue = 540,
e_pepperCharacterSelect = 541,
e_mamaCharacterSelect = 542,
e_papaCharacterSelect = 543,
e_officierCharacterSelect = 544,
e_loraCharacterSelect = 545,
};
enum SndAmimScript {
e_bookWig = 400
};
Infocenter();
virtual ~Infocenter() override;
@ -46,41 +76,42 @@ class Infocenter : public LegoWorld {
private:
void InitializeBitmaps();
// notifications
MxLong HandleMouseMove(MxS32 p_x, MxS32 p_y);
MxU32 HandleKeyPress(char p_key);
MxLong HandleKeyPress(MxS8 p_key);
MxU8 HandleMouseMove(MxS32 p_x, MxS32 p_y);
MxU8 HandleButtonUp(MxS32 p_x, MxS32 p_y);
MxU8 HandleNotification17(MxParam&);
MxLong HandleEndAction(MxParam&);
MxLong HandleEndAction(MxParam& p_param);
MxLong HandleNotification0(MxParam&);
void FUN_10070dc0(MxBool);
void FUN_10070e90();
// utility functions
void PlayCutScene(MxU32 p_entityId, MxBool p_scale);
void StopCutScene();
void PlayCutscene(IntroScript p_entityId, MxBool p_scale);
void StopCutscene();
void StartCredits();
static void StopCredits();
void PlayDialogue(MxS32 p_objectId);
void StopCurrentDialogue();
static void PlayBookAnimation();
static void StopBookAnimation();
MxS32 m_unk0xf8; // 0xf8
MxS16 m_unk0xfc; // 0xfc
InfocenterState* m_infocenterState; // 0x100
undefined4 m_unk0x104; // 0x104
MxS32 m_currentCutScene; // 0x108
Radio m_radio; // 0x10c
undefined4 m_unk0x11c; // 0x11c
InfocenterUnkDataEntry m_entries[7]; // 0x120
MxS16 m_unk0x1c8; // 0x1c8
undefined4 m_unk0x1cc; // 0x1cc
MxU16 m_unk0x1d0; // 0x1d0
MxU16 m_unk0x1d2; // 0x1d2
MxU16 m_unk0x1d4; // 0x1d4
MxU16 m_unk0x1d6; // 0x1d6
void PlayDialogue(InfomainScript p_objectId);
void StopCurrentDialogue();
void PlayBookAnimation();
void StopBookAnimation();
static void StopCredits();
InfomainScript m_currentInfomainScript; // 0xf8
MxS16 m_unk0xfc; // 0xfc
InfocenterState* m_infocenterState; // 0x100
undefined4 m_unk0x104; // 0x104
IntroScript m_currentIntroScript; // 0x108
Radio m_radio; // 0x10c
undefined4 m_unk0x11c; // 0x11c
InfocenterUnkDataEntry m_entries[7]; // 0x120
MxS16 m_unk0x1c8; // 0x1c8
undefined4 m_unk0x1cc; // 0x1cc
MxU16 m_unk0x1d0; // 0x1d0
MxU16 m_unk0x1d2; // 0x1d2
MxU16 m_unk0x1d4; // 0x1d4
MxU16 m_unk0x1d6; // 0x1d6
};
#endif // INFOCENTER_H

32
LEGO1/lego/legoomni/include/legoscripts.h
View File

@ -1,32 +0,0 @@
#ifndef LEGOSCRIPTS_H
#define LEGOSCRIPTS_H
typedef enum IntroScript {
IntroScript_Lego_Movie = 0,
IntroScript_Mindscape_Movie,
IntroScript_Intro_Movie,
IntroScript_Outro_Movie,
IntroScript_BadEnd_Movie,
IntroScript_GoodEnd_Movie
};
typedef enum InfomainScript {
InfoMainScript_WelcomeDialogue = 500,
InfoMainScript_RandomDialogue1 = 502,
InfoMainScript_LetsGetStarted = 504,
InfoMainScript_ReturnBack = 514,
InfoMainScript_ExitConfirmation = 522,
InfoMainScript_GoodEndingDialogue = 539,
InfoMainScript_BadEndingDialogue = 540,
InfoMainScript_PepperCharacterSelect = 541,
InfoMainScript_MamaCharacterSelect = 542,
InfoMainScript_PapaCharacterSelect = 543,
InfoMainScript_OfficierCharacterSelect = 544,
InfoMainScript_LoraCharacterSelect = 545,
};
typedef enum SndAmimScript {
SndAmimScript_BookWig = 400
};
#endif // LEGOSCRIPTS_H

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

@ -32,13 +32,13 @@ class MxTransitionManager : public MxCore {
virtual MxResult GetDDrawSurfaceFromVideoManager(); // vtable+0x14
enum TransitionType {
NOT_TRANSITIONING,
NO_ANIMATION,
DISSOLVE,
PIXELATION,
SCREEN_WIPE,
WINDOWS,
BROKEN // Unknown what this is supposed to be, it locks the game up
e_notTransitioning,
e_noAnimation,
e_dissolve,
e_pixelation,
e_screenWipe,
e_windows,
e_broken // Unknown what this is supposed to be, it locks the game up
};
MxResult StartTransition(TransitionType p_animationType, MxS32 p_speed, MxBool p_doCopy, MxBool p_playMusicInAnim);

6
LEGO1/lego/legoomni/src/build/helicopter.cpp
View File

@ -100,7 +100,7 @@ MxU32 Helicopter::VTable0xcc()
VTable0xe8(0x29, TRUE, 7);
((Isle*) GetCurrentWorld())->SetUnknown13c(0x3c);
FUN_10015820(1, 0);
TransitionManager()->StartTransition(MxTransitionManager::PIXELATION, 50, FALSE, TRUE);
TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 50, FALSE, TRUE);
SetUnknownDC(4);
PlayMusic(9);
break;
@ -139,7 +139,7 @@ MxU32 Helicopter::VTable0xd4(MxType17NotificationParam& p_param)
case 0x17:
if (*g_act3Script == script) {
((Act3*) GetCurrentWorld())->SetUnkown4270(2);
TransitionManager()->StartTransition(MxTransitionManager::PIXELATION, 50, FALSE, FALSE);
TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 50, FALSE, FALSE);
}
else if (m_state->GetUnkown8() != 0)
break;
@ -203,7 +203,7 @@ MxU32 Helicopter::VTable0xd4(MxType17NotificationParam& p_param)
case 0x1c:
if (GameState()->GetUnknown10() == 0) {
((Isle*) GetCurrentWorld())->SetUnknown13c(2);
TransitionManager()->StartTransition(MxTransitionManager::PIXELATION, 50, FALSE, FALSE);
TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 50, FALSE, FALSE);
VTable0xe4();
}
ret = 1;

365
LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
View File

@ -5,7 +5,6 @@
#include "legogamestate.h"
#include "legoinputmanager.h"
#include "legoomni.h"
#include "legoscripts.h"
#include "legoutil.h"
#include "legovideomanager.h"
#include "mxactionnotificationparam.h"
@ -14,28 +13,33 @@
#include "mxstillpresenter.h"
#include "mxtransitionmanager.h"
// GLOBAL: LEGO1 0x100f7698
DECOMP_SIZE_ASSERT(Infocenter, 0x1d8)
DECOMP_SIZE_ASSERT(InfocenterUnkDataEntry, 0x18)
// GLOBAL: LEGO1 0x100f76a0
const char* g_object2x4red = "2x4red";
// GLOBAL: LEGO1 0x100f76a4
const char* g_object2x4grn = "2x4grn";
DECOMP_SIZE_ASSERT(Infocenter, 0x1d8)
// FUNCTION: LEGO1 0x1006ea20
Infocenter::Infocenter()
{
m_unk0xfc = 0;
m_unk0x11c = 0;
m_infocenterState = NULL;
m_unk0x1cc = 0;
m_unk0x11c = 0;
m_unk0x104 = 0;
m_unk0xf8 = -1;
m_currentCutScene = -1;
m_currentInfomainScript = e_noInfomain;
m_currentIntroScript = e_noIntro;
memset(&m_entries, 0, sizeof(InfocenterUnkDataEntry) * 7);
m_unk0x1c8 = -1;
SetAppCursor(1);
NotificationManager()->Register(this);
m_unk0x1d0 = 0;
m_unk0x1d2 = 0;
m_unk0x1d4 = 0;
@ -75,40 +79,44 @@ MxResult Infocenter::Create(MxDSAction& p_dsAction)
// FUNCTION: LEGO1 0x1006ef10
MxLong Infocenter::Notify(MxParam& p_param)
{
MxLong result = 0;
LegoWorld::Notify(p_param);
if (m_worldStarted) {
switch (((MxNotificationParam&) p_param).GetNotification()) {
case 0:
return HandleNotification0(p_param);
result = HandleNotification0(p_param);
break;
case c_notificationEndAction:
return HandleEndAction(p_param);
result = HandleEndAction(p_param);
break;
case c_notificationKeyPress:
return (MxU8) HandleKeyPress(((LegoEventNotificationParam&) p_param).GetKey());
result = HandleKeyPress(((LegoEventNotificationParam&) p_param).GetKey());
break;
case c_notificationButtonUp:
return HandleButtonUp(
((LegoEventNotificationParam&) p_param).GetX(),
((LegoEventNotificationParam&) p_param).GetY()
) &
0xff;
result = HandleButtonUp(
((LegoEventNotificationParam&) p_param).GetX(),
((LegoEventNotificationParam&) p_param).GetY()
);
break;
case c_notificationMouseMove:
return HandleMouseMove(
((LegoEventNotificationParam&) p_param).GetX(),
((LegoEventNotificationParam&) p_param).GetY()
) &
0xff;
result = HandleMouseMove(
((LegoEventNotificationParam&) p_param).GetX(),
((LegoEventNotificationParam&) p_param).GetY()
);
break;
case TYPE17:
return HandleNotification17(p_param);
result = HandleNotification17(p_param);
break;
case MXTRANSITIONMANAGER_TRANSITIONENDED:
StopBookAnimation();
m_unk0x1d2 = 0;
if (m_infocenterState->GetUnknown0x74() == 0xc) {
StartCredits();
m_infocenterState->SetUnknown0x74(0xd);
return 0;
}
if (m_unk0x104 != 0) {
else if (m_unk0x104 != 0) {
BackgroundAudioManager()->RaiseVolume();
GameState()->HandleAction(m_unk0x104);
m_unk0x104 = 0;
@ -116,157 +124,157 @@ MxLong Infocenter::Notify(MxParam& p_param)
break;
}
}
return 0;
return result;
}
// FUNCTION: LEGO1 0x1006f080
MxLong Infocenter::HandleEndAction(MxParam& p_param)
{
MxDSAction* endedAction = ((MxEndActionNotificationParam&) p_param).GetAction();
if (endedAction->GetAtomId() == *g_creditsScript && endedAction->GetObjectId() == 499) {
MxDSAction* action = ((MxEndActionNotificationParam&) p_param).GetAction();
if (action->GetAtomId() == *g_creditsScript && action->GetObjectId() == 499) {
Lego()->CloseMainWindow();
return 1;
}
switch (endedAction->GetObjectId()) {
case 40:
case 41:
case 42:
case 43:
case 44:
if (action->GetAtomId() == m_atom &&
(action->GetObjectId() == 40 || action->GetObjectId() == 41 || action->GetObjectId() == 42 ||
action->GetObjectId() == 43 || action->GetObjectId() == 44)) {
if (m_unk0x1d4) {
m_unk0x1d4--;
}
if (m_unk0x1d4)
break;
if (!m_unk0x1d4) {
PlayMusic(11);
GameState()->FUN_10039780(m_unk0xfc);
PlayMusic(11);
GameState()->FUN_10039780(m_unk0xfc);
switch (m_unk0xfc) {
case 1:
PlayDialogue(e_pepperCharacterSelect);
break;
case 2:
PlayDialogue(e_mamaCharacterSelect);
break;
case 3:
PlayDialogue(e_papaCharacterSelect);
break;
case 4:
PlayDialogue(e_officierCharacterSelect);
break;
case 5:
PlayDialogue(e_loraCharacterSelect);
break;
default:
break;
}
// Play dialogue when player selects character
switch (m_unk0xfc) {
case 1:
PlayDialogue(InfoMainScript_PepperCharacterSelect); // pepper
break;
case 2:
PlayDialogue(InfoMainScript_MamaCharacterSelect); // mama brickolinea
break;
case 3:
PlayDialogue(InfoMainScript_PapaCharacterSelect); // papa brickolinea
break;
case 4:
PlayDialogue(InfoMainScript_OfficierCharacterSelect); // officer nick brick
break;
case 5:
PlayDialogue(InfoMainScript_LoraCharacterSelect); // lora brick
break;
default:
break;
FUN_10070dc0(TRUE);
}
FUN_10070dc0(TRUE);
}
MxLong result = m_radio.Notify(p_param);
if (result == 0) {
if (endedAction->GetAtomId() == m_atom || endedAction->GetAtomId() == *g_introScript) {
if (endedAction->GetObjectId() == InfoMainScript_ReturnBack) {
ControlManager()->FUN_100293c0(0x10, endedAction->GetAtomId(), 0);
m_unk0x1d6 = 0;
}
switch (m_infocenterState->GetUnknown0x74()) {
case 0:
switch (m_currentCutScene) {
case 0:
PlayCutScene(IntroScript_Mindscape_Movie, FALSE); // Mindscape animation
return 1;
case 1:
PlayCutScene(IntroScript_Intro_Movie, TRUE); // Lego Island animation
return 1;
case 4:
StopCutScene();
// play bad ending dialogue after bad ending cutscene
PlayDialogue(InfoMainScript_BadEndingDialogue);
m_currentCutScene = -1;
return 1;
case 5:
StopCutScene();
if (result)
return result;
// play good ending dialogue after good ending cutscene
PlayDialogue(InfoMainScript_GoodEndingDialogue);
m_currentCutScene = -1;
return 1;
}
// default / 2nd case probably?
StopCutScene();
m_infocenterState->SetUnknown0x74(11);
PlayDialogue(InfoMainScript_WelcomeDialogue); // play welcome dialogue
m_currentCutScene = -1;
if (m_infocenterState->GetInfocenterBufferElement(0) == 0) {
m_unk0x1d2 = 1;
return 1;
}
break;
case 1:
m_infocenterState->SetUnknown0x74(11);
MxU32 val;
switch (m_currentCutScene) {
case 4:
val = 540; // bad ending dialogue
break;
case 5:
val = 539; // good ending dialogue
break;
default:
val = 500; // welcome dialogue
break;
}
PlayDialogue(val);
m_currentCutScene = -1;
return 1;
case 2:
FUN_10015860(g_object2x4red, 0);
FUN_10015860(g_object2x4grn, 0);
BackgroundAudioManager()->RaiseVolume();
return 1;
case 4:
if (endedAction->GetObjectId() == 70 || endedAction->GetObjectId() == 71) {
TransitionManager()->StartTransition(MxTransitionManager::PIXELATION, 50, FALSE, FALSE);
m_infocenterState->SetUnknown0x74(14);
return 1;
}
break;
case 5:
if (m_unk0xf8 == endedAction->GetObjectId()) {
if (GameState()->GetUnknown10() != 2 && m_unk0xfc != 0) {
GameState()->FUN_10039780(m_unk0xfc);
}
TransitionManager()->StartTransition(MxTransitionManager::PIXELATION, 50, FALSE, FALSE);
m_infocenterState->SetUnknown0x74(14);
return 1;
}
break;
case 11:
if (m_infocenterState->GetInfocenterBufferElement(0) == 0 && m_unk0xf8 != 28 && m_unk0xf8 != 29 &&
m_unk0xf8 != 42 && m_unk0xf8 != 43 && m_unk0xf8 != 44) {
m_unk0x1d0 = 1;
PlayMusic(11);
}
m_infocenterState->SetUnknown0x74(2);
FUN_10015860("infoman", 1);
return 1;
case 12:
if (m_unk0xf8 == endedAction->GetObjectId()) {
TransitionManager()->StartTransition(MxTransitionManager::PIXELATION, 50, FALSE, FALSE);
}
}
result = 1;
if (action->GetAtomId() == m_atom || action->GetAtomId() == *g_introScript) {
if (action->GetObjectId() == e_returnBack) {
ControlManager()->FUN_100293c0(0x10, action->GetAtomId(), 0);
m_unk0x1d6 = 0;
}
switch (m_infocenterState->GetUnknown0x74()) {
case 0:
switch (m_currentIntroScript) {
case e_legoMovie:
PlayCutscene(e_mindscapeMovie, FALSE);
return 1;
case e_mindscapeMovie:
PlayCutscene(e_introMovie, TRUE);
return 1;
case e_badEndMovie:
StopCutscene();
m_infocenterState->SetUnknown0x74(11);
PlayDialogue(e_badEndingDialogue);
m_currentIntroScript = e_noIntro;
return 1;
case e_goodEndMovie:
StopCutscene();
m_infocenterState->SetUnknown0x74(11);
PlayDialogue(e_goodEndingDialogue);
m_currentIntroScript = e_noIntro;
return 1;
}
// default / 2nd case probably?
StopCutscene();
m_infocenterState->SetUnknown0x74(11);
PlayDialogue(e_welcomeDialogue);
m_currentIntroScript = e_noIntro;
if (m_infocenterState->GetInfocenterBufferElement(0) == 0) {
m_unk0x1d2 = 1;
return 1;
}
break;
case 1:
m_infocenterState->SetUnknown0x74(11);
switch (m_currentIntroScript) {
case e_badEndMovie:
PlayDialogue(e_badEndingDialogue);
break;
case e_goodEndMovie:
PlayDialogue(e_goodEndingDialogue);
break;
default:
PlayDialogue(e_welcomeDialogue);
}
m_currentIntroScript = e_noIntro;
return 1;
case 2:
FUN_10015860(g_object2x4red, 0);
FUN_10015860(g_object2x4grn, 0);
BackgroundAudioManager()->RaiseVolume();
return 1;
case 4:
if (action->GetObjectId() == 70 || action->GetObjectId() == 71) {
TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 50, FALSE, FALSE);
m_infocenterState->SetUnknown0x74(14);
return 1;
}
break;
case 5:
if (action->GetObjectId() == m_currentInfomainScript) {
if (GameState()->GetUnknown10() != 2 && m_unk0xfc != 0) {
GameState()->FUN_10039780(m_unk0xfc);
}
TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 50, FALSE, FALSE);
m_infocenterState->SetUnknown0x74(14);
return 1;
}
break;
case 11:
if (m_infocenterState->GetInfocenterBufferElement(0) == 0 && m_currentInfomainScript != 28 &&
m_currentInfomainScript != 29 && m_currentInfomainScript != 42 && m_currentInfomainScript != 43 &&
m_currentInfomainScript != 44) {
m_unk0x1d0 = 1;
PlayMusic(11);
}
m_infocenterState->SetUnknown0x74(2);
FUN_10015860("infoman", 1);
return 1;
case 12:
if (action->GetObjectId() == m_currentInfomainScript) {
TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 50, FALSE, FALSE);
}
}
result = 1;
}
return result;
}
@ -287,7 +295,7 @@ void Infocenter::VTable0x50()
InitializeBitmaps();
switch (m_infocenterState->GetUnknown0x74()) {
case 3:
PlayCutScene(IntroScript_Lego_Movie, TRUE);
PlayCutscene(e_legoMovie, TRUE);
m_infocenterState->SetUnknown0x74(0);
return;
case 4:
@ -296,7 +304,7 @@ void Infocenter::VTable0x50()
m_unk0x1d2 = 1;
}
PlayDialogue(InfoMainScript_LetsGetStarted); // Play "Ok, lets get started" dialogue
PlayDialogue(e_letsGetStarted);
PlayMusic(11);
FUN_10015820(0, 7);
return;
@ -306,14 +314,15 @@ void Infocenter::VTable0x50()
break;
case 8:
PlayMusic(11);
PlayDialogue(InfoMainScript_ExitConfirmation); // Are you sure you want to exit lego island?
PlayDialogue(e_exitConfirmation);
FUN_10015820(0, 7);
return;
case 0xf:
if (m_infocenterState->GetInfocenterBufferElement(0) == 0) {
m_unk0x1d2 = 1;
}
PlayDialogue(InfoMainScript_RandomDialogue1);
PlayDialogue(e_randomDialogue1);
PlayMusic(11);
FUN_10015820(0, 7);
return;
@ -339,20 +348,22 @@ void Infocenter::InitializeBitmaps()
}
// STUB: LEGO1 0x1006fd00
MxLong Infocenter::HandleMouseMove(MxS32 p_x, MxS32 p_y)
MxU8 Infocenter::HandleMouseMove(MxS32 p_x, MxS32 p_y)
{
return 1;
}
// FUNCTION: LEGO1 0x1006fda0
MxU32 Infocenter::HandleKeyPress(char p_key)
MxLong Infocenter::HandleKeyPress(MxS8 p_key)
{
MxU32 result = 0;
MxLong result = 0;
if (p_key == ' ' && m_worldStarted) {
switch (m_infocenterState->GetUnknown0x74()) {
case 0:
StopCutScene();
StopCutscene();
m_infocenterState->SetUnknown0x74(1);
if (m_infocenterState->GetInfocenterBufferElement(0) == 0) {
m_unk0x1d2 = 1;
return 1;
@ -362,12 +373,13 @@ MxU32 Infocenter::HandleKeyPress(char p_key)
case 4:
break;
default:
result = m_unk0xf8;
result = (MxU32) m_currentInfomainScript;
StopCurrentDialogue();
switch (m_infocenterState->GetUnknown0x74()) {
case 5:
case 12:
m_unk0xf8 = result;
m_currentInfomainScript = (InfomainScript) result;
return 1;
default:
m_infocenterState->SetUnknown0x74(2);
@ -429,29 +441,30 @@ MxResult Infocenter::Tickle()
}
// FUNCTION: LEGO1 0x10070c20
void Infocenter::PlayCutScene(MxU32 p_entityId, MxBool p_scale)
void Infocenter::PlayCutscene(IntroScript p_entityId, MxBool p_scale)
{
m_currentCutScene = p_entityId;
m_currentIntroScript = p_entityId;
VideoManager()->EnableFullScreenMovie(TRUE, p_scale);
InputManager()->SetUnknown336(TRUE);
InputManager()->SetUnknown335(TRUE);
SetAppCursor(0xb); // Hide cursor
VideoManager()->GetDisplaySurface()->FUN_100ba640(); // Clear screen
if (m_currentCutScene != -1) {
if (m_currentIntroScript != -1) {
// check if the cutscene is not an ending
if (m_currentCutScene >= 4 && m_currentCutScene <= 5) {
if (m_currentIntroScript >= 4 && m_currentIntroScript <= 5) {
FUN_10070e90();
}
InvokeAction(ExtraActionType_opendisk, *g_introScript, m_currentCutScene, NULL);
InvokeAction(ExtraActionType_opendisk, *g_introScript, m_currentIntroScript, NULL);
}
}
// FUNCTION: LEGO1 0x10070cb0
void Infocenter::StopCutScene()
void Infocenter::StopCutscene()
{
if (m_currentCutScene != -1) {
InvokeAction(ExtraActionType_close, *g_introScript, m_currentCutScene, NULL);
if (m_currentIntroScript != -1) {
InvokeAction(ExtraActionType_close, *g_introScript, m_currentIntroScript, NULL);
}
VideoManager()->EnableFullScreenMovie(FALSE);
@ -499,14 +512,14 @@ void Infocenter::StopCredits()
}
// FUNCTION: LEGO1 0x10071300
void Infocenter::PlayDialogue(MxS32 p_objectId)
void Infocenter::PlayDialogue(InfomainScript p_objectId)
{
MxDSAction action;
action.SetObjectId(p_objectId);
action.SetAtomId(*g_infomainScript);
StopCurrentDialogue();
m_unk0xf8 = p_objectId;
m_currentInfomainScript = p_objectId;
BackgroundAudioManager()->LowerVolume();
Start(&action);
}
@ -514,13 +527,13 @@ void Infocenter::PlayDialogue(MxS32 p_objectId)
// FUNCTION: LEGO1 0x100713d0
void Infocenter::StopCurrentDialogue()
{
if (m_unk0xf8 != -1) {
if (m_currentInfomainScript != e_noInfomain) {
MxDSAction action;
action.SetObjectId(m_unk0xf8);
action.SetObjectId(m_currentInfomainScript);
action.SetAtomId(*g_infomainScript);
action.SetUnknown24(-2);
DeleteObject(action);
m_unk0xf8 = -1;
m_currentInfomainScript = e_noInfomain;
}
}
@ -528,7 +541,7 @@ void Infocenter::StopCurrentDialogue()
void Infocenter::PlayBookAnimation()
{
MxDSAction action;
action.SetObjectId(SndAmimScript_BookWig);
action.SetObjectId(e_bookWig);
action.SetAtomId(*g_sndAnimScript);
Start(&action);
}
@ -537,7 +550,7 @@ void Infocenter::PlayBookAnimation()
void Infocenter::StopBookAnimation()
{
MxDSAction action;
action.SetObjectId(SndAmimScript_BookWig);
action.SetObjectId(e_bookWig);
action.SetAtomId(*g_sndAnimScript);
action.SetUnknown24(-2);
DeleteObject(action);

6
LEGO1/lego/legoomni/src/infocenter/score.cpp
View File

@ -116,7 +116,7 @@ MxLong Score::FUN_10001510(MxEndActionNotificationParam& p_param)
switch (action->GetObjectId()) {
case 10:
m_unk0xf8 = 0x38;
TransitionManager()->StartTransition(MxTransitionManager::PIXELATION, 0x32, 0, 0);
TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 0x32, 0, 0);
break;
case 0x1f5:
PlayMusic(11);
@ -160,12 +160,12 @@ MxLong Score::FUN_100016d0(MxType17NotificationParam& p_param)
case 1:
m_unk0xf8 = 2;
DeleteScript();
TransitionManager()->StartTransition(MxTransitionManager::PIXELATION, 0x32, 0, 0);
TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 0x32, 0, 0);
break;
case 2:
m_unk0xf8 = 3;
DeleteScript();
TransitionManager()->StartTransition(MxTransitionManager::PIXELATION, 0x32, 0, 0);
TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 0x32, 0, 0);
break;
case 3: {
LegoInputManager* im = InputManager();

2
LEGO1/lego/legoomni/src/video/legovideomanager.cpp
View File

@ -230,7 +230,7 @@ void LegoVideoManager::MoveCursor(MxS32 p_cursorX, MxS32 p_cursorY)
MxResult LegoVideoManager::Tickle()
{
if (m_unk0x554 && !m_videoParam.Flags().GetFlipSurfaces() &&
TransitionManager()->GetTransitionType() == MxTransitionManager::NOT_TRANSITIONING)
TransitionManager()->GetTransitionType() == MxTransitionManager::e_notTransitioning)
Sleep(30);
m_stopWatch->Stop();

20
LEGO1/lego/legoomni/src/video/mxtransitionmanager.cpp
View File

@ -17,7 +17,7 @@ RECT g_fullScreenRect = {0, 0, 640, 480};
MxTransitionManager::MxTransitionManager()
{
m_animationTimer = 0;
m_transitionType = NOT_TRANSITIONING;
m_transitionType = e_notTransitioning;
m_ddSurface = NULL;
m_waitIndicator = NULL;
m_copyBuffer = NULL;
@ -57,22 +57,22 @@ MxResult MxTransitionManager::Tickle()
this->m_systemTime = timeGetTime();
switch (this->m_transitionType) {
case NO_ANIMATION:
case e_noAnimation:
TransitionNone();
break;
case DISSOLVE:
case e_dissolve:
TransitionDissolve();
break;
case PIXELATION:
case e_pixelation:
TransitionPixelation();
break;
case SCREEN_WIPE:
case e_screenWipe:
TransitionWipe();
break;
case WINDOWS:
case e_windows:
TransitionWindows();
break;
case BROKEN:
case e_broken:
TransitionBroken();
break;
}
@ -87,7 +87,7 @@ MxResult MxTransitionManager::StartTransition(
MxBool p_playMusicInAnim
)
{
if (this->m_transitionType == NOT_TRANSITIONING) {
if (this->m_transitionType == e_notTransitioning) {
if (!p_playMusicInAnim) {
MxBackgroundAudioManager* backgroundAudioManager = BackgroundAudioManager();
backgroundAudioManager->Stop();
@ -129,8 +129,8 @@ MxResult MxTransitionManager::StartTransition(
// FUNCTION: LEGO1 0x1004bc30
void MxTransitionManager::EndTransition(MxBool p_notifyWorld)
{
if (m_transitionType != NOT_TRANSITIONING) {
m_transitionType = NOT_TRANSITIONING;
if (m_transitionType != e_notTransitioning) {
m_transitionType = e_notTransitioning;
m_copyFlags.m_bit0 = FALSE;