aboutsummaryrefslogtreecommitdiff
path: root/queen/talk.cpp
diff options
context:
space:
mode:
authorGregory Montoir2004-01-16 20:26:30 +0000
committerGregory Montoir2004-01-16 20:26:30 +0000
commit99500a0112e05ad73a67dc51e6fdfb59b1bf4f1f (patch)
tree75517eccd7b6359248ad61ee0d91c56e72f6ed47 /queen/talk.cpp
parent19ad2d0120def7bd22ee8e37630c4d1e5fc1c65c (diff)
downloadscummvm-rg350-99500a0112e05ad73a67dc51e6fdfb59b1bf4f1f.tar.gz
scummvm-rg350-99500a0112e05ad73a67dc51e6fdfb59b1bf4f1f.tar.bz2
scummvm-rg350-99500a0112e05ad73a67dc51e6fdfb59b1bf4f1f.zip
- removed noisy warning in talk code
- set _entryObj only if verb is WALK_TO - changed setConditions code in Command::openOrCloseAssociatedObject to be consistent with Command::setConditions ; this isn't like the original, but more logical to me. svn-id: r12441
Diffstat (limited to 'queen/talk.cpp')
-rw-r--r--queen/talk.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/queen/talk.cpp b/queen/talk.cpp
index a66b6d707f..ef9a4e2190 100644
--- a/queen/talk.cpp
+++ b/queen/talk.cpp
@@ -377,9 +377,6 @@ void Talk::findDialogueString(byte *ptr, int16 id, int16 max, char *str) {
else
ptr = getString(ptr, NULL, MAX_STRING_LENGTH, 4);
}
-
- if (str[0] == '\0')
- warning("Failed to find string with ID %i", id);
}
byte *Talk::loadDialogFile(const char *filename) {