diff options
author | Max Horn | 2004-03-28 16:30:50 +0000 |
---|---|---|
committer | Max Horn | 2004-03-28 16:30:50 +0000 |
commit | 14378cb56e18237cf1b8b5e088995e0b91f47410 (patch) | |
tree | e646deabd966699f0538880f74883255df2810bb /sky | |
parent | efb5f3777a2aa664c6bc5e7fb5ab3f2b92da6ca8 (diff) | |
download | scummvm-rg350-14378cb56e18237cf1b8b5e088995e0b91f47410.tar.gz scummvm-rg350-14378cb56e18237cf1b8b5e088995e0b91f47410.tar.bz2 scummvm-rg350-14378cb56e18237cf1b8b5e088995e0b91f47410.zip |
Renamed more OSystem methods
svn-id: r13410
Diffstat (limited to 'sky')
-rw-r--r-- | sky/control.cpp | 20 | ||||
-rw-r--r-- | sky/intro.cpp | 6 | ||||
-rw-r--r-- | sky/mouse.cpp | 8 | ||||
-rw-r--r-- | sky/screen.cpp | 14 |
4 files changed, 24 insertions, 24 deletions
diff --git a/sky/control.cpp b/sky/control.cpp index afd4c96162..8afbc5ebcf 100644 --- a/sky/control.cpp +++ b/sky/control.cpp @@ -82,7 +82,7 @@ void ConResource::drawToScreen(bool doMask) { spriteData += _spriteData->s_width; } } - _system->copy_rect(updatePos, GAME_SCREEN_WIDTH, _x, _y, _spriteData->s_width, _spriteData->s_height); + _system->copyRectToScreen(updatePos, GAME_SCREEN_WIDTH, _x, _y, _spriteData->s_width, _spriteData->s_height); } TextResource::TextResource(void *pSpData, uint32 pNSprites, uint32 pCurSprite, uint16 pX, uint16 pY, uint32 pText, uint8 pOnClick, OSystem *system, uint8 *screen) : @@ -121,7 +121,7 @@ void TextResource::drawToScreen(bool doMask) { cpHeight = PAN_CHAR_HEIGHT; for (cnty = 0; cnty < cpHeight; cnty++) memcpy(_screen + (cnty + _oldY) * GAME_SCREEN_WIDTH + _oldX, _oldScreen + cnty * PAN_LINE_WIDTH, cpWidth); - _system->copy_rect(_screen + _oldY * GAME_SCREEN_WIDTH + _oldX, GAME_SCREEN_WIDTH, _oldX, _oldY, cpWidth, PAN_CHAR_HEIGHT); + _system->copyRectToScreen(_screen + _oldY * GAME_SCREEN_WIDTH + _oldX, GAME_SCREEN_WIDTH, _oldX, _oldY, cpWidth, PAN_CHAR_HEIGHT); } if (!_spriteData) { _oldX = GAME_SCREEN_WIDTH; @@ -145,7 +145,7 @@ void TextResource::drawToScreen(bool doMask) { copyDest += PAN_LINE_WIDTH; screenPos += GAME_SCREEN_WIDTH; } - _system->copy_rect(_screen + _y * GAME_SCREEN_WIDTH + _x, GAME_SCREEN_WIDTH, _x, _y, cpWidth, cpHeight); + _system->copyRectToScreen(_screen + _y * GAME_SCREEN_WIDTH + _x, GAME_SCREEN_WIDTH, _x, _y, cpWidth, cpHeight); } ControlStatus::ControlStatus(Text *skyText, OSystem *system, uint8 *scrBuf) { @@ -367,7 +367,7 @@ void Control::drawCross(uint16 x, uint16 y) { crossPos += CROSS_SZ_X; } bufPos = _screenBuf + y * GAME_SCREEN_WIDTH + x; - _system->copy_rect(bufPos, GAME_SCREEN_WIDTH, x, y, CROSS_SZ_X, CROSS_SZ_Y); + _system->copyRectToScreen(bufPos, GAME_SCREEN_WIDTH, x, y, CROSS_SZ_X, CROSS_SZ_Y); _text->drawToScreen(WITH_MASK); } @@ -391,7 +391,7 @@ void Control::animClick(ConResource *pButton) { void Control::drawMainPanel(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->copyRectToScreen(_screenBuf, GAME_SCREEN_WIDTH, 0, 0, GAME_SCREEN_WIDTH, FULL_SCREEN_HEIGHT); _controlPanel->drawToScreen(NO_MASK); _exitButton->drawToScreen(NO_MASK); _savePanButton->drawToScreen(NO_MASK); @@ -430,7 +430,7 @@ void Control::doLoadSavePanel(void) { saveRestorePanel(false); 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->copyRectToScreen(_screenBuf, GAME_SCREEN_WIDTH, 0, 0, GAME_SCREEN_WIDTH, FULL_SCREEN_HEIGHT); _system->updateScreen(); _skyScreen->forceRefresh(); _skyScreen->setPaletteEndian((uint8 *)SkyEngine::fetchCompact(SkyEngine::_systemVars.currentPalette)); @@ -496,7 +496,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->copyRectToScreen(_screenBuf, GAME_SCREEN_WIDTH, 0, 0, GAME_SCREEN_WIDTH, FULL_SCREEN_HEIGHT); _system->updateScreen(); _skyScreen->forceRefresh(); _skyScreen->setPaletteEndian((uint8 *)SkyEngine::fetchCompact(SkyEngine::_systemVars.currentPalette)); @@ -992,7 +992,7 @@ void Control::showSprites(dataFileHeader **nameSprites, bool allowSave) { drawResource->setXY(GAME_NAME_X + _enteredTextWidth + 1, GAME_NAME_Y + cnt * PAN_CHAR_HEIGHT + 4); drawResource->drawToScreen(WITH_MASK); } - _system->copy_rect(_screenBuf + (GAME_NAME_Y + cnt * PAN_CHAR_HEIGHT) * GAME_SCREEN_WIDTH + GAME_NAME_X, GAME_SCREEN_WIDTH, GAME_NAME_X, GAME_NAME_Y + cnt * PAN_CHAR_HEIGHT, PAN_LINE_WIDTH, PAN_CHAR_HEIGHT); + _system->copyRectToScreen(_screenBuf + (GAME_NAME_Y + cnt * PAN_CHAR_HEIGHT) * GAME_SCREEN_WIDTH + GAME_NAME_X, GAME_SCREEN_WIDTH, GAME_NAME_X, GAME_NAME_Y + cnt * PAN_CHAR_HEIGHT, PAN_LINE_WIDTH, PAN_CHAR_HEIGHT); } else drawResource->drawToScreen(NO_MASK); } @@ -1546,7 +1546,7 @@ uint16 Control::quickXRestore(uint16 slot) { _savedCharSet = _skyText->giveCurrentCharSet(); _skyText->fnSetFont(0); - _system->copy_rect(_screenBuf, GAME_SCREEN_WIDTH, 0, 0, FULL_SCREEN_WIDTH, FULL_SCREEN_HEIGHT); + _system->copyRectToScreen(_screenBuf, GAME_SCREEN_WIDTH, 0, 0, FULL_SCREEN_WIDTH, FULL_SCREEN_HEIGHT); _system->updateScreen(); if (SkyEngine::_systemVars.gameVersion < 331) @@ -1570,7 +1570,7 @@ uint16 Control::quickXRestore(uint16 slot) { _skyScreen->setPaletteEndian((uint8 *)SkyEngine::fetchCompact(SkyEngine::_systemVars.currentPalette)); } 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->copyRectToScreen(_screenBuf, GAME_SCREEN_WIDTH, 0, 0, GAME_SCREEN_WIDTH, FULL_SCREEN_HEIGHT); _system->updateScreen(); _skyScreen->showScreen(_skyScreen->giveCurrent()); _skyScreen->setPalette(60111); diff --git a/sky/intro.cpp b/sky/intro.cpp index a9628905f5..2850663755 100644 --- a/sky/intro.cpp +++ b/sky/intro.cpp @@ -792,7 +792,7 @@ bool Intro::floppyScrollFlirt(void) { vgaPtr += nrToDo; } while (nrToDo == 255); } - _system->copy_rect(scrollPos, GAME_SCREEN_WIDTH, 0, 0, GAME_SCREEN_WIDTH, GAME_SCREEN_HEIGHT); + _system->copyRectToScreen(scrollPos, GAME_SCREEN_WIDTH, 0, 0, GAME_SCREEN_WIDTH, GAME_SCREEN_HEIGHT); _system->updateScreen(); #ifndef _WIN32_WCE if (!escDelay(40)) @@ -868,7 +868,7 @@ void Intro::showTextBuf(void) { saveBuf += width; } screenBuf = _skyScreen->giveCurrent() + y * GAME_SCREEN_WIDTH + x; - _system->copy_rect(screenBuf, GAME_SCREEN_WIDTH, x, y, width, height); + _system->copyRectToScreen(screenBuf, GAME_SCREEN_WIDTH, x, y, width, height); } void Intro::restoreScreen(void) { @@ -884,7 +884,7 @@ void Intro::restoreScreen(void) { screenBuf += GAME_SCREEN_WIDTH; saveBuf += width; } - _system->copy_rect(_saveBuf + sizeof(dataFileHeader), width, x, y, width, height); + _system->copyRectToScreen(_saveBuf + sizeof(dataFileHeader), width, x, y, width, height); } bool Intro::escDelay(uint32 msecs) { diff --git a/sky/mouse.cpp b/sky/mouse.cpp index b417b99b85..71271cf61e 100644 --- a/sky/mouse.cpp +++ b/sky/mouse.cpp @@ -120,7 +120,7 @@ bool Mouse::fnAddHuman(void) { if (_mouseY < 2) //stop mouse activating top line _mouseY = 2; - _system->warp_mouse(_mouseX, _mouseY); + _system->warpMouse(_mouseX, _mouseY); //force the pointer engine into running a get-off //even if it's over nothing @@ -207,9 +207,9 @@ void Mouse::spriteMouse(uint16 frameNum, uint8 mouseX, uint8 mouseY) { uint16 mouseWidth = ((struct dataFileHeader *)_miceData)->s_width; uint16 mouseHeight = ((struct dataFileHeader *)_miceData)->s_height; - _system->set_mouse_cursor(newCursor, mouseWidth, mouseHeight, mouseX, mouseY); - if (frameNum == MOUSE_BLANK) _system->show_mouse(false); - else _system->show_mouse(true); + _system->setMouseCursor(newCursor, mouseWidth, mouseHeight, mouseX, mouseY); + if (frameNum == MOUSE_BLANK) _system->showMouse(false); + else _system->showMouse(true); } void Mouse::mouseEngine(uint16 mouseX, uint16 mouseY) { diff --git a/sky/screen.cpp b/sky/screen.cpp index 3a873dac0f..2623f21dbb 100644 --- a/sky/screen.cpp +++ b/sky/screen.cpp @@ -93,7 +93,7 @@ Screen::~Screen(void) { 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->copyRectToScreen(_currentScreen, GAME_SCREEN_WIDTH, 0, 0, GAME_SCREEN_WIDTH, GAME_SCREEN_HEIGHT); _system->updateScreen(); } @@ -151,7 +151,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->copyRectToScreen(pScreen, 320, 0, 0, GAME_SCREEN_WIDTH, GAME_SCREEN_HEIGHT); _system->updateScreen(); } @@ -211,12 +211,12 @@ void Screen::flip(bool doUpdate) { if (!copyWidth) copyX = cntx * GRID_W; copyWidth += GRID_W; } else if (copyWidth) { - _system->copy_rect(_currentScreen + cnty * GRID_H * GAME_SCREEN_WIDTH + copyX, GAME_SCREEN_WIDTH, copyX, cnty * GRID_H, copyWidth, GRID_H); + _system->copyRectToScreen(_currentScreen + cnty * GRID_H * GAME_SCREEN_WIDTH + copyX, GAME_SCREEN_WIDTH, copyX, cnty * GRID_H, copyWidth, GRID_H); copyWidth = 0; } } if (copyWidth) { - _system->copy_rect(_currentScreen + cnty * GRID_H * GAME_SCREEN_WIDTH + copyX, GAME_SCREEN_WIDTH, copyX, cnty * GRID_H, copyWidth, GRID_H); + _system->copyRectToScreen(_currentScreen + cnty * GRID_H * GAME_SCREEN_WIDTH + copyX, GAME_SCREEN_WIDTH, copyX, cnty * GRID_H, copyWidth, GRID_H); copyWidth = 0; } } @@ -470,14 +470,14 @@ void Screen::processSequence(void) { } rectWid++; } else if (rectWid) { - _system->copy_rect(rectPtr, GAME_SCREEN_WIDTH, rectX << 4, rectY << 4, rectWid << 4, 16); + _system->copyRectToScreen(rectPtr, GAME_SCREEN_WIDTH, rectX << 4, rectY << 4, rectWid << 4, 16); rectWid = 0; } scrPtr += 16; gridPtr++; } if (rectWid) { - _system->copy_rect(rectPtr, GAME_SCREEN_WIDTH, rectX << 4, rectY << 4, rectWid << 4, 16); + _system->copyRectToScreen(rectPtr, GAME_SCREEN_WIDTH, rectX << 4, rectY << 4, rectWid << 4, 16); rectWid = 0; } scrPtr += 15 * GAME_SCREEN_WIDTH; @@ -781,7 +781,7 @@ void Screen::showGrid(uint8 *gridBuf) { gridData <<= 1; } } - _system->copy_rect(_currentScreen, GAME_SCREEN_WIDTH, 0, 0, GAME_SCREEN_WIDTH, GAME_SCREEN_HEIGHT); + _system->copyRectToScreen(_currentScreen, GAME_SCREEN_WIDTH, 0, 0, GAME_SCREEN_WIDTH, GAME_SCREEN_HEIGHT); } |