thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Correct that FT opcode - it's bitwise or, not logical

Browse source 
svn-id: r5373
This commit is contained in:
James Brown 2002-11-02 08:18:21 +00:00
parent 35678731d9
commit 1c975ba92e
2 changed files with 22 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

24
scumm/script_v2.cpp
View file

@ -302,8 +302,8 @@ void Scumm::setupOpcodes2()
/* D4 */
&Scumm::o6_invalid,
&Scumm::o6_jumpToScript,
&Scumm::o6_land,
&Scumm::o6_lor,
&Scumm::o6_band,
&Scumm::o6_bor,
/* D8 */
&Scumm::o6_isRoomScriptRunning,
&Scumm::o6_invalid,
@ -625,8 +625,8 @@ void Scumm::setupOpcodes2()
/* D4 */
"o6_invalid",
"o6_jumpToScript",
"o6_land",
"o6_lor",
"o6_band",
"o6_bor",
/* D8 */
"o6_isRoomScriptRunning",
"o6_invalid",
@ -889,18 +889,30 @@ void Scumm::o6_div()
push(pop() / a);
}
void Scumm::o6_land()
void Scumm::o6_land() // Logical And
{
int a = pop();
push(pop() && a);
}
void Scumm::o6_lor()
void Scumm::o6_lor() // Logical Or
{
int a = pop();
push(pop() || a);
}
void Scumm::o6_bor() // Bitwise Or
{
int a = pop();
push(pop() | a);
}
void Scumm::o6_band() // Bitwise And
{
int a = pop();
push(pop() | a);
}
void Scumm::o6_kill()
{
pop();