mirror of
https://github.com/ZDoom/acc.git
synced 2025-02-07 06:11:02 +00:00
- Added "return" script support to ACC.
SVN r741 (trunk)
This commit is contained in:
parent
98cd068a97
commit
43f6244206
2 changed files with 8 additions and 1 deletions
6
parse.c
6
parse.c
|
@ -332,6 +332,7 @@ static struct ScriptTypes ScriptCounts[] =
|
|||
{ "lightning", LIGHTNING_SCRIPTS_BASE, 0 },
|
||||
{ "disconnect", DISCONNECT_SCRIPTS_BASE, 0 },
|
||||
{ "unloading", UNLOADING_SCRIPTS_BASE, 0 },
|
||||
{ "return", RETURN_SCRIPTS_BASE, 0 },
|
||||
{ NULL, -1, 0 }
|
||||
};
|
||||
|
||||
|
@ -620,6 +621,7 @@ static void OuterScript(void)
|
|||
case TK_WHITERETURN:
|
||||
case TK_LIGHTNING:
|
||||
case TK_UNLOADING:
|
||||
case TK_RETURN:
|
||||
ERR_Error(ERR_UNCLOSED_WITH_ARGS, YES);
|
||||
break;
|
||||
|
||||
|
@ -648,6 +650,10 @@ static void OuterScript(void)
|
|||
scriptType = ENTER_SCRIPTS_BASE;
|
||||
break;
|
||||
|
||||
case TK_RETURN:
|
||||
scriptType = RETURN_SCRIPTS_BASE;
|
||||
break;
|
||||
|
||||
case TK_PICKUP: // [BC]
|
||||
scriptType = PICKUP_SCRIPTS_BASE;
|
||||
break;
|
||||
|
|
3
pcode.h
3
pcode.h
|
@ -28,7 +28,8 @@ enum
|
|||
WHITE_RETURN_SCRIPTS_BASE = 8000, // [BC]
|
||||
LIGHTNING_SCRIPTS_BASE = 12000,
|
||||
UNLOADING_SCRIPTS_BASE = 13000,
|
||||
DISCONNECT_SCRIPTS_BASE = 14000
|
||||
DISCONNECT_SCRIPTS_BASE = 14000,
|
||||
RETURN_SCRIPTS_BASE = 15000,
|
||||
};
|
||||
|
||||
// Values added to script number to indicate flags (requires new-style .o)
|
||||
|
|
Loading…
Reference in a new issue