zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-25 13:41:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

- let "" be synonymous with 'none' in ZScript.

Browse source
This commit is contained in:
Christoph Oelckers 2016-11-12 10:06:26 +01:00
parent 62a259bb36
commit 30a2171080
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/scripting/codegeneration/codegen.h
View file

@ -192,7 +192,11 @@ struct ExpVal
FName GetName() const FName GetName() const
{ {
if (Type == TypeString) return FName(*(FString *)&pointer); if (Type == TypeString)
{
if (((FString *)&pointer)->Len() == 0) return NAME_None;
return FName(*(FString *)&pointer);
}
return Type == TypeName ? ENamedName(Int) : NAME_None; return Type == TypeName ? ENamedName(Int) : NAME_None;
} }
}; };

2
src/scripting/vm/vmexec.h
View file

@ -1686,7 +1686,7 @@ static void DoCast(const VMRegisters &reg, const VMFrame *f, int a, int b, int c
case CAST_S2N: case CAST_S2N:
ASSERTD(a); ASSERTS(b); ASSERTD(a); ASSERTS(b);
reg.d[a] = FName(reg.s[b]); reg.d[a] = reg.s[b].Len() == 0? FName(NAME_None) : FName(reg.s[b]);
break; break;
case CAST_N2S: case CAST_N2S: