diff options
| author | Strangerke | 2019-09-13 01:45:52 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2019-11-13 22:07:08 +0100 |
| commit | 775aa1a63b4d44d2eb77b3e53c4e10348440a6e2 (patch) | |
| tree | 6fcf921f63a8fe4c8aac9177c2100c905b10b115 /engines/griffon/dialogs.cpp | |
| parent | 040513ae5d2655c0fe25c2a44c2263b0710fa565 (diff) | |
| download | scummvm-rg350-775aa1a63b4d44d2eb77b3e53c4e10348440a6e2.tar.gz scummvm-rg350-775aa1a63b4d44d2eb77b3e53c4e10348440a6e2.tar.bz2 scummvm-rg350-775aa1a63b4d44d2eb77b3e53c4e10348440a6e2.zip | |
GRIFFON: Use CLIP where possible
Diffstat (limited to 'engines/griffon/dialogs.cpp')
| -rw-r--r-- | engines/griffon/dialogs.cpp | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/engines/griffon/dialogs.cpp b/engines/griffon/dialogs.cpp index 03254ce006..e30b476c58 100644 --- a/engines/griffon/dialogs.cpp +++ b/engines/griffon/dialogs.cpp @@ -124,10 +124,7 @@ void GriffonEngine::title(int mode) { float yf = 255.0; if (_ticks < _ticks1 + 1000) { yf = 255.0 * ((float)(_ticks - _ticks1) / 1000.0); - if (y < 0.0) - yf = 0.0; - if (y > 255.0) - yf = 255.0; + yf = CLIP<float>(yf, 0.0, 255.0); } _videobuffer->setAlpha((int)yf); @@ -274,10 +271,7 @@ void GriffonEngine::configMenu() { if (i == 15 || i == 17) { int vol = (i == 15 ? config.musicvol : config.effectsvol) * 9 / 255; - if (vol < 0) - vol = 0; - if (vol > 9) - vol = 9; + vol = CLIP(vol, 0, 9); strcpy(line, "[----------]"); line[vol + 1] = 'X'; @@ -322,10 +316,7 @@ void GriffonEngine::configMenu() { float yy = 255.0; if (_ticks < _ticks1 + 1000) { yy = 255.0 * ((float)(_ticks - _ticks1) / 1000.0); - if (yy < 0.0) - yy = 0.0; - if (yy > 255.0) - yy = 255.0; + yy = CLIP<float>(yy, 0.0, 255.0); } _videobuffer->setAlpha((int)yy); @@ -747,10 +738,7 @@ void GriffonEngine::saveLoadNew() { int yy = 255; if (_ticks < _ticks1 + 1000) { yy = 255 * (_ticks - _ticks1) / 1000; - if (yy < 0) - yy = 0; - if (yy > 255) - yy = 255; + yy = CLIP(yy, 0, 255); } _videobuffer->setAlpha((int)yy); |