diff options
| author | Strangerke | 2012-12-12 23:16:07 +0100 |
|---|---|---|
| committer | Strangerke | 2012-12-12 23:16:07 +0100 |
| commit | fb5d1736fa8e0a513e8f9125760412e79d9bbe7a (patch) | |
| tree | 33530064b287c3f44ff7e77fc61020cd182e12cb | |
| parent | eece86d78e6821638772da0a5198e690c0f08745 (diff) | |
| download | scummvm-rg350-fb5d1736fa8e0a513e8f9125760412e79d9bbe7a.tar.gz scummvm-rg350-fb5d1736fa8e0a513e8f9125760412e79d9bbe7a.tar.bz2 scummvm-rg350-fb5d1736fa8e0a513e8f9125760412e79d9bbe7a.zip | |
HOPKINS: Fix bugs introduced in previous commits
| -rw-r--r-- | engines/hopkins/events.cpp | 12 | ||||
| -rw-r--r-- | engines/hopkins/font.cpp | 2 | ||||
| -rw-r--r-- | engines/hopkins/objects.cpp | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/engines/hopkins/events.cpp b/engines/hopkins/events.cpp index 8f077d5463..b0be096dc6 100644 --- a/engines/hopkins/events.cpp +++ b/engines/hopkins/events.cpp @@ -145,13 +145,13 @@ void EventsManager::changeMouseCursor(int id) { if (_mouseCursorId != 23) { if (id == 4 && _mouseCursorId == 4 && _vm->_globals.NOMARCHE) - _mouseCursorId = 0; - if (_mouseCursorId == 25) - _mouseCursorId = 5; + cursorId = 0; + if (cursorId == 25) + cursorId = 5; - if (_oldIconId != _mouseCursorId || !_mouseCursorId) { - _oldIconId = _mouseCursorId; - _mouseCursorId = cursorId; + if (_oldIconId != cursorId || !cursorId) { + _oldIconId = cursorId; + _mouseSpriteId = cursorId; updateCursor(); } diff --git a/engines/hopkins/font.cpp b/engines/hopkins/font.cpp index 400ab48cfe..cc5f2c05a6 100644 --- a/engines/hopkins/font.cpp +++ b/engines/hopkins/font.cpp @@ -352,7 +352,7 @@ LABEL_57: _vm->_globals.largeur_boite = _textSortArray[i]; } - if (_text[idx]._textType > 3) { + if ((_text[idx]._textType < 2) || (_text[idx]._textType > 3)) { int i; for (i = xp - _vm->_eventsManager._startPos.x; _vm->_globals.largeur_boite + i > 638 && i > -2 && _text[idx]._textType; i -= 2) ; diff --git a/engines/hopkins/objects.cpp b/engines/hopkins/objects.cpp index eb195c213b..3bc788eb3c 100644 --- a/engines/hopkins/objects.cpp +++ b/engines/hopkins/objects.cpp @@ -517,7 +517,7 @@ void ObjectsManager::AFF_SPRITES() { // Loop to draw any on-screen text for (int idx = 0; idx <= 10; ++idx) { if (_vm->_fontManager._text[idx]._textOnFl) { - if (_vm->_fontManager._text[idx]._textType > 3) + if ((_vm->_fontManager._text[idx]._textType < 2) || (_vm->_fontManager._text[idx]._textType > 3)) _vm->_fontManager.box(idx, _vm->_fontManager._text[idx]._messageId, _vm->_fontManager._text[idx]._filename, _vm->_eventsManager._startPos.x + _vm->_fontManager._text[idx]._pos.x, _vm->_fontManager._text[idx]._pos.y); @@ -527,7 +527,7 @@ void ObjectsManager::AFF_SPRITES() { _vm->_fontManager._text[idx]._pos.x, _vm->_fontManager._text[idx]._pos.y); _vm->_fontManager._textList[idx]._enabledFl = true; - if (_vm->_fontManager._text[idx]._textType > 3) + if ((_vm->_fontManager._text[idx]._textType < 2) || (_vm->_fontManager._text[idx]._textType > 3)) _vm->_fontManager._textList[idx]._pos.x = _vm->_eventsManager._startPos.x + _vm->_fontManager._text[idx]._pos.x; else _vm->_fontManager._textList[idx]._pos.x = _vm->_fontManager._text[idx]._pos.x; |