diff options
| author | Paul Gilbert | 2013-12-30 20:28:29 +1100 |
|---|---|---|
| committer | Paul Gilbert | 2013-12-30 20:28:29 +1100 |
| commit | f08231939f626f4acafb899fc8780b73260f1ada (patch) | |
| tree | 2b9a16979fb6e7a51227cbd725e93a34b8c8e472 /engines | |
| parent | cb15e2863f397d6906cb509ee5ec00102fe38baf (diff) | |
| download | scummvm-rg350-f08231939f626f4acafb899fc8780b73260f1ada.tar.gz scummvm-rg350-f08231939f626f4acafb899fc8780b73260f1ada.tar.bz2 scummvm-rg350-f08231939f626f4acafb899fc8780b73260f1ada.zip | |
VOYEUR: Removed duplicate vStopCycle method
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/voyeur/events.cpp | 5 | ||||
| -rw-r--r-- | engines/voyeur/events.h | 1 | ||||
| -rw-r--r-- | engines/voyeur/files.cpp | 2 |
3 files changed, 1 insertions, 7 deletions
diff --git a/engines/voyeur/events.cpp b/engines/voyeur/events.cpp index 115482ec29..514d9837b8 100644 --- a/engines/voyeur/events.cpp +++ b/engines/voyeur/events.cpp @@ -108,11 +108,6 @@ void EventsManager::mainVoyeurIntFunc() { } } -void EventsManager::vStopCycle() { - _cycleIntNode._flags = 1; - _cycleStatus &= 2; -} - void EventsManager::sWaitFlip() { Common::Array<ViewPortResource *> &viewPorts = _vm->_graphicsManager._viewPortListPtr->_entries; for (uint idx = 0; idx < viewPorts.size(); ++idx) { diff --git a/engines/voyeur/events.h b/engines/voyeur/events.h index c346426fad..4734e541a6 100644 --- a/engines/voyeur/events.h +++ b/engines/voyeur/events.h @@ -205,7 +205,6 @@ public: void resetMouse(); void setMousePos(const Common::Point &p) { _mousePos = p; } void startMainClockInt(); - void vStopCycle(); void sWaitFlip(); void vInitColor(); diff --git a/engines/voyeur/files.cpp b/engines/voyeur/files.cpp index b4867881e0..0b4e567e0a 100644 --- a/engines/voyeur/files.cpp +++ b/engines/voyeur/files.cpp @@ -548,9 +548,9 @@ void BVoyBoltFile::vInitCMap() { void BVoyBoltFile::vInitCycl() { initDefault(); - _state._vm->_eventsManager.vStopCycle(); _state._curMemberPtr->_vInitCycleResource = new VInitCycleResource( _state, _state._curMemberPtr->_data); + _state._curMemberPtr->_vInitCycleResource->vStopCycle(); } /*------------------------------------------------------------------------*/ |