mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-14 16:40:56 +00:00
Merge branch 'master' of https://github.com/coelckers/gzdoom
This commit is contained in:
commit
04bf975796
1 changed files with 13 additions and 2 deletions
|
@ -7425,10 +7425,21 @@ ExpEmit FxArrayElement::Emit(VMFunctionBuilder *build)
|
|||
build->Emit(OP_LP, start.RegNum, arrayvar.RegNum, build->GetConstantInt(0));
|
||||
|
||||
auto f = Create<PField>(NAME_None, TypeUInt32, ismeta? VARF_Meta : 0, SizeAddr);
|
||||
static_cast<FxMemberBase *>(Array)->membervar = f;
|
||||
static_cast<FxMemberBase *>(Array)->AddressRequested = false;
|
||||
auto arraymemberbase = static_cast<FxMemberBase *>(Array);
|
||||
|
||||
auto origmembervar = arraymemberbase->membervar;
|
||||
auto origaddrreq = arraymemberbase->AddressRequested;
|
||||
auto origvaluetype = Array->ValueType;
|
||||
|
||||
arraymemberbase->membervar = f;
|
||||
arraymemberbase->AddressRequested = false;
|
||||
Array->ValueType = TypeUInt32;
|
||||
|
||||
bound = Array->Emit(build);
|
||||
|
||||
arraymemberbase->membervar = origmembervar;
|
||||
arraymemberbase->AddressRequested = origaddrreq;
|
||||
Array->ValueType = origvaluetype;
|
||||
}
|
||||
else start = arrayvar;
|
||||
|
||||
|
|
Loading…
Reference in a new issue