PEGASUS: Fix idlers freeing themselves

Our idler handling is more like the original now
scummvm · Oct 3, 2011 · d2789a1 · d2789a1
1 parent 0756f72
commit d2789a1
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 deletions.
diff --git a/engines/pegasus/pegasus.cpp b/engines/pegasus/pegasus.cpp
@@ -78,6 +78,7 @@ PegasusEngine::PegasusEngine(OSystem *syst, const PegasusGameDescription *gamede
 	_switchModesSync = false;
 	_draggingItem = 0;
 	_dragType = kDragNoDrag;
+	_idlerHead = 0;
 }
 
 PegasusEngine::~PegasusEngine() {
@@ -311,16 +312,27 @@ GUI::Debugger *PegasusEngine::getDebugger() {
 }
 
 void PegasusEngine::addIdler(Idler *idler) {
-	_idlers.push_back(idler);
+	idler->_nextIdler = _idlerHead;
+	if (_idlerHead)
+		_idlerHead->_prevIdler = idler;
+	idler->_prevIdler = 0;
+	_idlerHead = idler;
 }
 
 void PegasusEngine::removeIdler(Idler *idler) {
-	_idlers.remove(idler);
+	if (idler->_prevIdler)
+		idler->_prevIdler->_nextIdler = idler->_nextIdler;
+	if (idler->_nextIdler)
+		idler->_nextIdler->_prevIdler = idler->_prevIdler;
+	if (idler == _idlerHead)
+		_idlerHead = idler->_nextIdler;
+	idler->_nextIdler = 0;
+	idler->_prevIdler = 0;
 }
 
 void PegasusEngine::giveIdleTime() {
-	for (Common::List<Idler *>::iterator it = _idlers.begin(); it != _idlers.end(); it++)
-		(*it)->useIdleTime();
+	for (Idler *idler = _idlerHead; idler != 0; idler = idler->_nextIdler)
+		idler->useIdleTime();
 }
 
 void PegasusEngine::addTimeBase(TimeBase *timeBase) {

diff --git a/engines/pegasus/pegasus.h b/engines/pegasus/pegasus.h
@@ -211,7 +211,7 @@ friend class InputHandler;
 	Common::String _introDirectory;
 
 	// Idlers
-	Common::List<Idler *> _idlers;
+	Idler *_idlerHead;
 	void giveIdleTime();
 
 	// Items

diff --git a/engines/pegasus/timers.cpp b/engines/pegasus/timers.cpp
@@ -31,6 +31,8 @@ namespace Pegasus {
 
 Idler::Idler() {
 	_isIdling = false;
+	_nextIdler = 0;
+	_prevIdler = 0;
 }
 
 Idler::~Idler() {

diff --git a/engines/pegasus/timers.h b/engines/pegasus/timers.h
@@ -50,6 +50,7 @@ friend class PegasusEngine;
 	virtual void useIdleTime() {}
 
 	bool _isIdling;
+	Idler *_nextIdler, *_prevIdler;
 };
 
 enum {