Fix some splash screen inconsistencies

This commit is contained in:
elasota
2021-03-18 19:05:37 -04:00
parent 89831f0ff6
commit b2b27ef335

View File

@@ -52,6 +52,7 @@ extern short toolSelected;
extern Boolean noRoomAtAll, isUseSecondScreen; extern Boolean noRoomAtAll, isUseSecondScreen;
extern Boolean quickerTransitions, houseIsReadOnly; extern Boolean quickerTransitions, houseIsReadOnly;
extern Boolean menusUp; extern Boolean menusUp;
extern Boolean houseOpen;
//============================================================== Functions //============================================================== Functions
//-------------------------------------------------------------- DrawOnSplash //-------------------------------------------------------------- DrawOnSplash
@@ -62,6 +63,9 @@ void DrawOnSplash(DrawSurface *surface)
{ {
Str255 houseLoadedStr; Str255 houseLoadedStr;
if (!houseOpen)
return;
PasStringCopy(PSTR("House: "), houseLoadedStr); PasStringCopy(PSTR("House: "), houseLoadedStr);
PasStringConcat(houseLoadedStr, thisHouseName); PasStringConcat(houseLoadedStr, thisHouseName);
if ((thisMac.hasQT) && (hasMovie)) if ((thisMac.hasQT) && (hasMovie))
@@ -260,14 +264,14 @@ void OpenMainWindow (void)
// fadeGraysOut = false; // fadeGraysOut = false;
// ForceCTSeed((CGrafPtr)mainWindow, wasSeed); // ForceCTSeed((CGrafPtr)mainWindow, wasSeed);
// } // }
UpdateMainWindow();
} }
CopyBits((BitMap *)*GetGWorldPixMap(workSrcMap), CopyBits((BitMap *)*GetGWorldPixMap(workSrcMap),
GetPortBitMapForCopyBits(mainWindow->GetDrawSurface()), GetPortBitMapForCopyBits(mainWindow->GetDrawSurface()),
&mainWindowRect, &mainWindowRect, srcCopy); &mainWindowRect, &mainWindowRect, srcCopy);
UpdateMainWindow();
mainWindow->GetDrawSurface()->m_port.SetDirty(PortabilityLayer::QDPortDirtyFlag_Contents); mainWindow->GetDrawSurface()->m_port.SetDirty(PortabilityLayer::QDPortDirtyFlag_Contents);
} }