aboutsummaryrefslogtreecommitdiff
path: root/scumm/script_v2.cpp
diff options
context:
space:
mode:
authorMax Horn2003-05-21 11:22:03 +0000
committerMax Horn2003-05-21 11:22:03 +0000
commit1d916f2056b3bc27ad9c78f970b4f2f959bd0401 (patch)
tree37a5a64fa408b57f53dc2196e46144738b8b2051 /scumm/script_v2.cpp
parent280e8a0741a473c1b9a881d5ee9e4d4854d24742 (diff)
downloadscummvm-rg350-1d916f2056b3bc27ad9c78f970b4f2f959bd0401.tar.gz
scummvm-rg350-1d916f2056b3bc27ad9c78f970b4f2f959bd0401.tar.bz2
scummvm-rg350-1d916f2056b3bc27ad9c78f970b4f2f959bd0401.zip
fix warnings
svn-id: r7778
Diffstat (limited to 'scumm/script_v2.cpp')
-rw-r--r--scumm/script_v2.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/scumm/script_v2.cpp b/scumm/script_v2.cpp
index 043871cbb9..2920610c1d 100644
--- a/scumm/script_v2.cpp
+++ b/scumm/script_v2.cpp
@@ -883,14 +883,16 @@ void Scumm_v2::o2_drawSentence() {
strcpy(sentence, (char*)getResourceAddress(rtVerb, slot));
if (_scummVars[VAR_SENTENCE_OBJECT1] > 0) {
- if (temp = getObjOrActorName(_scummVars[VAR_SENTENCE_OBJECT1])) {
+ temp = getObjOrActorName(_scummVars[VAR_SENTENCE_OBJECT1]);
+ if (temp) {
strcat(sentence, " ");
strcat(sentence, (char*)temp);
}
}
if (_scummVars[VAR_SENTENCE_OBJECT2] > 0) {
- if (temp = getObjOrActorName(_scummVars[VAR_SENTENCE_OBJECT2])) {
+ temp = getObjOrActorName(_scummVars[VAR_SENTENCE_OBJECT2]);
+ if (temp) {
strcat(sentence, " with ");
strcat(sentence, (char*)temp);
}