zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-29 07:12:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: flag CVars in ZScript referenced wrong addresses

Browse source
This commit is contained in:
alexey.lysiuk 2018-06-09 17:21:55 +03:00
parent 85f5f897d7
commit 4a1f36623b
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/scripting/backend/codegen.cpp
View file

@ -6858,10 +6858,10 @@ ExpEmit FxCVar::Emit(VMFunctionBuilder *build)
{ {
int *pVal; int *pVal;
auto cv = static_cast<FFlagCVar *>(CVar); auto cv = static_cast<FFlagCVar *>(CVar);
auto &vcv = cv->ValueVar; auto vcv = &cv->ValueVar;
if (vcv == compatflags) pVal = &i_compatflags; if (vcv == &compatflags) pVal = &i_compatflags;
else if (vcv == compatflags2) pVal = &ii_compatflags2; else if (vcv == &compatflags2) pVal = &ii_compatflags2;
else pVal = &vcv.Value; else pVal = &vcv->Value;
build->Emit(OP_LKP, addr.RegNum, build->GetConstantAddress(pVal)); build->Emit(OP_LKP, addr.RegNum, build->GetConstantAddress(pVal));
build->Emit(OP_LW, dest.RegNum, addr.RegNum, nul); build->Emit(OP_LW, dest.RegNum, addr.RegNum, nul);
build->Emit(OP_SRL_RI, dest.RegNum, dest.RegNum, cv->BitNum); build->Emit(OP_SRL_RI, dest.RegNum, dest.RegNum, cv->BitNum);