diff options
author | Strangerke | 2013-03-19 20:40:55 +0100 |
---|---|---|
committer | Strangerke | 2013-03-19 20:41:39 +0100 |
commit | db6d7e256bd1a1654002005fec3524ddcd300c75 (patch) | |
tree | e20128bc144b1b11899af51a73b1ba6d9b4f48e8 /engines/hopkins/font.cpp | |
parent | fa3136fbc4385f1f14a87f21dfa2e7bf82aac66d (diff) | |
download | scummvm-rg350-db6d7e256bd1a1654002005fec3524ddcd300c75.tar.gz scummvm-rg350-db6d7e256bd1a1654002005fec3524ddcd300c75.tar.bz2 scummvm-rg350-db6d7e256bd1a1654002005fec3524ddcd300c75.zip |
HOPKINS: Remove setParent() from EventsManager and Debugger
Diffstat (limited to 'engines/hopkins/font.cpp')
-rw-r--r-- | engines/hopkins/font.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/hopkins/font.cpp b/engines/hopkins/font.cpp index 864da4fd8d..5de601a65f 100644 --- a/engines/hopkins/font.cpp +++ b/engines/hopkins/font.cpp @@ -268,7 +268,7 @@ void FontManager::box(int idx, int messageId, const Common::String &filename, in _vm->_globals._boxWidth += 2; _text[idx]._pos.x = 320 - abs(_vm->_globals._boxWidth / 2); - textPosX = _vm->_eventsManager._startPos.x + _text[idx]._pos.x; + textPosX = _vm->_eventsManager->_startPos.x + _text[idx]._pos.x; lineCount = 1; _text[idx]._lines[0] = Common::String((const char *)_tempText, textLength); } else { @@ -338,10 +338,10 @@ void FontManager::box(int idx, int messageId, const Common::String &filename, in if ((_text[idx]._textType < 2) || (_text[idx]._textType > 3)) { int i; - for (i = xp - _vm->_eventsManager._startPos.x; _vm->_globals._boxWidth + i > 638 && i > -2 && _text[idx]._textType; i -= 2) + for (i = xp - _vm->_eventsManager->_startPos.x; _vm->_globals._boxWidth + i > 638 && i > -2 && _text[idx]._textType; i -= 2) ; _text[idx]._pos.x = i; - textPosX = _vm->_eventsManager._startPos.x + i; + textPosX = _vm->_eventsManager->_startPos.x + i; } else { _text[idx]._pos.x = textPosX; } @@ -352,7 +352,7 @@ void FontManager::box(int idx, int messageId, const Common::String &filename, in int saveHeight = (_fontFixedHeight + 1) * lineCount + 12; if (_text[idx]._textType == 6) { _text[idx]._pos.x = 315 - abs(saveWidth / 2); - textPosX = posX = _vm->_eventsManager._startPos.x + _text[idx]._pos.x; + textPosX = posX = _vm->_eventsManager->_startPos.x + _text[idx]._pos.x; _text[idx]._pos.y = posY = 50; } int textType = _text[idx]._textType; @@ -480,12 +480,12 @@ void FontManager::renderTextDisplay(int xp, int yp, const Common::String &msg, i int charStartPosX = charEndPosX; charEndPosX += charWidth; _vm->_graphicsManager.addDirtyRect(charStartPosX, yp, charEndPosX, yp + 12); - if (_vm->_eventsManager._escKeyFl) { + if (_vm->_eventsManager->_escKeyFl) { _vm->_globals.iRegul = 1; - _vm->_eventsManager.refreshScreenAndEvents(); + _vm->_eventsManager->refreshScreenAndEvents(); } else { _vm->_globals.iRegul = 4; - _vm->_eventsManager.refreshScreenAndEvents(); + _vm->_eventsManager->refreshScreenAndEvents(); _vm->_globals.iRegul = 1; } } |