diff options
| author | Paul Gilbert | 2016-12-22 18:50:09 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2016-12-24 18:23:34 -0500 |
| commit | 4c1da0fc223fc1b6e6bf22f043e1a18fb51b40ab (patch) | |
| tree | 1c70078744c7e3669927f6e36f909f512a819d3e /engines/titanic/core | |
| parent | 9e11746eba734fd88ef8c8d1d17d16ef3dac3c99 (diff) | |
| download | scummvm-rg350-4c1da0fc223fc1b6e6bf22f043e1a18fb51b40ab.tar.gz scummvm-rg350-4c1da0fc223fc1b6e6bf22f043e1a18fb51b40ab.tar.bz2 scummvm-rg350-4c1da0fc223fc1b6e6bf22f043e1a18fb51b40ab.zip | |
TITANIC: Renamings on CDropTarget
Diffstat (limited to 'engines/titanic/core')
| -rw-r--r-- | engines/titanic/core/drop_target.cpp | 10 | ||||
| -rw-r--r-- | engines/titanic/core/drop_target.h | 2 |
2 files changed, 6 insertions, 6 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; |