2 files changed, 23 insertions, 32 deletions

diff --git a/engines/sludge/speech.cpp b/engines/sludge/speech.cpp
index cac4a5e705..9c02eda5a6 100644
--- a/engines/sludge/speech.cpp
+++ b/engines/sludge/speech.cpp
@@ -45,7 +45,7 @@ void SpeechManager::init() {
 	_speech = new SpeechStruct;
 	if (checkNew(_speech)) {
 		_speech->currentTalker = NULL;
-		_speech->allSpeech = NULL;
+		_speech->allSpeech.clear();
 		_speech->speechY = 0;
 		_speech->lastFile = -1;
 	}
@@ -65,12 +65,12 @@ void SpeechManager::kill() {
 		_speech->currentTalker = nullptr;
 	}
 
-	SpeechLine *killMe;
-	while (_speech->allSpeech) {
-		killMe = _speech->allSpeech;
-		_speech->allSpeech = _speech->allSpeech->next;
+	for (SpeechLineList::iterator it = _speech->allSpeech.begin(); it != _speech->allSpeech.end(); ++it) {
+		SpeechLine *killMe = *it;
 		delete killMe;
+		killMe = nullptr;
 	}
+	_speech->allSpeech.clear();
 }
 
 void SpeechManager::setObjFontColour(ObjectType *t) {
@@ -82,14 +82,16 @@ void SpeechManager::addSpeechLine(const Common::String &theLine, int x, int &off
 	int halfWidth = (g_sludge->_txtMan->stringWidth(theLine) >> 1) / cameraZoom;
 	int xx1 = x - (halfWidth);
 	int xx2 = x + (halfWidth);
+
+	// Create new speech line
 	SpeechLine *newLine = new SpeechLine;
 	checkNew(newLine);
-
-	newLine->next = _speech->allSpeech;
 	newLine->textLine.clear();
 	newLine->textLine = theLine;
 	newLine->x = xx1;
-	_speech->allSpeech = newLine;
+	_speech->allSpeech.push_front(newLine);
+
+	// Calculate offset
 	if ((xx1 < 5) && (offset < (5 - xx1))) {
 		offset = 5 - xx1;
 	} else if ((xx2 >= ((float) g_system->getWidth() / cameraZoom) - 5)
@@ -99,7 +101,7 @@ void SpeechManager::addSpeechLine(const Common::String &theLine, int x, int &off
 }
 
 int SpeechManager::isThereAnySpeechGoingOn() {
-	return _speech->allSpeech ? _speech->lookWhosTalking : -1;
+	return _speech->allSpeech.empty() ? -1 : _speech->lookWhosTalking;
 }
 
 int SpeechManager::getLastSpeechSound() {
@@ -158,10 +160,8 @@ int SpeechManager::wrapSpeechXY(const Common::String &theText, int x, int y, int
 				+ (float) (g_system->getHeight() - fontHeight / 3) / cameraZoom;
 
 	if (offset) {
-		SpeechLine *viewLine = _speech->allSpeech;
-		while (viewLine) {
-			viewLine->x += offset;
-			viewLine = viewLine->next;
+		for (SpeechLineList::iterator it = _speech->allSpeech.begin(); it != _speech->allSpeech.end(); ++it) {
+			(*it)->x += offset;
 		}
 	}
 	return speechTime;
@@ -214,19 +214,14 @@ void SpeechManager::display() {
 	float cameraZoom = g_sludge->_gfxMan->getCamZoom();
 	int fontHeight = g_sludge->_txtMan->getFontHeight();
 	int viewY = _speech->speechY;
-	SpeechLine *viewLine = _speech->allSpeech;
-	while (viewLine) {
-		g_sludge->_txtMan->pasteString(viewLine->textLine, viewLine->x, viewY, _speech->talkCol);
+	for (SpeechLineList::iterator it = _speech->allSpeech.begin(); it != _speech->allSpeech.end(); ++it) {
+		g_sludge->_txtMan->pasteString((*it)->textLine, (*it)->x, viewY, _speech->talkCol);
 		viewY -= fontHeight / cameraZoom;
-		viewLine = viewLine->next;
 	}
 }
 
 void SpeechManager::save(Common::WriteStream *stream) {
 	stream->writeByte(_speechMode);
-
-	SpeechLine *viewLine = _speech->allSpeech;
-
 	stream->writeByte(_speech->talkCol.originalRed);
 	stream->writeByte(_speech->talkCol.originalGreen);
 	stream->writeByte(_speech->talkCol.originalBlue);
@@ -246,11 +241,10 @@ void SpeechManager::save(Common::WriteStream *stream) {
 	}
 
 	// Write what's being said
-	while (viewLine) {
+	for (SpeechLineList::iterator it = _speech->allSpeech.begin(); it != _speech->allSpeech.end(); ++it) {
 		stream->writeByte(1);
-		writeString(viewLine->textLine, stream);
-		stream->writeUint16BE(viewLine->x);
-		viewLine = viewLine->next;
+		writeString((*it)->textLine, stream);
+		stream->writeUint16BE((*it)->x);
 	}
 	stream->writeByte(0);
 }
@@ -280,18 +274,14 @@ bool SpeechManager::load(Common::SeekableReadStream *stream) {
 	}
 
 	// Read what's being said
-	SpeechLine **viewLine = &_speech->allSpeech;
-	SpeechLine *newOne;
 	_speech->lastFile = -1;
 	while (stream->readByte()) {
-		newOne = new SpeechLine;
+		SpeechLine *newOne = new SpeechLine;
 		if (!checkNew(newOne))
 			return false;
 		newOne->textLine = readString(stream);
 		newOne->x = stream->readUint16BE();
-		newOne->next = NULL;
-		(*viewLine) = newOne;
-		viewLine = &(newOne->next);
+		_speech->allSpeech.push_back(newOne);
 	}
 	return true;
 }
diff --git a/engines/sludge/speech.h b/engines/sludge/speech.h
index cd2a6dd596..776a9f5dea 100644
--- a/engines/sludge/speech.h
+++ b/engines/sludge/speech.h
@@ -30,13 +30,14 @@ struct ObjectType;
 
 struct SpeechLine {
 	Common::String textLine;
-	SpeechLine *next;
 	int x;
 };
 
+typedef Common::List<SpeechLine *> SpeechLineList;
+
 struct SpeechStruct {
 	OnScreenPerson *currentTalker;
-	SpeechLine *allSpeech;
+	SpeechLineList allSpeech;
 	int speechY, lastFile, lookWhosTalking;
 	SpritePalette talkCol;
 };