diff options
| author | Paul Gilbert | 2015-06-03 22:05:52 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2015-06-03 22:05:52 -0400 |
| commit | 9d67c9535940fb76b12b721325c92745611a4b96 (patch) | |
| tree | 611ed5206b560a3a3ae485ec5313f3767142ba75 /engines/sherlock | |
| parent | ff28b217b3dc9d5a92debef7d59561126e14dd91 (diff) | |
| download | scummvm-rg350-9d67c9535940fb76b12b721325c92745611a4b96.tar.gz scummvm-rg350-9d67c9535940fb76b12b721325c92745611a4b96.tar.bz2 scummvm-rg350-9d67c9535940fb76b12b721325c92745611a4b96.zip | |
SHERLOCK: Fix gcc warnings
Diffstat (limited to 'engines/sherlock')
| -rw-r--r-- | engines/sherlock/scalpel/scalpel_user_interface.h | 2 | ||||
| -rw-r--r-- | engines/sherlock/talk.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/sherlock/scalpel/scalpel_user_interface.h b/engines/sherlock/scalpel/scalpel_user_interface.h index 552bcf00c5..67ba42b5a2 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 bb5c11c81f..d48b66cf8b 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; } |