keep virgin logo from flashing up when using -x
svn-id: r8928
This commit is contained in:
parent
67a760d10c
commit
fbb0ddcc34
2 changed files with 9 additions and 0 deletions
|
@ -1499,6 +1499,9 @@ uint16 SkyControl::quickXRestore(uint16 slot) {
|
||||||
_savedCharSet = _skyText->giveCurrentCharSet();
|
_savedCharSet = _skyText->giveCurrentCharSet();
|
||||||
_skyText->fnSetFont(0);
|
_skyText->fnSetFont(0);
|
||||||
|
|
||||||
|
_system->copy_rect(_screenBuf, GAME_SCREEN_WIDTH, 0, 0, FULL_SCREEN_WIDTH, FULL_SCREEN_HEIGHT);
|
||||||
|
_system->update_screen();
|
||||||
|
|
||||||
if (SkyState::_systemVars.gameVersion < 331)
|
if (SkyState::_systemVars.gameVersion < 331)
|
||||||
_skyScreen->setPalette(60509);
|
_skyScreen->setPalette(60509);
|
||||||
else
|
else
|
||||||
|
@ -1517,6 +1520,11 @@ uint16 SkyControl::quickXRestore(uint16 slot) {
|
||||||
memset(_skyScreen->giveCurrent(), 0, GAME_SCREEN_WIDTH * GAME_SCREEN_HEIGHT);
|
memset(_skyScreen->giveCurrent(), 0, GAME_SCREEN_WIDTH * GAME_SCREEN_HEIGHT);
|
||||||
_skyScreen->showScreen(_skyScreen->giveCurrent());
|
_skyScreen->showScreen(_skyScreen->giveCurrent());
|
||||||
_skyScreen->forceRefresh();
|
_skyScreen->forceRefresh();
|
||||||
|
} else {
|
||||||
|
memset(_screenBuf, 0, FULL_SCREEN_WIDTH * FULL_SCREEN_HEIGHT);
|
||||||
|
_system->copy_rect(_screenBuf, GAME_SCREEN_WIDTH, 0, 0, GAME_SCREEN_WIDTH, FULL_SCREEN_HEIGHT);
|
||||||
|
_system->update_screen();
|
||||||
|
_skyScreen->showScreen(_skyScreen->giveCurrent());
|
||||||
}
|
}
|
||||||
_skyScreen->setPaletteEndian((uint8 *)SkyState::fetchCompact(SkyState::_systemVars.currentPalette));
|
_skyScreen->setPaletteEndian((uint8 *)SkyState::fetchCompact(SkyState::_systemVars.currentPalette));
|
||||||
_skyMouse->spriteMouse(_savedMouse, 0, 0);
|
_skyMouse->spriteMouse(_savedMouse, 0, 0);
|
||||||
|
|
|
@ -82,6 +82,7 @@ SkyMouse::SkyMouse(OSystem *system, SkyDisk *skyDisk) {
|
||||||
_skyDisk = skyDisk;
|
_skyDisk = skyDisk;
|
||||||
_system = system;
|
_system = system;
|
||||||
_mouseB = 0;
|
_mouseB = 0;
|
||||||
|
_currentCursor = 6;
|
||||||
|
|
||||||
_miceData = _skyDisk->loadFile(MICE_FILE, NULL);
|
_miceData = _skyDisk->loadFile(MICE_FILE, NULL);
|
||||||
fixMouseTransparency(_miceData, _skyDisk->_lastLoadedFileSize);
|
fixMouseTransparency(_miceData, _skyDisk->_lastLoadedFileSize);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue