zdoom/acc
0
0
Fork 0
mirror of https://github.com/ZDoom/acc.git synced 2025-03-13 20:01:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed bug with required optional parameters of MorphActor function

Browse source
This commit is contained in:
Dasperal 2020-08-27 23:01:32 +03:00 committed by Christoph Oelckers
parent 8a7d09c031
commit 51b7e7e88b
4 changed files with 102 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

100
parse.c
View file

@ -100,6 +100,7 @@ static void ActionOnCharRange(boolean write);
static void LeadingStrcpy(void);
static void LeadingPrint(void);
static void LeadingHudMessage(void);
static void LeadingMorphActor(void);
static void LeadingVarAssign(symbolNode_t *sym);
static pcd_t GetAssignPCD(tokenType_t token, symbolType_t symbol);
static void LeadingInternFunc(symbolNode_t *sym);
@ -1385,6 +1386,12 @@ static boolean ProcessStatement(statement_t owner)
case TK_HUDMESSAGEBOLD:
LeadingHudMessage();
break;
case TK_MORPHACTOR:
LeadingMorphActor();
PC_AppendCmd(PCD_DROP);
TK_NextTokenMustBe(TK_SEMICOLON, ERR_MISSING_SEMICOLON);
TK_NextToken();
break;
case TK_IF:
LeadingIf();
break;
@ -2523,6 +2530,95 @@ static void LeadingHudMessage(void)
TK_NextToken();
}
//==========================================================================
//
// LeadingMorphActor
//
// MorphActor(int tid, [str playerclass, [str monsterclass, [int duration, [int style, [str morphflash, [str unmorphflash]]]]]])
//
//==========================================================================
static void LeadingMorphActor(void)
{
int i;
byte strMask;
MS_Message(MSG_DEBUG, "---- LeadingMorphActor ----\n");
strMask = 0b01100110;
TK_NextTokenMustBe(TK_LPAREN, ERR_MISSING_LPAREN);
if(TK_NextToken() == TK_CONST)
{
TK_NextTokenMustBe(TK_COLON, ERR_MISSING_COLON);
ERR_Error(ERR_NO_DIRECT_VER, YES, NULL);
TK_NextToken();
}
i = 0;
if(tk_Token == TK_RPAREN)
{
ERR_Error(ERR_MISSING_PARAM, YES);
}
else
{
TK_Undo(); // Adjust for first expression
do
{
if(i == 7)
{
ERR_Error(ERR_BAD_ARG_COUNT, YES);
TK_SkipTo(TK_SEMICOLON);
TK_Undo();
return;
}
TK_NextToken();
if(tk_Token != TK_COMMA)
{
EvalExpression();
}
else
{
if(i > 0)
{
if(strMask & 1)
{
PC_AppendPushVal(STR_Find(""));
}
else
{
PC_AppendPushVal(0);
}
}
else
{
ERR_Error(ERR_MISSING_PARAM, YES);
}
}
i++;
strMask >>= 1;
} while(tk_Token == TK_COMMA);
}
while(i < 7)
{
if(strMask & 1)
{
PC_AppendPushVal(STR_Find(""));
}
else
{
PC_AppendPushVal(0);
}
i++;
strMask >>= 1;
}
if(i != 7)
{
ERR_Error(ERR_BAD_ARG_COUNT, YES);
}
TK_TokenMustBe(TK_RPAREN, ERR_MISSING_RPAREN);
PC_AppendCmd(PCD_MORPHACTOR);
}
//==========================================================================
//
// LeadingCreateTranslation
@ -3822,6 +3918,10 @@ static void ExprFactor(void)
LeadingStrcpy();
TK_NextToken();
break;
case TK_MORPHACTOR:
LeadingMorphActor();
TK_NextToken();
break;
default:
ERR_Error(ERR_BAD_EXPR, YES);
TK_NextToken();

1
symbol.c
View file

@ -193,7 +193,6 @@ static internFuncDef_t InternalFunctions[] =
{ "thingcountsector", PCD_NOP, PCD_THINGCOUNTSECTOR, 3, 0, 0, YES, NO },
{ "thingcountnamesector", PCD_NOP, PCD_THINGCOUNTNAMESECTOR, 3, 0, 0, YES, NO },
{ "checkplayercamera", PCD_NOP, PCD_CHECKPLAYERCAMERA, 1, 0, 0, YES, NO },
{ "morphactor", PCD_NOP, PCD_MORPHACTOR, 7, 2|4|8|16|32|64, 0, YES, NO },
{ "unmorphactor", PCD_NOP, PCD_UNMORPHACTOR, 2, 2, 0, YES, NO },
{ "getplayerinput", PCD_NOP, PCD_GETPLAYERINPUT, 2, 0, 0, YES, NO },
{ "classifyactor", PCD_NOP, PCD_CLASSIFYACTOR, 1, 0, 0, YES, NO },

1
token.c
View file

@ -201,6 +201,7 @@ static struct keyword_s
{ "endregion", TK_ENDREGION }, // [mxd]
{ "kill", TK_KILL }, // [JM]
{ "reopen", TK_REOPEN }, // [Nash]
{ "morphactor", TK_MORPHACTOR }, // [Dasperal]
};
#define NUM_KEYWORDS (sizeof(Keywords)/sizeof(Keywords[0]))

1
token.h
View file

@ -138,6 +138,7 @@ typedef enum
TK_KILL, // 'kill' [JM]
TK_REOPEN, // 'reopen' [Nash]
TK_ATSIGN, // '@'
TK_MORPHACTOR, // 'morphactor' [Dasperal]
} tokenType_t;
// PUBLIC FUNCTION PROTOTYPES ----------------------------------------------