diff options
Diffstat (limited to 'engines/bladerunner/ui')
| -rw-r--r-- | engines/bladerunner/ui/kia.cpp | 9 | ||||
| -rw-r--r-- | engines/bladerunner/ui/kia_section_save.cpp | 2 | ||||
| -rw-r--r-- | engines/bladerunner/ui/ui_check_box.cpp | 3 | ||||
| -rw-r--r-- | engines/bladerunner/ui/ui_container.cpp | 12 |
4 files changed, 13 insertions, 13 deletions
diff --git a/engines/bladerunner/ui/kia.cpp b/engines/bladerunner/ui/kia.cpp index c889890276..2cc978f0cc 100644 --- a/engines/bladerunner/ui/kia.cpp +++ b/engines/bladerunner/ui/kia.cpp @@ -524,13 +524,12 @@ void KIA::handleKeyDown(const Common::KeyState &kbd) { void KIA::playerReset() { if (_playerActorDialogueQueueSize != _playerActorDialogueQueuePosition) { - if (_playerActorDialogueQueueSize != _playerActorDialogueQueuePosition) { - int actorId = _playerActorDialogueQueue[_playerActorDialogueQueuePosition].actorId; - if (_vm->_actors[actorId]->isSpeeching()) { - _vm->_actors[actorId]->speechStop(); - } + int actorId = _playerActorDialogueQueue[_playerActorDialogueQueuePosition].actorId; + if (_vm->_actors[actorId]->isSpeeching()) { + _vm->_actors[actorId]->speechStop(); } } + _playerActorDialogueQueueSize = _playerActorDialogueQueuePosition; _playerSliceModelId = -1; if (_playerPhotographId != -1) { diff --git a/engines/bladerunner/ui/kia_section_save.cpp b/engines/bladerunner/ui/kia_section_save.cpp index 46ee0384d2..0dbd6033c1 100644 --- a/engines/bladerunner/ui/kia_section_save.cpp +++ b/engines/bladerunner/ui/kia_section_save.cpp @@ -389,7 +389,7 @@ void KIASectionSave::save() { Common::OutSaveFile *saveFile = BladeRunner::SaveFileManager::openForSaving(_vm->getTargetName(), slot); if (saveFile == nullptr || saveFile->err()) { delete saveFile; - error("Can not open savegame file for writing"); + warning("KIASectionSave::save(): Can not open savegame file for writing"); return; } diff --git a/engines/bladerunner/ui/ui_check_box.cpp b/engines/bladerunner/ui/ui_check_box.cpp index 510d6e6dbd..0e572c287e 100644 --- a/engines/bladerunner/ui/ui_check_box.cpp +++ b/engines/bladerunner/ui/ui_check_box.cpp @@ -55,8 +55,9 @@ UICheckBox::UICheckBox(BladeRunnerEngine *vm, UIComponentCallback *valueChangedC void UICheckBox::draw(Graphics::Surface &surface) { - int shapeId; if (_rect.right > _rect.left && _rect.bottom > _rect.top) { + int shapeId; + uint timeNow = _vm->_time->currentSystem(); if (timeNow - _timeLast > 67) { int frameDelta = (timeNow - _timeLast) / 67u; diff --git a/engines/bladerunner/ui/ui_container.cpp b/engines/bladerunner/ui/ui_container.cpp index 34a8cecfb1..eed1bcd9a2 100644 --- a/engines/bladerunner/ui/ui_container.cpp +++ b/engines/bladerunner/ui/ui_container.cpp @@ -27,37 +27,37 @@ namespace BladeRunner { void UIContainer::draw(Graphics::Surface &surface) { - for (Common::Array<UIComponent*>::iterator component = _components.begin(); component != _components.end(); component++) { + for (Common::Array<UIComponent*>::iterator component = _components.begin(); component != _components.end(); ++component) { (*component)->draw(surface); } } void UIContainer::handleMouseMove(int mouseX, int mouseY) { - for (Common::Array<UIComponent*>::iterator component = _components.begin(); component != _components.end(); component++) { + for (Common::Array<UIComponent*>::iterator component = _components.begin(); component != _components.end(); ++component) { (*component)->handleMouseMove(mouseX, mouseY); } } void UIContainer::handleMouseDown(bool alternateButton) { - for (Common::Array<UIComponent*>::iterator component = _components.begin(); component != _components.end(); component++) { + for (Common::Array<UIComponent*>::iterator component = _components.begin(); component != _components.end(); ++component) { (*component)->handleMouseDown(alternateButton); } } void UIContainer::handleMouseUp(bool alternateButton) { - for (Common::Array<UIComponent*>::iterator component = _components.begin(); component != _components.end(); component++) { + for (Common::Array<UIComponent*>::iterator component = _components.begin(); component != _components.end(); ++component) { (*component)->handleMouseUp(alternateButton); } } void UIContainer::handleKeyUp(const Common::KeyState &kbd) { - for (Common::Array<UIComponent*>::iterator component = _components.begin(); component != _components.end(); component++) { + for (Common::Array<UIComponent*>::iterator component = _components.begin(); component != _components.end(); ++component) { (*component)->handleKeyUp(kbd); } } void UIContainer::handleKeyDown(const Common::KeyState &kbd) { - for (Common::Array<UIComponent*>::iterator component = _components.begin(); component != _components.end(); component++) { + for (Common::Array<UIComponent*>::iterator component = _components.begin(); component != _components.end(); ++component) { (*component)->handleKeyDown(kbd); } } |