[Scummvm-cvs-logs] scummvm master -> 9d67c9535940fb76b12b721325c92745611a4b96

[dreammaster]

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:
9d67c95359 SHERLOCK: Fix gcc warnings


Commit: 9d67c9535940fb76b12b721325c92745611a4b96
    https://github.com/scummvm/scummvm/commit/9d67c9535940fb76b12b721325c92745611a4b96
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-06-03T22:05:52-04:00

Commit Message:
SHERLOCK: Fix gcc warnings

Changed paths:
    engines/sherlock/scalpel/scalpel_user_interface.h
    engines/sherlock/talk.cpp



diff --git a/engines/sherlock/scalpel/scalpel_user_interface.h b/engines/sherlock/scalpel/scalpel_user_interface.h
index 552bcf0..67ba42b 100644
--- a/engines/sherlock/scalpel/scalpel_user_interface.h
+++ b/engines/sherlock/scalpel/scalpel_user_interface.h
@@ -51,7 +51,7 @@ private:
 	int _lookHelp;
 	int _bgFound, _oldBgFound;
 	int _help, _oldHelp;
-	char _key, _oldKey;
+	int _key, _oldKey;
 	int _temp, _oldTemp;
 	int _oldLook;
 	bool _keyboardInput;
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index bb5c11c..d48b66c 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -1026,7 +1026,7 @@ void Talk::pushSequence(int speaker) {
 void Talk::pushTalkSequence(Object *obj) {
 	// Check if the shape is already on the stack
 	for (uint idx = 0; idx < TALK_SEQUENCE_STACK_SIZE; ++idx) {
-		if (_talkSequenceStack[idx]._obj = obj)
+		if (_talkSequenceStack[idx]._obj == obj)
 			return;
 	}