diff options
| author | Paul Gilbert | 2011-08-19 20:36:43 +1000 |
|---|---|---|
| committer | Paul Gilbert | 2011-08-19 20:36:43 +1000 |
| commit | 372d488b3bc01f6dce06dde83d4818a010695c70 (patch) | |
| tree | 967192cca7a336e4e18fd155d7f134c465374a3e /engines/cge/events.cpp | |
| parent | 0d730b85e3e05829ba5ce3fbcdbf2886a9a28a94 (diff) | |
| download | scummvm-rg350-372d488b3bc01f6dce06dde83d4818a010695c70.tar.gz scummvm-rg350-372d488b3bc01f6dce06dde83d4818a010695c70.tar.bz2 scummvm-rg350-372d488b3bc01f6dce06dde83d4818a010695c70.zip | |
CGE: Revert previous commit of flags synchronisation
Diffstat (limited to 'engines/cge/events.cpp')
| -rw-r--r-- | engines/cge/events.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/cge/events.cpp b/engines/cge/events.cpp index 7235bf19c1..916de839eb 100644 --- a/engines/cge/events.cpp +++ b/engines/cge/events.cpp @@ -158,7 +158,7 @@ Mouse::Mouse(CGEEngine *vm) : Sprite(vm, NULL), _busy(NULL), _hold(NULL), _hx(0) _buttons = 0; _busy = NULL; _active = false; - _flags.flags._kill = false; + _flags._kill = false; const Seq ms[] = { { 0, 0, 0, 0, 1 }, @@ -301,9 +301,9 @@ void EventManager::handleEvents() { if (e._mask & kMouseLeftDown) { _mouse->_hold = e._spritePtr; if (_mouse->_hold) { - _mouse->_hold->_flags.flags._hold = true; + _mouse->_hold->_flags._hold = true; - if (_mouse->_hold->_flags.flags._drag) { + if (_mouse->_hold->_flags._drag) { _mouse->_hx = e._x - _mouse->_hold->_x; _mouse->_hy = e._y - _mouse->_hold->_y; } @@ -312,7 +312,7 @@ void EventManager::handleEvents() { if (e._mask & kMouseLeftUp) { if (_mouse->_hold) { - _mouse->_hold->_flags.flags._hold = false; + _mouse->_hold->_flags._hold = false; _mouse->_hold = NULL; } } @@ -325,7 +325,7 @@ void EventManager::handleEvents() { _eventQueueTail = (_eventQueueTail + 1) % kEventMax; } if (_mouse->_hold) { - if (_mouse->_hold->_flags.flags._drag) + if (_mouse->_hold->_flags._drag) _mouse->_hold->gotoxy(_mouse->_x - _mouse->_hx, _mouse->_y - _mouse->_hy); } } |