diff options
author | Max Horn | 2004-09-28 20:19:37 +0000 |
---|---|---|
committer | Max Horn | 2004-09-28 20:19:37 +0000 |
commit | ce8c99bf62838099142aa79f2935e64639aa5571 (patch) | |
tree | 5a2ea91139133878cdffab8ed86033fbf5448ea9 /sword2/driver | |
parent | 6a50ba2308c6a9fc3eb733f310c87ed279b565ed (diff) | |
download | scummvm-rg350-ce8c99bf62838099142aa79f2935e64639aa5571.tar.gz scummvm-rg350-ce8c99bf62838099142aa79f2935e64639aa5571.tar.bz2 scummvm-rg350-ce8c99bf62838099142aa79f2935e64639aa5571.zip |
Rename remaining OSystem methods to match our coding guidelines
svn-id: r15332
Diffstat (limited to 'sword2/driver')
-rw-r--r-- | sword2/driver/animation.cpp | 10 | ||||
-rw-r--r-- | sword2/driver/d_sound.cpp | 2 | ||||
-rw-r--r-- | sword2/driver/menu.cpp | 4 | ||||
-rw-r--r-- | sword2/driver/palette.cpp | 8 | ||||
-rw-r--r-- | sword2/driver/render.cpp | 10 |
5 files changed, 17 insertions, 17 deletions
diff --git a/sword2/driver/animation.cpp b/sword2/driver/animation.cpp index bc68b2e0f0..69dbc0289a 100644 --- a/sword2/driver/animation.cpp +++ b/sword2/driver/animation.cpp @@ -254,7 +254,7 @@ int32 MoviePlayer::play(const char *filename, MovieTextObject *text[], byte *mus _vm->_sound->playFx(0, musicOut, 0, 0, RDSE_FXLEADOUT); OSystem::Event event; - while (_sys->poll_event(&event)) { + while (_sys->pollEvent(event)) { switch (event.event_code) { #ifndef BACKEND_8BIT case OSystem::EVENT_SCREEN_CHANGED: @@ -277,7 +277,7 @@ int32 MoviePlayer::play(const char *filename, MovieTextObject *text[], byte *mus if (!skipCutscene) { // Sleep for one frame so that the last frame is displayed. - _sys->delay_msecs(1000 / 12); + _sys->delayMillis(1000 / 12); } // Most movies fade to black on their own, but not all of them. Since @@ -307,7 +307,7 @@ int32 MoviePlayer::play(const char *filename, MovieTextObject *text[], byte *mus while (handle.isActive()) { _vm->_graphics->updateDisplay(false); - _sys->delay_msecs(100); + _sys->delayMillis(100); } // Clear the screen again @@ -436,7 +436,7 @@ int32 MoviePlayer::playDummy(const char *filename, MovieTextObject *text[], byte // frame rate the original movies had, or even if it // was constant, but this seems to work reasonably. - _sys->delay_msecs(90); + _sys->delayMillis(90); } // Wait for the voice to stop playing. This is to make sure @@ -446,7 +446,7 @@ int32 MoviePlayer::playDummy(const char *filename, MovieTextObject *text[], byte while (handle.isActive()) { _vm->_graphics->updateDisplay(false); - _sys->delay_msecs(100); + _sys->delayMillis(100); } closeTextObject(text[textCounter]); diff --git a/sword2/driver/d_sound.cpp b/sword2/driver/d_sound.cpp index 35fc9a076c..4c38326b2e 100644 --- a/sword2/driver/d_sound.cpp +++ b/sword2/driver/d_sound.cpp @@ -663,7 +663,7 @@ void Sound::waitForLeadOut(void) { while (_fx[i]._handle.isActive()) { _vm->_graphics->updateDisplay(); - _vm->_system->delay_msecs(30); + _vm->_system->delayMillis(30); } } diff --git a/sword2/driver/menu.cpp b/sword2/driver/menu.cpp index 8fa68791db..a58f84540e 100644 --- a/sword2/driver/menu.cpp +++ b/sword2/driver/menu.cpp @@ -55,10 +55,10 @@ void Graphics::processMenu(void) { static int32 lastTime = 0; if (lastTime == 0) { - lastTime = _vm->_system->get_msecs(); + lastTime = _vm->_system->getMillis(); frameCount = 1; } else { - int32 delta = _vm->_system->get_msecs() - lastTime; + int32 delta = _vm->_system->getMillis() - lastTime; if (delta > 250) { lastTime += delta; diff --git a/sword2/driver/palette.cpp b/sword2/driver/palette.cpp index 621ac1a7a1..9425cb7dee 100644 --- a/sword2/driver/palette.cpp +++ b/sword2/driver/palette.cpp @@ -92,7 +92,7 @@ int32 Graphics::fadeUp(float time) { _fadeTotalTime = (int32) (time * 1000); _fadeStatus = RDFADE_UP; - _fadeStartTime = _vm->_system->get_msecs(); + _fadeStartTime = _vm->_system->getMillis(); return RD_OK; } @@ -108,7 +108,7 @@ int32 Graphics::fadeDown(float time) { _fadeTotalTime = (int32) (time * 1000); _fadeStatus = RDFADE_DOWN; - _fadeStartTime = _vm->_system->get_msecs(); + _fadeStartTime = _vm->_system->getMillis(); return RD_OK; } @@ -126,7 +126,7 @@ uint8 Graphics::getFadeStatus(void) { void Graphics::waitForFade(void) { while (getFadeStatus() != RDFADE_NONE && getFadeStatus() != RDFADE_BLACK) { updateDisplay(); - _vm->_system->delay_msecs(20); + _vm->_system->delayMillis(20); } } @@ -144,7 +144,7 @@ void Graphics::fadeServer(void) { // I don't know if this is necessary, but let's limit how often the // palette is updated, just to be safe. - currentTime = _vm->_system->get_msecs(); + currentTime = _vm->_system->getMillis(); if (currentTime - previousTime <= 25) return; diff --git a/sword2/driver/render.cpp b/sword2/driver/render.cpp index b3d73df142..bd9fba2c64 100644 --- a/sword2/driver/render.cpp +++ b/sword2/driver/render.cpp @@ -419,7 +419,7 @@ void Graphics::renderParallax(Parallax *p, int16 l) { */ void Graphics::initialiseRenderCycle(void) { - _initialTime = _vm->_system->get_msecs(); + _initialTime = _vm->_system->getMillis(); _totalTime = _initialTime + MILLISECSPERCYCLE; } @@ -432,7 +432,7 @@ void Graphics::startRenderCycle(void) { _scrollXOld = _scrollX; _scrollYOld = _scrollY; - _startTime = _vm->_system->get_msecs(); + _startTime = _vm->_system->getMillis(); if (_startTime + _renderAverageTime >= _totalTime) { _scrollX = _scrollXTarget; @@ -461,7 +461,7 @@ bool Graphics::endRenderCycle(void) { static int32 renderCountIndex = 0; int32 time; - time = _vm->_system->get_msecs(); + time = _vm->_system->getMillis(); renderTimeLog[renderCountIndex] = time - _startTime; _startTime = time; _renderAverageTime = (renderTimeLog[0] + renderTimeLog[1] + renderTimeLog[2] + renderTimeLog[3]) >> 2; @@ -487,7 +487,7 @@ bool Graphics::endRenderCycle(void) { // If we have already reached the scroll target sleep for the // rest of the render cycle. _vm->sleepUntil(_totalTime); - _initialTime = _vm->_system->get_msecs(); + _initialTime = _vm->_system->getMillis(); _totalTime += MILLISECSPERCYCLE; return true; } @@ -512,7 +512,7 @@ bool Graphics::endRenderCycle(void) { // Give the other threads some breathing space. This apparently helps // against bug #875683, though I was never able to reproduce it for // myself. - _vm->_system->delay_msecs(10); + _vm->_system->delayMillis(10); #endif return false; |