From f08231939f626f4acafb899fc8780b73260f1ada Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 30 Dec 2013 20:28:29 +1100
Subject: VOYEUR: Removed duplicate vStopCycle method

---
 engines/voyeur/events.cpp | 5 -----
 engines/voyeur/events.h   | 1 -
 engines/voyeur/files.cpp  | 2 +-
 3 files changed, 1 insertion(+), 7 deletions(-)

(limited to 'engines')

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();
 }
 
 /*------------------------------------------------------------------------*/
-- 
cgit v1.2.3