diff options
| author | Filippos Karapetis | 2016-01-08 02:00:37 +0200 |
|---|---|---|
| committer | Filippos Karapetis | 2016-01-08 02:01:28 +0200 |
| commit | 31d47d6be255d960d61805ea739bc02ef677136e (patch) | |
| tree | 8cbda57c3248a01181f16db6567d2211569392d0 | |
| parent | e3b9f726a1361d60cf693429095950826766fe93 (diff) | |
| download | scummvm-rg350-31d47d6be255d960d61805ea739bc02ef677136e.tar.gz scummvm-rg350-31d47d6be255d960d61805ea739bc02ef677136e.tar.bz2 scummvm-rg350-31d47d6be255d960d61805ea739bc02ef677136e.zip | |
LAB: Bugfixes for the lowres DOS version
The lowres DOS version should be working properly now
| -rw-r--r-- | engines/lab/eventman.cpp | 14 | ||||
| -rw-r--r-- | engines/lab/interface.cpp | 2 | ||||
| -rw-r--r-- | engines/lab/speciallocks.cpp | 6 | ||||
| -rw-r--r-- | engines/lab/utils.cpp | 2 |
4 files changed, 4 insertions, 20 deletions
diff --git a/engines/lab/eventman.cpp b/engines/lab/eventman.cpp index b1348371b1..f9b3d2f388 100644 --- a/engines/lab/eventman.cpp +++ b/engines/lab/eventman.cpp @@ -78,17 +78,7 @@ Button *EventManager::checkButtonHit(ButtonList *buttonList, Common::Point pos) Common::Rect buttonRect(button->_x, button->_y, button->_x + button->_image->_width - 1, button->_y + button->_image->_height - 1); if (buttonRect.contains(pos) && button->_isEnabled) { - if (_vm->_isHiRes) { - _hitButton = button; - } else { - button->_altImage->drawImage(button->_x, button->_y); - - for (int i = 0; i < 3; i++) - _vm->waitTOF(); - - button->_image->drawImage(button->_x, button->_y); - } - + _hitButton = button; return button; } } @@ -156,7 +146,7 @@ void EventManager::processInput() { switch (event.type) { case Common::EVENT_LBUTTONDOWN: if (_screenButtonList) - curButton = checkButtonHit(_screenButtonList, _vm->_isHiRes ? _mousePos : Common::Point(_mousePos.x / 2, _mousePos.y)); + curButton = checkButtonHit(_screenButtonList, _mousePos); if (curButton) _lastButtonHit = curButton; diff --git a/engines/lab/interface.cpp b/engines/lab/interface.cpp index 30f2f13fa5..41a9047ba9 100644 --- a/engines/lab/interface.cpp +++ b/engines/lab/interface.cpp @@ -124,8 +124,6 @@ IntuiMessage *EventManager::getMsg() { message._msgClass = (_leftClick) ? kMessageLeftClick : kMessageRightClick; message._qualifier = 0; message._mouse = _mousePos; - if (!_vm->_isHiRes) - message._mouse.x /= 2; _leftClick = _rightClick = false; return &message; } else if (_keyPressed.keycode != Common::KEYCODE_INVALID) { diff --git a/engines/lab/speciallocks.cpp b/engines/lab/speciallocks.cpp index fe70b0f111..6470e58641 100644 --- a/engines/lab/speciallocks.cpp +++ b/engines/lab/speciallocks.cpp @@ -323,11 +323,7 @@ void SpecialLocks::changeCombination(uint16 number) { byte *buffer = new byte[_numberImages[1]->_width * _numberImages[1]->_height * 2]; for (int i = 1; i <= (_numberImages[combnum]->_height / 2); i++) { - if (_vm->_isHiRes) { - if (i & 1) - _vm->waitTOF(); - } - else + if (i & 1) _vm->waitTOF(); display.setData(_vm->_graphics->getCurrentDrawingBuffer(), false); diff --git a/engines/lab/utils.cpp b/engines/lab/utils.cpp index a1409d231b..957e996c03 100644 --- a/engines/lab/utils.cpp +++ b/engines/lab/utils.cpp @@ -162,7 +162,7 @@ void Utils::verticalUnDiff(T *dest, Common::File *sourceFile, uint16 bytesPerRow while (copy) { if (bytesPerWord == 1) - *curPtr++ = sourceFile->readByte(); + *curPtr = sourceFile->readByte(); else if (bytesPerWord == 2) *curPtr = sourceFile->readUint16LE(); else if (bytesPerWord == 4) |