zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-05-30 08:31:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

- another batch of Hexen items converted.

Browse source 
- fixed parsing of named damage types and pain chances.
This commit is contained in:
Christoph Oelckers 2016-10-18 10:09:02 +02:00
parent 1652c02a08
commit 61cc7dbb29
17 changed files with 1332 additions and 1204 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/scripting/zscript/zcc_compile.cpp
View file

@ -1554,7 +1554,7 @@ const char *ZCCCompiler::GetString(ZCC_Expression *expr, bool silent)
{
if (expr->Type == TypeError)
{
return 0;
return nullptr;
}
else if (expr->Type->IsKindOf(RUNTIME_CLASS(PString)))
{
@ -1568,7 +1568,7 @@ const char *ZCCCompiler::GetString(ZCC_Expression *expr, bool silent)
else
{
if (!silent) Error(expr, "Cannot convert to string");
return 0;
return nullptr;
}
}
@ -1631,7 +1631,7 @@ void ZCCCompiler::DispatchProperty(FPropertyInfo *prop, ZCC_PropertyStmt *proper
conv.d = GetDouble(exp);
break;
case 'Z': // an optional string. Does not allow any numerical value.
case 'Z': // an optional string. Does not allow any numeric value.
if (!GetString(exp, true))
{
// apply this expression to the next argument on the list.
@ -1640,7 +1640,8 @@ void ZCCCompiler::DispatchProperty(FPropertyInfo *prop, ZCC_PropertyStmt *proper
p++;
continue;
}
// fall through
conv.s = GetString(exp);
break;
case 'C': // this parser accepts colors only in string form.
pref.i = 1;