zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "- fixed incorrect code generation for '||' operator (at least I hope it's fixed now.)" 

This reverts commit 2a89a9f1d8.
This commit is contained in:
Randy Heit 2016-02-07 21:59:45 -06:00
parent ecef5647d4
commit 7b42093dc9
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/thingdef/thingdef_expression.cpp
View File

@ -1697,7 +1697,7 @@ ExpEmit FxBinaryLogical::Emit(VMFunctionBuilder *build)
else
{
assert(Operator == TK_OrOr);
build->Emit(OP_EQ_K, 1, op1.RegNum, zero);
build->Emit(OP_EQ_K, 0, op1.RegNum, zero);
// If op1 is not 0, skip evaluation of op2.
size_t patchspot = build->Emit(OP_JMP, 0, 0, 0);