ACS update:

- Add clientside script flag for Skulltag support.
- Change GetActorMomX/Y/Z to GetActorVelX/Y/Z.

SVN r1690 (trunk)
This commit is contained in:
Randy Heit 2009-06-30 21:03:21 +00:00
parent 25f2d5d296
commit e403e82025
5 changed files with 14 additions and 4 deletions

View file

@ -696,6 +696,13 @@ static void OuterScript(void)
scriptNumber += NET_SCRIPT_FLAG;
TK_NextToken();
}
// [BB] If NET and CLIENTSIDE are specified, this construction can only parse
// "NET CLIENTSIDE" but not "CLIENTSIDE NET".
if(tk_Token == TK_CLIENTSIDE)
{
scriptNumber += CLIENTSIDE_SCRIPT_FLAG;
TK_NextToken();
}
CountScript(scriptType);
PC_AddScript(scriptNumber + scriptType, ScriptVarCount);
pc_LastAppendedCommand = PCD_NOP;

View file

@ -35,7 +35,8 @@ enum
// Values added to script number to indicate flags (requires new-style .o)
enum
{
NET_SCRIPT_FLAG = 0x00010000
NET_SCRIPT_FLAG = 0x00010000,
CLIENTSIDE_SCRIPT_FLAG = 0x00020000, // [BB]
};
// Or'ed with variable index when passing variables of type "out"

View file

@ -189,6 +189,7 @@ static struct keyword_s
{ "libdefine", TK_LIBDEFINE },
{ "bool", TK_BOOL },
{ "net", TK_NET },
{ "clientside", TK_CLIENTSIDE }, // [BB]
{ "disconnect", TK_DISCONNECT },
{ "unloading", TK_UNLOADING },
{ "static", TK_STATIC }

View file

@ -119,6 +119,7 @@ typedef enum
TK_LIBDEFINE, // 'libdefine'
TK_BOOL, // 'bool'
TK_NET, // 'net'
TK_CLIENTSIDE, // 'clientside'
TK_DISCONNECT, // 'disconnect'
TK_UNLOADING, // 'unloading'
TK_STATIC, // 'static'

View file

@ -224,9 +224,9 @@ special
-6:GetSectorUDMFFixed(2),
-7:GetSideUDMFInt(3),
-8:GetSideUDMFFixed(3),
-9:GetActorMomX(1),
-10:GetActorMomY(1),
-11:GetActorMomZ(1),
-9:GetActorVelX(1),
-10:GetActorVelY(1),
-11:GetActorVelZ(1),
-12:SetActivator(1),
-13:SetActivatorToTarget(1),
-14:GetActorViewHeight(1),