diff options
| author | Strangerke | 2013-03-24 20:39:16 +0100 |
|---|---|---|
| committer | Strangerke | 2013-03-24 22:12:47 +0100 |
| commit | ee3c0cc4faa66b57bf82ee59dac9c3484b582b5d (patch) | |
| tree | 373547a731c7de89d668386ccf78b435c0837732 /engines | |
| parent | aa141c43552ac407cf3088c806b7fdbe192c9627 (diff) | |
| download | scummvm-rg350-ee3c0cc4faa66b57bf82ee59dac9c3484b582b5d.tar.gz scummvm-rg350-ee3c0cc4faa66b57bf82ee59dac9c3484b582b5d.tar.bz2 scummvm-rg350-ee3c0cc4faa66b57bf82ee59dac9c3484b582b5d.zip | |
Hopkins: Move hotspotTextColor to LinesMAnager, make it private
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/hopkins/globals.cpp | 1 | ||||
| -rw-r--r-- | engines/hopkins/globals.h | 1 | ||||
| -rw-r--r-- | engines/hopkins/lines.cpp | 10 | ||||
| -rw-r--r-- | engines/hopkins/lines.h | 1 |
4 files changed, 6 insertions, 7 deletions
diff --git a/engines/hopkins/globals.cpp b/engines/hopkins/globals.cpp index 068c390b03..93997eaea5 100644 --- a/engines/hopkins/globals.cpp +++ b/engines/hopkins/globals.cpp @@ -156,7 +156,6 @@ Globals::Globals(HopkinsEngine *vm) { _baseMapColor = 50; // Reset indexed variables - _hotspotTextColor = 0; _oldRouteFromX = 0; _oldRouteFromY = 0; _oldRouteDestX = 0; diff --git a/engines/hopkins/globals.h b/engines/hopkins/globals.h index a35f1a76f3..1b63e724cc 100644 --- a/engines/hopkins/globals.h +++ b/engines/hopkins/globals.h @@ -239,7 +239,6 @@ public: int _exitId; Directions _oceanDirection; int _actionDirection; - int _hotspotTextColor; int _inventory[36]; int _objectWidth, _objectHeight; int _screenId; diff --git a/engines/hopkins/lines.cpp b/engines/hopkins/lines.cpp index 3571cbcb04..2cc86bd1dd 100644 --- a/engines/hopkins/lines.cpp +++ b/engines/hopkins/lines.cpp @@ -75,6 +75,7 @@ LinesManager::LinesManager(HopkinsEngine *vm) { _currentSegmentId = 0; _largeBuf = g_PTRNUL; _zoneSkipCount = 0; + _hotspotTextColor = 0; _forceHideText = false; } @@ -2864,11 +2865,10 @@ void LinesManager::checkZone() { _vm->_fontManager->showText(5); _forceHideText = true; } - _vm->_globals->_hotspotTextColor += 25; - if (_vm->_globals->_hotspotTextColor > 100) - _vm->_globals->_hotspotTextColor = 0; - _vm->_graphicsManager->SETCOLOR4(251, _vm->_globals->_hotspotTextColor, _vm->_globals->_hotspotTextColor, - _vm->_globals->_hotspotTextColor); + _hotspotTextColor += 25; + if (_hotspotTextColor > 100) + _hotspotTextColor = 0; + _vm->_graphicsManager->SETCOLOR4(251, _hotspotTextColor, _hotspotTextColor, _hotspotTextColor); if (_vm->_eventsManager->_mouseCursorId == 4) { if (ZONEP[zoneId]._verbFl1 == 2) { _vm->_eventsManager->changeMouseCursor(16); diff --git a/engines/hopkins/lines.h b/engines/hopkins/lines.h index ed7e2f0817..82ad4a37d8 100644 --- a/engines/hopkins/lines.h +++ b/engines/hopkins/lines.h @@ -107,6 +107,7 @@ private: HopkinsEngine *_vm; bool _forceHideText; + int _hotspotTextColor; int _pathFindingMaxDepth; SmoothItem _smoothRoute[4000]; Directions _smoothMoveDirection; |