diff options
| author | Cameron Cawley | 2019-07-17 19:05:16 +0100 |
|---|---|---|
| committer | Cameron Cawley | 2019-07-17 19:05:16 +0100 |
| commit | b594d04cd1160c0d11dec94f048f07d4ddb864c2 (patch) | |
| tree | a4d876c81b81716a0b481c0e6c9c71d0a1e1fd85 /engines/bladerunner/ui | |
| parent | caa4578add35021bfbb00b5f81359592402096a3 (diff) | |
| download | scummvm-rg350-b594d04cd1160c0d11dec94f048f07d4ddb864c2.tar.gz scummvm-rg350-b594d04cd1160c0d11dec94f048f07d4ddb864c2.tar.bz2 scummvm-rg350-b594d04cd1160c0d11dec94f048f07d4ddb864c2.zip | |
BLADERUNNER: Fix compilation on AmigaOS 4
Diffstat (limited to 'engines/bladerunner/ui')
| -rw-r--r-- | engines/bladerunner/ui/kia.cpp | 8 | ||||
| -rw-r--r-- | engines/bladerunner/ui/ui_check_box.cpp | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/engines/bladerunner/ui/kia.cpp b/engines/bladerunner/ui/kia.cpp index 7ad73ceea2..fe997d5543 100644 --- a/engines/bladerunner/ui/kia.cpp +++ b/engines/bladerunner/ui/kia.cpp @@ -261,17 +261,17 @@ void KIA::tick() { _playerVqaTimeLast = timeNow; if (_playerActorDialogueQueueSize == _playerActorDialogueQueuePosition || _playerSliceModelId != -1 || _playerPhotographId != -1 || _playerImage.getPixels() != nullptr) { if (_playerVisualizerState > 0) { - _playerVisualizerState = (_playerVisualizerState < timeDiffDiv48) ? 0u : MAX(_playerVisualizerState - timeDiffDiv48, 0u); + _playerVisualizerState = (_playerVisualizerState < timeDiffDiv48) ? 0u : MAX<uint32>(_playerVisualizerState - timeDiffDiv48, 0u); } } else { if (_playerVisualizerState < 2) { - _playerVisualizerState = MIN(_playerVisualizerState + timeDiffDiv48, 2u); + _playerVisualizerState = MIN<uint32>(_playerVisualizerState + timeDiffDiv48, 2u); } } if ( _playerSliceModelId != -1 || _playerPhotographId != -1 || _playerImage.getPixels() != nullptr) { if (_playerVqaFrame < 8) { - int newVqaFrame = MIN(timeDiffDiv48 + _playerVqaFrame, 8u); + int newVqaFrame = MIN<uint32>(timeDiffDiv48 + _playerVqaFrame, 8u); if (_playerVqaFrame <= 0 && newVqaFrame > 0) { _vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(kSfxMECHAN1), 100, 70, 70, 50, 0); } @@ -279,7 +279,7 @@ void KIA::tick() { } } else { if (_playerVqaFrame > 0) { - int newVqaFrame = (_playerVqaFrame < timeDiffDiv48) ? 0 : MAX(_playerVqaFrame - timeDiffDiv48, 0u); + int newVqaFrame = (_playerVqaFrame < timeDiffDiv48) ? 0 : MAX<uint32>(_playerVqaFrame - timeDiffDiv48, 0u); if (_playerVqaFrame >= 8 && newVqaFrame < 8) { _vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(kSfxMECHAN1C), 100, 70, 70, 50, 0); } diff --git a/engines/bladerunner/ui/ui_check_box.cpp b/engines/bladerunner/ui/ui_check_box.cpp index 935c53f98a..38fb86c679 100644 --- a/engines/bladerunner/ui/ui_check_box.cpp +++ b/engines/bladerunner/ui/ui_check_box.cpp @@ -67,9 +67,9 @@ void UICheckBox::draw(Graphics::Surface &surface) { _timeLast = timeNow; if (_isChecked) { - _frame = MIN(_frame + frameDelta, 5u); + _frame = MIN<uint32>(_frame + frameDelta, 5u); } else { - _frame = (_frame < frameDelta) ? 0 : MAX(_frame - frameDelta, 0u); + _frame = (_frame < frameDelta) ? 0 : MAX<uint32>(_frame - frameDelta, 0u); } } |