diff options
| author | Strangerke | 2019-10-22 08:21:24 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2019-11-13 22:07:08 +0100 |
| commit | bfd5abdee35f3b0b720ba19f021433f7e6b9f477 (patch) | |
| tree | f5f9d32493017652c2943d26fcda3306cd37302c /engines/griffon | |
| parent | 57af73cb18c243d6af86cbaf56da73eb0f2cc96e (diff) | |
| download | scummvm-rg350-bfd5abdee35f3b0b720ba19f021433f7e6b9f477.tar.gz scummvm-rg350-bfd5abdee35f3b0b720ba19f021433f7e6b9f477.tar.bz2 scummvm-rg350-bfd5abdee35f3b0b720ba19f021433f7e6b9f477.zip | |
GRIFFON: Rename _ticks1 to ticks1 as it's at function level
Diffstat (limited to 'engines/griffon')
| -rw-r--r-- | engines/griffon/dialogs.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/engines/griffon/dialogs.cpp b/engines/griffon/dialogs.cpp index d822945dd2..c7d7a6a855 100644 --- a/engines/griffon/dialogs.cpp +++ b/engines/griffon/dialogs.cpp @@ -63,7 +63,7 @@ void GriffonEngine::title(int mode) { int cursel = 0; int keypause = _ticks + 220; - int _ticks1 = _ticks; + int ticks1 = _ticks; if (config.music) { setChannelVolume(_musicchannel, 0); @@ -122,8 +122,8 @@ void GriffonEngine::title(int mode) { _itemimg[15]->blit(*_videobuffer, rc.left, rc.top); float yf = 255.0; - if (_ticks < _ticks1 + 1000) { - yf = 255.0 * ((float)(_ticks - _ticks1) / 1000.0); + if (_ticks < ticks1 + 1000) { + yf = 255.0 * ((float)(_ticks - ticks1) / 1000.0); yf = CLIP<float>(yf, 0.0, 255.0); } @@ -181,12 +181,12 @@ void GriffonEngine::title(int mode) { saveLoadNew(); _ticks = g_system->getMillis(); keypause = _ticks + 150; - _ticks1 = _ticks; + ticks1 = _ticks; } else if (cursel == 1) { configMenu(); _ticks = g_system->getMillis(); keypause = _ticks + 150; - _ticks1 = _ticks; + ticks1 = _ticks; } else if (cursel == 2) { _shouldQuit = true; } else if (cursel == 3) { @@ -220,7 +220,7 @@ void GriffonEngine::configMenu() { Graphics::TransparentSurface *configwindow = loadImage("art/configwindow.bmp", true); configwindow->setAlpha(160, true); - int _ticks1 = _ticks; + int ticks1 = _ticks; do { _videobuffer->fillRect(Common::Rect(0, 0, _videobuffer->w, _videobuffer->h), 0); @@ -314,8 +314,8 @@ void GriffonEngine::configMenu() { _itemimg[15]->blit(*_videobuffer, rc.left, rc.top); float yy = 255.0; - if (_ticks < _ticks1 + 1000) { - yy = 255.0 * ((float)(_ticks - _ticks1) / 1000.0); + if (_ticks < ticks1 + 1000) { + yy = 255.0 * ((float)(_ticks - ticks1) / 1000.0); yy = CLIP<float>(yy, 0.0, 255.0); } @@ -472,7 +472,7 @@ void GriffonEngine::saveLoadNew() { bool lowerLock = false; _ticks = g_system->getMillis(); - int _ticks1 = _ticks; + int ticks1 = _ticks; int tickpause = _ticks + 150; do { @@ -734,8 +734,8 @@ void GriffonEngine::saveLoadNew() { } int yy = 255; - if (_ticks < _ticks1 + 1000) { - yy = 255 * (_ticks - _ticks1) / 1000; + if (_ticks < ticks1 + 1000) { + yy = 255 * (_ticks - ticks1) / 1000; yy = CLIP(yy, 0, 255); } |