[Scummvm-cvs-logs] scummvm master -> 362e195a5f538c4bfbb402df66102d6f1f0b57fe

[digitall]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
362e195a5f QUEEN: Remove unused, but set variable, personWalking from Talk::talk().


Commit: 362e195a5f538c4bfbb402df66102d6f1f0b57fe
    https://github.com/scummvm/scummvm/commit/362e195a5f538c4bfbb402df66102d6f1f0b57fe
Author: D G Turner (digitall at scummvm.org)
Date: 2012-11-19T15:00:40-08:00

Commit Message:
QUEEN: Remove unused, but set variable, personWalking from Talk::talk().

Changed paths:
    engines/queen/talk.cpp



diff --git a/engines/queen/talk.cpp b/engines/queen/talk.cpp
index 94bc105..1a520fa 100644
--- a/engines/queen/talk.cpp
+++ b/engines/queen/talk.cpp
@@ -96,7 +96,6 @@ void Talk::talk(const char *filename, int personInRoom, char *cutawayFilename) {
 	}
 
 	int16 oldLevel = 0;
-	bool personWalking = false; // FIXME: unused
 
 	// Lines 828-846 in talk.c
 	for (i = 1; i <= 4; i++) {
@@ -174,8 +173,7 @@ void Talk::talk(const char *filename, int personInRoom, char *cutawayFilename) {
 
 		if (1 == choicesLeft) {
 			// Automatically run the final dialogue option
-			if (speak(_talkString[0], &person, otherVoiceFilePrefix))
-				personWalking = true;
+			speak(_talkString[0], &person, otherVoiceFilePrefix)
 
 			if (_vm->input()->talkQuit())
 				break;
@@ -251,8 +249,7 @@ void Talk::talk(const char *filename, int personInRoom, char *cutawayFilename) {
 			findDialogueString(_person1PtrOff, head, _pMax, _talkString[0]);
 			if (_talkString[0][0] != '\0') {
 				sprintf(otherVoiceFilePrefix, "%2d%4xP", _talkKey, head);
-				if (speak(_talkString[0], &person, otherVoiceFilePrefix))
-					personWalking = true;
+				speak(_talkString[0], &person, otherVoiceFilePrefix)
 			}
 		}
 	}