aboutsummaryrefslogtreecommitdiff
path: root/scumm/script_v6.cpp
diff options
context:
space:
mode:
authorTorbjörn Andersson2003-06-14 16:59:20 +0000
committerTorbjörn Andersson2003-06-14 16:59:20 +0000
commit67d1a48efc75eb34ff56f5baa85d55ea02cacde7 (patch)
treead29ee2cce862d5bcef20891a0ed65e1ca85bd60 /scumm/script_v6.cpp
parenta42fa9e25ce7d0a35016e483b0cf98e3512e98ea (diff)
downloadscummvm-rg350-67d1a48efc75eb34ff56f5baa85d55ea02cacde7.tar.gz
scummvm-rg350-67d1a48efc75eb34ff56f5baa85d55ea02cacde7.tar.bz2
scummvm-rg350-67d1a48efc75eb34ff56f5baa85d55ea02cacde7.zip
Fixed o6_band() to be "logical AND" instead of "logical OR". I've forgotten
who pointed this out, and I don't know which games use it. svn-id: r8479
Diffstat (limited to 'scumm/script_v6.cpp')
-rw-r--r--scumm/script_v6.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp
index cd42be1659..0de160b0bd 100644
--- a/scumm/script_v6.cpp
+++ b/scumm/script_v6.cpp
@@ -580,7 +580,7 @@ void Scumm_v6::o6_bor() {
void Scumm_v6::o6_band() {
int a = pop();
- push(pop() | a);
+ push(pop() & a);
}
void Scumm_v6::o6_pop() {