zdoom/qzdoom-gpl
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom-gpl.git synced 2025-01-31 18:50:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add support for Name and String types to ACS's GetUserVariable

Browse source 
- Reading one of these types will copy its value into the global ACS string
  table and return the index.
This commit is contained in:
Randy Heit 2016-03-29 22:49:12 -05:00
parent b37ef48e99
commit 1648a71e45
1 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/p_acs.cpp
View file

@ -4529,12 +4529,12 @@ int DLevelScript::LineFromID(int id)
} }
} }
bool GetVarAddrType(AActor *self, FName varname, int index, void *&addr, PType *&type, bool allownative) bool GetVarAddrType(AActor *self, FName varname, int index, void *&addr, PType *&type, bool readonly)
{ {
PField *var = dyn_cast<PField>(self->GetClass()->Symbols.FindSymbol(varname, true)); PField *var = dyn_cast<PField>(self->GetClass()->Symbols.FindSymbol(varname, true));
PArray *arraytype; PArray *arraytype;
if (var == NULL || (!allownative && (var->Flags & VARF_Native))) if (var == NULL || (!readonly && (var->Flags & VARF_Native)))
{ {
return false; return false;
} }
@ -4561,6 +4561,11 @@ bool GetVarAddrType(AActor *self, FName varname, int index, void *&addr, PType *
// but we do want to support Float subclasses like Fixed. // but we do want to support Float subclasses like Fixed.
if (!type->IsA(RUNTIME_CLASS(PInt)) || !type->IsKindOf(RUNTIME_CLASS(PFloat))) if (!type->IsA(RUNTIME_CLASS(PInt)) || !type->IsKindOf(RUNTIME_CLASS(PFloat)))
{ {
// For reading, we also support Name and String types.
if (readonly && (type->IsA(RUNTIME_CLASS(PName)) || type->IsA(RUNTIME_CLASS(PString))))
{
return true;
}
return false; return false;
} }
return true; return true;
@ -4591,13 +4596,21 @@ static int GetUserVariable(AActor *self, FName varname, int index)
if (GetVarAddrType(self, varname, index, addr, type, true)) if (GetVarAddrType(self, varname, index, addr, type, true))
{ {
if (!type->IsKindOf(RUNTIME_CLASS(PFloat))) if (type->IsKindOf(RUNTIME_CLASS(PFloat)))
{ {
return type->GetValueInt(addr); return FLOAT2FIXED(type->GetValueFloat(addr));
}
else if (type->IsA(RUNTIME_CLASS(PName)))
{
return GlobalACSStrings.AddString(FName(ENamedName(type->GetValueInt(addr))).GetChars());
}
else if (type->IsA(RUNTIME_CLASS(PString)))
{
return GlobalACSStrings.AddString(*(FString *)addr);
} }
else else
{ {
return FLOAT2FIXED(type->GetValueFloat(addr)); return type->GetValueInt(addr);
} }
} }
return 0; return 0;