diff options
| -rw-r--r-- | engines/titanic/core/drop_target.cpp | 10 | ||||
| -rw-r--r-- | engines/titanic/core/drop_target.h | 2 | ||||
| -rw-r--r-- | engines/titanic/game/maitred/maitred_arm_holder.cpp | 2 | ||||
| -rw-r--r-- | engines/titanic/game/nose_holder.cpp | 8 | ||||
| -rw-r--r-- | engines/titanic/game/parrot/parrot_perch_holder.cpp | 2 | ||||
| -rw-r--r-- | engines/titanic/game/restaurant_cylinder_holder.cpp | 4 |
6 files changed, 14 insertions, 14 deletions
diff --git a/engines/titanic/core/drop_target.cpp b/engines/titanic/core/drop_target.cpp index f02efeee5d..ffeab03545 100644 --- a/engines/titanic/core/drop_target.cpp +++ b/engines/titanic/core/drop_target.cpp @@ -34,7 +34,7 @@ BEGIN_MESSAGE_MAP(CDropTarget, CGameObject) END_MESSAGE_MAP() CDropTarget::CDropTarget() : CGameObject(), _itemFrame(0), - _itemMatchSize(0), _showItem(false), _fieldF4(0), _dropFrame(0), + _itemMatchSize(0), _showItem(false), _dropEnabled(false), _dropFrame(0), _dragFrame(0), _dragCursorId(CURSOR_ARROW), _dropCursorId(CURSOR_HAND), _clipFlags(20) { } @@ -48,7 +48,7 @@ void CDropTarget::save(SimpleFile *file, int indent) { file->writeQuotedLine(_soundName, indent); file->writeNumberLine(_showItem, indent); file->writeQuotedLine(_itemName, indent); - file->writeNumberLine(_fieldF4, indent); + file->writeNumberLine(_dropEnabled, indent); file->writeNumberLine(_dropFrame, indent); file->writeNumberLine(_dragFrame, indent); file->writeQuotedLine(_clipName, indent); @@ -68,7 +68,7 @@ void CDropTarget::load(SimpleFile *file) { _soundName = file->readString(); _showItem = file->readNumber(); _itemName = file->readString(); - _fieldF4 = file->readNumber(); + _dropEnabled = file->readNumber(); _dropFrame = file->readNumber(); _dragFrame = file->readNumber(); _clipName = file->readString(); @@ -119,7 +119,7 @@ bool CDropTarget::MouseDragStartMsg(CMouseDragStartMsg *msg) { msg->_dragItem = dragItem; CGameObject *obj = dynamic_cast<CGameObject *>(findByName(_itemName)); - if (_itemName.empty() || _fieldF4 || !obj) + if (_itemName.empty() || _dropEnabled || !obj) return false; CDropZoneLostObjectMsg lostMsg; @@ -161,7 +161,7 @@ bool CDropTarget::EnterViewMsg(CEnterViewMsg *msg) { bool CDropTarget::VisibleMsg(CVisibleMsg *msg) { setVisible(msg->_visible); - _fieldF4 = !msg->_visible; + _dropEnabled = !msg->_visible; return true; } diff --git a/engines/titanic/core/drop_target.h b/engines/titanic/core/drop_target.h index e07b640c9f..bdf8891789 100644 --- a/engines/titanic/core/drop_target.h +++ b/engines/titanic/core/drop_target.h @@ -42,7 +42,7 @@ protected: CString _soundName; bool _showItem; CString _itemName; - int _fieldF4; + bool _dropEnabled; int _dropFrame; int _dragFrame; CString _clipName; diff --git a/engines/titanic/game/maitred/maitred_arm_holder.cpp b/engines/titanic/game/maitred/maitred_arm_holder.cpp index 75d95640d2..51c19561a7 100644 --- a/engines/titanic/game/maitred/maitred_arm_holder.cpp +++ b/engines/titanic/game/maitred/maitred_arm_holder.cpp @@ -40,7 +40,7 @@ void CMaitreDArmHolder::load(SimpleFile *file) { } bool CMaitreDArmHolder::MaitreDArmHolder(CMaitreDArmHolder *msg) { - _fieldF4 = 0; + _dropEnabled = false; return true; } diff --git a/engines/titanic/game/nose_holder.cpp b/engines/titanic/game/nose_holder.cpp index 6882e4f56d..d00c7b372e 100644 --- a/engines/titanic/game/nose_holder.cpp +++ b/engines/titanic/game/nose_holder.cpp @@ -51,7 +51,7 @@ void CNoseHolder::load(SimpleFile *file) { } bool CNoseHolder::ActMsg(CActMsg *msg) { - if (msg->_action == "Sneeze" && !_itemName.empty() && _fieldF4) { + if (msg->_action == "Sneeze" && !_itemName.empty() && _dropEnabled) { CProximity prox; prox._positioningMode = POSMODE_VECTOR; playSound("z#35.wav", prox); @@ -93,7 +93,7 @@ bool CNoseHolder::FrameMsg(CFrameMsg *msg) { bool CNoseHolder::LeaveViewMsg(CLeaveViewMsg *msg) { _draggingFeather = false; _dragObject = nullptr; - if (_fieldF4) { + if (_dropEnabled) { loadFrame(_dropFrame); setVisible(false); } @@ -102,7 +102,7 @@ bool CNoseHolder::LeaveViewMsg(CLeaveViewMsg *msg) { } bool CNoseHolder::MovieEndMsg(CMovieEndMsg *msg) { - if (_fieldF4) { + if (_dropEnabled) { loadFrame(_dropFrame); setVisible(false); } @@ -111,7 +111,7 @@ bool CNoseHolder::MovieEndMsg(CMovieEndMsg *msg) { } bool CNoseHolder::EnterViewMsg(CEnterViewMsg *msg) { - if (_fieldF4) + if (_dropEnabled) setVisible(false); return CDropTarget::EnterViewMsg(msg); diff --git a/engines/titanic/game/parrot/parrot_perch_holder.cpp b/engines/titanic/game/parrot/parrot_perch_holder.cpp index 205995cf1c..ee1d308765 100644 --- a/engines/titanic/game/parrot/parrot_perch_holder.cpp +++ b/engines/titanic/game/parrot/parrot_perch_holder.cpp @@ -59,7 +59,7 @@ bool CParrotPerchHolder::MouseButtonDownMsg(CMouseButtonDownMsg *msg) { } bool CParrotPerchHolder::StatusChangeMsg(CStatusChangeMsg *msg) { - _fieldF4 = msg->_newStatus; + _dropEnabled = msg->_newStatus; return true; } diff --git a/engines/titanic/game/restaurant_cylinder_holder.cpp b/engines/titanic/game/restaurant_cylinder_holder.cpp index adf029d8f7..5fb8c97cde 100644 --- a/engines/titanic/game/restaurant_cylinder_holder.cpp +++ b/engines/titanic/game/restaurant_cylinder_holder.cpp @@ -71,7 +71,7 @@ bool CRestaurantCylinderHolder::EjectCylinderMsg(CEjectCylinderMsg *msg) { if (_field118) { playClip(hasCylinder ? "CloseHolder_Full" : "CloseHolder_Empty", MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); - _fieldF4 = 1; + _dropEnabled = true; } else { playClip(hasCylinder ? "OpenHolder_Full" : "OpenHolder_Empty", MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); @@ -109,7 +109,7 @@ bool CRestaurantCylinderHolder::MovieEndMsg(CMovieEndMsg *msg) { readyMsg.execute(_target); } else { _field118 = true; - _fieldF4 = false; + _dropEnabled = false; _cursorId = findByName("Phonograph Cylinder") ? _dropCursorId : _dragCursorId; } |