aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Gray2004-09-06 07:06:11 +0000
committerJonathan Gray2004-09-06 07:06:11 +0000
commit3f42d6f0aba4492ba4195d6547e5753f63ec7a0b (patch)
treed3eaec278a3fe9b3a9291c319ef1a5aef3d74d28
parentaa264a5079957a82f9e1e5a87837629a8b28eb54 (diff)
downloadscummvm-rg350-3f42d6f0aba4492ba4195d6547e5753f63ec7a0b.tar.gz
scummvm-rg350-3f42d6f0aba4492ba4195d6547e5753f63ec7a0b.tar.bz2
scummvm-rg350-3f42d6f0aba4492ba4195d6547e5753f63ec7a0b.zip
fix compiler warnings, including a if (foo = bar) occurance
svn-id: r14927
-rw-r--r--scumm/object.cpp2
-rw-r--r--scumm/script_v90he.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/scumm/object.cpp b/scumm/object.cpp
index dc61789aa8..c5b4a4bbb9 100644
--- a/scumm/object.cpp
+++ b/scumm/object.cpp
@@ -857,7 +857,7 @@ void ScummEngine::removeObjectFromDrawQue(int object) {
int i;
for (i = 0; i < _drawObjectQueNr; i++) {
- if (_drawObjectQue[i] = object)
+ if (_drawObjectQue[i] == object)
_drawObjectQue[i] = 0;
}
}
diff --git a/scumm/script_v90he.cpp b/scumm/script_v90he.cpp
index 9ac003279a..1004aa3eeb 100644
--- a/scumm/script_v90he.cpp
+++ b/scumm/script_v90he.cpp
@@ -386,7 +386,7 @@ void ScummEngine_v90he::o90_unknown1C() {
if (value == 10) {
int flags = pop();
- int unk = pop();
+ pop();
int y1 = pop();
int x1 = pop();
int resnum = pop();