From a0b22f4681ad9e44ad488a82e8f19a89c4f9dc5b Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Wed, 17 Jan 2024 09:29:49 -0500 Subject: [PATCH] Rename function --- LEGO1/lego/legoomni/src/infocenter/infocenter.cpp | 10 +++++----- LEGO1/lego/legoomni/src/video/legovideomanager.cpp | 2 +- LEGO1/lego/legoomni/src/video/mxtransitionmanager.cpp | 2 +- LEGO1/omni/include/mxdisplaysurface.h | 2 +- LEGO1/omni/src/video/mxdisplaysurface.cpp | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp index 8900d8a6..58b62b5f 100644 --- a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp +++ b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp @@ -447,12 +447,12 @@ void Infocenter::PlayCutscene(IntroScript p_entityId, MxBool p_scale) VideoManager()->EnableFullScreenMovie(TRUE, p_scale); InputManager()->SetUnknown336(TRUE); InputManager()->SetUnknown335(TRUE); - SetAppCursor(0xb); // Hide cursor - VideoManager()->GetDisplaySurface()->FUN_100ba640(); // Clear screen + SetAppCursor(0xb); // Hide cursor + VideoManager()->GetDisplaySurface()->ClearScreen(); - if (m_currentIntroScript != -1) { + if (m_currentIntroScript != e_noIntro) { // check if the cutscene is not an ending - if (m_currentIntroScript >= 4 && m_currentIntroScript <= 5) { + if (m_currentIntroScript >= e_badEndMovie && m_currentIntroScript <= e_goodEndMovie) { FUN_10070e90(); } InvokeAction(ExtraActionType_opendisk, *g_introScript, m_currentIntroScript, NULL); @@ -462,7 +462,7 @@ void Infocenter::PlayCutscene(IntroScript p_entityId, MxBool p_scale) // FUNCTION: LEGO1 0x10070cb0 void Infocenter::StopCutscene() { - if (m_currentIntroScript != -1) { + if (m_currentIntroScript != e_noIntro) { InvokeAction(ExtraActionType_close, *g_introScript, m_currentIntroScript, NULL); } diff --git a/LEGO1/lego/legoomni/src/video/legovideomanager.cpp b/LEGO1/lego/legoomni/src/video/legovideomanager.cpp index 1bb9163a..78830375 100644 --- a/LEGO1/lego/legoomni/src/video/legovideomanager.cpp +++ b/LEGO1/lego/legoomni/src/video/legovideomanager.cpp @@ -369,7 +369,7 @@ void LegoVideoManager::EnableFullScreenMovie(MxBool p_enable, MxBool p_scale) m_fullScreenMovie = TRUE; } else { - m_displaySurface->FUN_100ba640(); + m_displaySurface->ClearScreen(); m_displaySurface->GetVideoParam().Flags().SetF1bit3(FALSE); // restore previous pallete diff --git a/LEGO1/lego/legoomni/src/video/mxtransitionmanager.cpp b/LEGO1/lego/legoomni/src/video/mxtransitionmanager.cpp index e8b25d26..b580576c 100644 --- a/LEGO1/lego/legoomni/src/video/mxtransitionmanager.cpp +++ b/LEGO1/lego/legoomni/src/video/mxtransitionmanager.cpp @@ -157,7 +157,7 @@ void MxTransitionManager::EndTransition(MxBool p_notifyWorld) void MxTransitionManager::TransitionNone() { LegoVideoManager* videoManager = VideoManager(); - videoManager->GetDisplaySurface()->FUN_100ba640(); + videoManager->GetDisplaySurface()->ClearScreen(); EndTransition(TRUE); } diff --git a/LEGO1/omni/include/mxdisplaysurface.h b/LEGO1/omni/include/mxdisplaysurface.h index 25fe95aa..c841fccc 100644 --- a/LEGO1/omni/include/mxdisplaysurface.h +++ b/LEGO1/omni/include/mxdisplaysurface.h @@ -85,7 +85,7 @@ class MxDisplaySurface : public MxCore { virtual void ReleaseDC(HDC p_hdc); // vtable+0x40 virtual LPDIRECTDRAWSURFACE VTable0x44(MxBitmap*, undefined4*, undefined4, undefined4); // vtable+0x44 - void FUN_100ba640(); + void ClearScreen(); static LPDIRECTDRAWSURFACE FUN_100bc070(); inline LPDIRECTDRAWSURFACE GetDirectDrawSurface1() { return this->m_ddSurface1; } diff --git a/LEGO1/omni/src/video/mxdisplaysurface.cpp b/LEGO1/omni/src/video/mxdisplaysurface.cpp index 8761cc02..d744accd 100644 --- a/LEGO1/omni/src/video/mxdisplaysurface.cpp +++ b/LEGO1/omni/src/video/mxdisplaysurface.cpp @@ -34,7 +34,7 @@ void MxDisplaySurface::Init() } // FUNCTION: LEGO1 0x100ba640 -void MxDisplaySurface::FUN_100ba640() +void MxDisplaySurface::ClearScreen() { MxS32 backBuffers; DDSURFACEDESC desc;