diff options
-rw-r--r-- | engines/titanic/carry/eye.cpp | 1 | ||||
-rw-r--r-- | engines/titanic/core/game_object.cpp | 14 | ||||
-rw-r--r-- | engines/titanic/core/game_object.h | 4 | ||||
-rw-r--r-- | engines/titanic/game/get_lift_eye2.cpp | 1 |
4 files changed, 11 insertions, 9 deletions
diff --git a/engines/titanic/carry/eye.cpp b/engines/titanic/carry/eye.cpp index fc480b8ec0..148d2ea154 100644 --- a/engines/titanic/carry/eye.cpp +++ b/engines/titanic/carry/eye.cpp @@ -70,6 +70,7 @@ bool CEye::UseWithOtherMsg(CUseWithOtherMsg *msg) { CActMsg actMsg1(getName()); actMsg1.execute("GetLiftEye"); + CTelevision::_eyeFlag = true; CActMsg actMsg2("AddWrongHead"); actMsg2.execute("FaultyLiftbot"); } diff --git a/engines/titanic/core/game_object.cpp b/engines/titanic/core/game_object.cpp index 9134a50915..bfcfa9fbff 100644 --- a/engines/titanic/core/game_object.cpp +++ b/engines/titanic/core/game_object.cpp @@ -59,7 +59,7 @@ CGameObject::CGameObject(): CNamedItem() { _field34 = 0; _field38 = 0; _field3C = 0; - _field40 = 0; + _nonvisual = false; _field44 = 0xF0; _field48 = 0xF0; _field4C = 0xFF; @@ -106,7 +106,7 @@ void CGameObject::save(SimpleFile *file, int indent) { file->writeNumberLine(_cursorId, indent + 1); _movieClips.save(file, indent + 1); file->writeNumberLine(_field60, indent + 1); - file->writeNumberLine(_field40, indent + 1); + file->writeNumberLine(_nonvisual, indent + 1); file->writeQuotedLine(_resource, indent + 1); file->writeBounds(_bounds, indent + 1); @@ -157,7 +157,7 @@ void CGameObject::load(SimpleFile *file) { // Deliberate fall-through case 3: - _field40 = file->readNumber(); + _nonvisual = file->readNumber(); // Deliberate fall-through case 2: @@ -203,8 +203,8 @@ void CGameObject::draw(CScreenManager *screenManager) { return; } - if (_field40) { - // If a text object is defined, handle drawing it + if (_nonvisual) { + // If a text is defined, handle drawing it if (_text && _bounds.intersects(getGameManager()->_bounds)) _text->draw(screenManager); @@ -265,11 +265,11 @@ void CGameObject::stopMovie() { _surface->stopMovie(); } -bool CGameObject::checkPoint(const Point &pt, bool ignore40, bool visibleOnly) { +bool CGameObject::checkPoint(const Point &pt, bool ignoreSurface, bool visibleOnly) { if ((!_visible && visibleOnly) || !_bounds.contains(pt)) return false; - if (ignore40 || _field40) + if (ignoreSurface || _nonvisual) return true; if (!_surface) { diff --git a/engines/titanic/core/game_object.h b/engines/titanic/core/game_object.h index 078e63267d..8702b5f522 100644 --- a/engines/titanic/core/game_object.h +++ b/engines/titanic/core/game_object.h @@ -79,7 +79,7 @@ protected: double _field34; double _field38; double _field3C; - int _field40; + bool _nonvisual; int _field44; int _field48; int _field4C; @@ -644,7 +644,7 @@ public: * Checks the passed point is validly in the object, * with extra checking of object flags status */ - bool checkPoint(const Point &pt, bool ignore40 = false, bool visibleOnly = false); + bool checkPoint(const Point &pt, bool ignoreSurface = false, bool visibleOnly = false); /** * Set the position of the object diff --git a/engines/titanic/game/get_lift_eye2.cpp b/engines/titanic/game/get_lift_eye2.cpp index f9ff0af8a6..afb2266348 100644 --- a/engines/titanic/game/get_lift_eye2.cpp +++ b/engines/titanic/game/get_lift_eye2.cpp @@ -59,6 +59,7 @@ void CGetLiftEye2::load(SimpleFile *file) { bool CGetLiftEye2::ActMsg(CActMsg *msg) { *_destObject = msg->_action; setVisible(true); + _cursorId = CURSOR_HAND; return true; } |