From c6752cccf5186fb04c97e2bb4a64c52fc9447073 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Sat, 28 Feb 2004 12:58:13 +0000 Subject: renamed more OSystem methods to follow our naming scheme; renamed NewGuiColor to OverlayColor; fixed some calls to error() in the SDL backend svn-id: r13087 --- sky/control.cpp | 26 +++++++++++++------------- sky/intro.cpp | 2 +- sky/music/musicbase.cpp | 10 +++++----- sky/screen.cpp | 28 ++++++++++++++-------------- 4 files changed, 33 insertions(+), 33 deletions(-) (limited to 'sky') diff --git a/sky/control.cpp b/sky/control.cpp index 61def9a1ce..afd4c96162 100644 --- a/sky/control.cpp +++ b/sky/control.cpp @@ -378,13 +378,13 @@ void Control::animClick(ConResource *pButton) { _text->flushForRedraw(); pButton->drawToScreen(NO_MASK); _text->drawToScreen(WITH_MASK); - _system->update_screen(); + _system->updateScreen(); delay(150); pButton->_curSprite--; _text->flushForRedraw(); pButton->drawToScreen(NO_MASK); _text->drawToScreen(WITH_MASK); - _system->update_screen(); + _system->updateScreen(); } } @@ -431,7 +431,7 @@ void Control::doLoadSavePanel(void) { memset(_screenBuf, 0, GAME_SCREEN_WIDTH * FULL_SCREEN_HEIGHT); _system->copy_rect(_screenBuf, GAME_SCREEN_WIDTH, 0, 0, GAME_SCREEN_WIDTH, FULL_SCREEN_HEIGHT); - _system->update_screen(); + _system->updateScreen(); _skyScreen->forceRefresh(); _skyScreen->setPaletteEndian((uint8 *)SkyEngine::fetchCompact(SkyEngine::_systemVars.currentPalette)); removePanel(); @@ -468,7 +468,7 @@ void Control::doControlPanel(void) { while (!quitPanel) { _text->drawToScreen(WITH_MASK); - _system->update_screen(); + _system->updateScreen(); _mouseClicked = false; delay(50); if (_keyPressed == 27) { // escape pressed @@ -497,7 +497,7 @@ void Control::doControlPanel(void) { } memset(_screenBuf, 0, GAME_SCREEN_WIDTH * FULL_SCREEN_HEIGHT); _system->copy_rect(_screenBuf, GAME_SCREEN_WIDTH, 0, 0, GAME_SCREEN_WIDTH, FULL_SCREEN_HEIGHT); - _system->update_screen(); + _system->updateScreen(); _skyScreen->forceRefresh(); _skyScreen->setPaletteEndian((uint8 *)SkyEngine::fetchCompact(SkyEngine::_systemVars.currentPalette)); removePanel(); @@ -609,7 +609,7 @@ bool Control::getYesNo(char *text) { mouseType = wantMouse; _skyMouse->spriteMouse(mouseType, 0, 0); } - _system->update_screen(); + _system->updateScreen(); delay(50); if ((_mouseY >= 83) && (_mouseY <= 110)) { if ((_mouseX >= 77) && (_mouseX <= 114)) { // over 'yes' @@ -657,7 +657,7 @@ uint16 Control::doMusicSlide(void) { } buttonControl(_slide2); _text->drawToScreen(WITH_MASK); - _system->update_screen(); + _system->updateScreen(); } return 0; } @@ -685,7 +685,7 @@ uint16 Control::doSpeedSlide(void) { } buttonControl(_slide); _text->drawToScreen(WITH_MASK); - _system->update_screen(); + _system->updateScreen(); } SkyEngine::_systemVars.gameSpeed = speedDelay; return SPEED_CHANGED; @@ -705,7 +705,7 @@ uint16 Control::toggleFx(ConResource *pButton) { } pButton->drawToScreen(WITH_MASK); buttonControl(pButton); - _system->update_screen(); + _system->updateScreen(); return TOGGLED; } @@ -729,7 +729,7 @@ uint16 Control::toggleText(void) { drawTextCross(flags); - _system->update_screen(); + _system->updateScreen(); return TOGGLED; } @@ -848,7 +848,7 @@ uint16 Control::saveRestorePanel(bool allowSave) { } _text->drawToScreen(WITH_MASK); - _system->update_screen(); + _system->updateScreen(); _mouseClicked = false; delay(50); if (_keyPressed == 27) { // escape pressed @@ -1547,7 +1547,7 @@ uint16 Control::quickXRestore(uint16 slot) { _skyText->fnSetFont(0); _system->copy_rect(_screenBuf, GAME_SCREEN_WIDTH, 0, 0, FULL_SCREEN_WIDTH, FULL_SCREEN_HEIGHT); - _system->update_screen(); + _system->updateScreen(); if (SkyEngine::_systemVars.gameVersion < 331) _skyScreen->setPalette(60509); @@ -1571,7 +1571,7 @@ uint16 Control::quickXRestore(uint16 slot) { } 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(); + _system->updateScreen(); _skyScreen->showScreen(_skyScreen->giveCurrent()); _skyScreen->setPalette(60111); } diff --git a/sky/intro.cpp b/sky/intro.cpp index 267348360b..75b37c639c 100644 --- a/sky/intro.cpp +++ b/sky/intro.cpp @@ -793,7 +793,7 @@ bool Intro::floppyScrollFlirt(void) { } while (nrToDo == 255); } _system->copy_rect(scrollPos, GAME_SCREEN_WIDTH, 0, 0, GAME_SCREEN_WIDTH, GAME_SCREEN_HEIGHT); - _system->update_screen(); + _system->updateScreen(); if (!escDelay(40)) doContinue = false; } diff --git a/sky/music/musicbase.cpp b/sky/music/musicbase.cpp index 636a97bf64..da94653e88 100644 --- a/sky/music/musicbase.cpp +++ b/sky/music/musicbase.cpp @@ -34,7 +34,7 @@ MusicBase::MusicBase(Disk *pDisk, OSystem *system) { _musicVolume = 127; _system = system; _numberOfChannels = _currentMusic = 0; - _mutex = _system->create_mutex(); + _mutex = _system->createMutex(); } MusicBase::~MusicBase(void) { @@ -45,7 +45,7 @@ MusicBase::~MusicBase(void) { void MusicBase::loadSection(uint8 pSection) { - _system->lock_mutex(_mutex); + _system->lockMutex(_mutex); if (_currentMusic) stopMusic(); if (_musicData) @@ -62,7 +62,7 @@ void MusicBase::loadSection(uint8 pSection) { _numberOfChannels = _currentMusic = 0; setupPointers(); startDriver(); - _system->unlock_mutex(_mutex); + _system->unlockMutex(_mutex); } bool MusicBase::musicIsPlaying(void) { @@ -165,7 +165,7 @@ void MusicBase::loadNewMusic(void) { void MusicBase::pollMusic(void) { - _system->lock_mutex(_mutex); + _system->lockMutex(_mutex); uint8 newTempo; if (_onNextPoll.doReInit) startDriver(); if (_onNextPoll.doStopMusic) stopMusic(); @@ -181,7 +181,7 @@ void MusicBase::pollMusic(void) { updateTempo(); } } - _system->unlock_mutex(_mutex); + _system->unlockMutex(_mutex); _aktTime &= 0xFFFF; } diff --git a/sky/screen.cpp b/sky/screen.cpp index b471bbed28..3a873dac0f 100644 --- a/sky/screen.cpp +++ b/sky/screen.cpp @@ -76,7 +76,7 @@ Screen::Screen(OSystem *pSystem, Disk *pDisk) { } //set the palette - _system->set_palette(tmpPal, 0, VGA_COLOURS); + _system->setPalette(tmpPal, 0, VGA_COLOURS); _currentPalette = 0; _seqInfo.framesLeft = 0; @@ -94,15 +94,15 @@ void Screen::clearScreen(void) { memset(_currentScreen, 0, FULL_SCREEN_WIDTH * FULL_SCREEN_HEIGHT); _system->copy_rect(_currentScreen, GAME_SCREEN_WIDTH, 0, 0, GAME_SCREEN_WIDTH, GAME_SCREEN_HEIGHT); - _system->update_screen(); + _system->updateScreen(); } //set a new palette, pal is a pointer to dos vga rgb components 0..63 void Screen::setPalette(uint8 *pal) { convertPalette(pal, _palette); - _system->set_palette(_palette, 0, GAME_COLOURS); - _system->update_screen(); + _system->setPalette(_palette, 0, GAME_COLOURS); + _system->updateScreen(); } void Screen::setPaletteEndian(uint8 *pal) { @@ -115,8 +115,8 @@ void Screen::setPaletteEndian(uint8 *pal) { #else convertPalette(pal, _palette); #endif - _system->set_palette(_palette, 0, GAME_COLOURS); - _system->update_screen(); + _system->setPalette(_palette, 0, GAME_COLOURS); + _system->updateScreen(); } void Screen::halvePalette(void) { @@ -128,7 +128,7 @@ void Screen::halvePalette(void) { halfPalette[(cnt << 2) | 2] = _palette[(cnt << 2) | 2] >> 1; halfPalette[(cnt << 2) | 3] = 0; } - _system->set_palette(halfPalette, 0, GAME_COLOURS); + _system->setPalette(halfPalette, 0, GAME_COLOURS); } void Screen::setPalette(uint16 fileNum) { @@ -152,7 +152,7 @@ void Screen::showScreen(uint16 fileNum) { void Screen::showScreen(uint8 *pScreen) { _system->copy_rect(pScreen, 320, 0, 0, GAME_SCREEN_WIDTH, GAME_SCREEN_HEIGHT); - _system->update_screen(); + _system->updateScreen(); } void Screen::convertPalette(uint8 *inPal, uint8* outPal) { //convert 3 byte 0..63 rgb to 4byte 0..255 rgbx @@ -221,7 +221,7 @@ void Screen::flip(bool doUpdate) { } } if (doUpdate) - _system->update_screen(); + _system->updateScreen(); } void Screen::fnDrawScreen(uint32 palette, uint32 scroll) { @@ -247,8 +247,8 @@ void Screen::fnFadeDown(uint32 scroll) { } else { for (uint8 cnt = 0; cnt < 32; cnt++) { palette_fadedown_helper((uint32 *)_palette, GAME_COLOURS); - _system->set_palette(_palette, 0, GAME_COLOURS); - _system->update_screen(); + _system->setPalette(_palette, 0, GAME_COLOURS); + _system->updateScreen(); _system->delay_msecs(20); } } @@ -295,8 +295,8 @@ void Screen::paletteFadeUp(uint8 *pal) { _palette[(colCnt << 2) | 1] = (tmpPal[(colCnt << 2) | 1] * cnt) >> 5; _palette[(colCnt << 2) | 2] = (tmpPal[(colCnt << 2) | 2] * cnt) >> 5; } - _system->set_palette(_palette, 0, GAME_COLOURS); - _system->update_screen(); + _system->setPalette(_palette, 0, GAME_COLOURS); + _system->updateScreen(); _system->delay_msecs(20); } } @@ -482,7 +482,7 @@ void Screen::processSequence(void) { } scrPtr += 15 * GAME_SCREEN_WIDTH; } - _system->update_screen(); + _system->updateScreen(); _seqInfo.framesLeft--; } if (_seqInfo.framesLeft == 0) { -- cgit v1.2.3