diff options
| author | Alyssa Milburn | 2010-12-01 18:21:33 +0000 |
|---|---|---|
| committer | Alyssa Milburn | 2010-12-01 18:21:33 +0000 |
| commit | 3471d8ee45dee6097b4ba13e80648c600de9292c (patch) | |
| tree | 77d6c463eadda0d2dda7442477c32cb41d92d81d /engines | |
| parent | ddd691e2d3c02f9b1dfcaafd2239a4a04a7996a3 (diff) | |
| download | scummvm-rg350-3471d8ee45dee6097b4ba13e80648c600de9292c.tar.gz scummvm-rg350-3471d8ee45dee6097b4ba13e80648c600de9292c.tar.bz2 scummvm-rg350-3471d8ee45dee6097b4ba13e80648c600de9292c.zip | |
MOHAWK: rename DelayedEventType values
svn-id: r54708
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/mohawk/livingbooks.cpp | 13 | ||||
| -rw-r--r-- | engines/mohawk/livingbooks.h | 6 |
2 files changed, 10 insertions, 9 deletions
diff --git a/engines/mohawk/livingbooks.cpp b/engines/mohawk/livingbooks.cpp index a46d8230f3..1119261481 100644 --- a/engines/mohawk/livingbooks.cpp +++ b/engines/mohawk/livingbooks.cpp @@ -445,16 +445,16 @@ void MohawkEngine_LivingBooks::updatePage() { continue; switch (delayedEvent.type) { - case kLBDestroy: + case kLBEventDestroy: _items.remove_at(i); delete delayedEvent.item; if (_focus == delayedEvent.item) _focus = NULL; break; - case kLBSetNotVisible: + case kLBEventSetNotVisible: _items[i]->setVisible(false); break; - case kLBDone: + case kLBEventDone: _items[i]->done(true); break; } @@ -1623,7 +1623,7 @@ void LBItem::destroySelf() { if (!this->_itemId) error("destroySelf() on an item which was already dead"); - _vm->queueDelayedEvent(DelayedEvent(this, kLBDestroy)); + _vm->queueDelayedEvent(DelayedEvent(this, kLBEventDestroy)); _itemId = 0; } @@ -1684,7 +1684,7 @@ void LBItem::handleMouseUp(Common::Point pos) { bool LBItem::togglePlaying(bool playing, bool restart) { if (playing) { - _vm->queueDelayedEvent(DelayedEvent(this, kLBDone)); + _vm->queueDelayedEvent(DelayedEvent(this, kLBEventDone)); return true; } if (!_neverEnabled && _enabled && !_playing) { @@ -1847,7 +1847,8 @@ void LBItem::runScript(uint id) { case 1: // TODO: should be setVisible(true) - not a delayed event - // when we're doing the param 1/2/3 stuff above? - _vm->queueDelayedEvent(DelayedEvent(this, kLBSetNotVisible)); + // and in modern LB this is perhaps just a direct target->setVisible(true).. + _vm->queueDelayedEvent(DelayedEvent(this, kLBEventSetNotVisible)); break; case 2: diff --git a/engines/mohawk/livingbooks.h b/engines/mohawk/livingbooks.h index 45183b37b7..11210f0fa3 100644 --- a/engines/mohawk/livingbooks.h +++ b/engines/mohawk/livingbooks.h @@ -384,9 +384,9 @@ struct NotifyEvent { }; enum DelayedEventType { - kLBDestroy = 0, - kLBSetNotVisible = 1, - kLBDone = 2 + kLBEventDestroy = 0, + kLBEventSetNotVisible = 1, + kLBEventDone = 2 }; struct DelayedEvent { |