[Scummvm-cvs-logs] scummvm master -> 055260769cd570f255eeaf57317eb0c62fce111c

eriktorbjorn eriktorbjorn at telia.com
Sun Nov 20 10:40:12 CET 2011


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:
055260769c QUEEN: Remove unused variable


Commit: 055260769cd570f255eeaf57317eb0c62fce111c
    https://github.com/scummvm/scummvm/commit/055260769cd570f255eeaf57317eb0c62fce111c
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2011-11-20T01:37:44-08:00

Commit Message:
QUEEN: Remove unused variable

As far as I can tell, this 'canQuit' variable (originally 'CANTQUIT')
has been replaced by the _vm->input->canQuit() method in all other
cases. However, I'm not at all sure what effect this change will have.

Changed paths:
    engines/queen/talk.cpp



diff --git a/engines/queen/talk.cpp b/engines/queen/talk.cpp
index 307425b..f38c78c 100644
--- a/engines/queen/talk.cpp
+++ b/engines/queen/talk.cpp
@@ -373,7 +373,6 @@ byte *Talk::loadDialogFile(const char *filename) {
 void Talk::load(const char *filename) {
 	int i;
 	byte *ptr = _fileData = loadDialogFile(filename);
-	bool canQuit; // FIXME: unused
 
 	// Load talk header
 
@@ -381,9 +380,9 @@ void Talk::load(const char *filename) {
 
 	if (_levelMax < 0) {
 		_levelMax = -_levelMax;
-		canQuit = false;
+		_vm->input()->canQuit(false);
 	} else {
-		canQuit = true;
+		_vm->input()->canQuit(true);
 	}
 
 	_uniqueKey      = (int16)READ_BE_INT16(ptr); ptr += 2;






More information about the Scummvm-git-logs mailing list