zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- Finished the framework for specifying all action functions externally, 

including restricting them to particular classes.

SVN r403 (trunk)
This commit is contained in:
Randy Heit 2006-12-04 23:25:59 +00:00
parent 511e11e8b4
commit 24b5a0b110
14 changed files with 3819 additions and 3706 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/rh-log.txt
View File

@ -23,11 +23,13 @@ December 2, 2006 (Changes by Graf Zahl)
- Fixed: The Doom 2 cast finale didn't work with the dynamic state name handling.
November 30, 2006
- Finished the framework for specifying all action functions externally,
including restricting them to particular classes.
- Removed all the "fast" and unused code from FColorMatcher. Today's
computers are fast enough that the difference isn't even noticeable
unless you're doing hundreds of thousands of matches, and I never had
any plans to improve the algorithm the "fast" code used.
- Fixed: BestColor() should not by default return 1 as a possible match,
- Fixed: BestColor() should not by default return 0 as a possible match,
since it's normally the transparent color.
- The DSimpleCanvas constructor now fills MemBuffer with zeros.
- Fixed: If the FBTexture wasn't exactly the same size as the screen,

98
src/codepointers.h Normal file
View File

@ -0,0 +1,98 @@
WEAPON(JumpIfNoAmmo)
WEAPON(CustomPunch)
WEAPON(FireBullets)
WEAPON(FireCustomMissile)
WEAPON(RailAttack)
WEAPON(LightInverse)
WEAPON(ThrowGrenade)
WEAPON(SelectWeapon)
WEAPON(Light)
ACTOR(ChangeFlag)
ACTOR(MeleeAttack)
ACTOR(MissileAttack)
ACTOR(BulletAttack)
ACTOR(ScreamAndUnblock)
ACTOR(ActiveAndUnblock)
ACTOR(ActiveSound)
ACTOR(FastChase)
ACTOR(CentaurDefend)
ACTOR(FreezeDeath)
ACTOR(FreezeDeathChunks)
ACTOR(GenericFreezeDeath)
ACTOR(IceGuyDie)
ACTOR(M_Saw)
ACTOR(Wander)
ACTOR(Look2)
ACTOR(TossGib)
ACTOR(SentinelBob)
ACTOR(SentinelRefire)
ACTOR(Tracer2)
ACTOR(SetShadow)
ACTOR(ClearShadow)
ACTOR(GetHurt)
ACTOR(TurretLook)
ACTOR(KlaxonBlare)
ACTOR(CheckTerrain)
ACTOR(Countdown)
ACTOR(AlertMonsters)
ACTOR(ClearSoundTarget)
ACTOR(FireAssaultGun)
ACTOR(PlaySound)
ACTOR(PlayWeaponSound)
ACTOR(FLoopActiveSound)
ACTOR(LoopActiveSound)
ACTOR(StopSound)
ACTOR(PlaySoundEx)
ACTOR(StopSoundEx)
ACTOR(SeekerMissile)
ACTOR(Jump)
ACTOR(ExplodeParms)
ACTOR(CallSpecial)
ACTOR(CustomMissile)
ACTOR(CustomBulletAttack)
ACTOR(JumpIfHealthLower)
ACTOR(JumpIfCloser)
ACTOR(JumpIfInventory)
ACTOR(CustomRailgun)
ACTOR(GiveInventory)
ACTOR(TakeInventory)
ACTOR(SpawnItem)
ACTOR(SpawnItemEx)
ACTOR(Recoil)
ACTOR(Print)
ACTOR(SetTranslucent)
ACTOR(FadeIn)
ACTOR(FadeOut)
ACTOR(SpawnDebris)
ACTOR(SetSolid)
ACTOR(UnsetSolid)
ACTOR(SetFloat)
ACTOR(UnsetFloat)
ACTOR(BishopMissileWeave)
ACTOR(CStaffMissileSlither)
ACTOR(CheckSight)
ACTOR(ExtChase)
ACTOR(DropInventory)
ACTOR(SetBlend)
ACTOR(JumpIf)
ACTOR(KillMaster)
ACTOR(KillChildren)
ACTOR(DualPainAttack)
ACTOR(GiveToTarget)
ACTOR(TakeFromTarget)
ACTOR(JumpIfInTargetInventory)
ACTOR(CountdownArg)
ACTOR(CustomMeleeAttack)
ACTOR(CustomComboAttack)
ACTOR(Burst)
ACTOR(SkullPop)
ACTOR(CheckFloor)
ACTOR(CheckPlayerDone)
ACTOR(RadiusThrust)
ACTOR(Stop)
ACTOR(SPosAttackUseAtkSound)
ACTOR(Respawn)
ACTOR(BarrelDestroy)
ACTOR(PlayerSkinCheck)
ACTOR(QueueCorpse)

6
src/decorations.cpp
View File

@ -114,6 +114,7 @@ END_DEFAULTS
// EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
void ProcessActor(void (*process)(FState *, int));
void ParseClass();
void ParseGlobalConst();
void FinishThingdef();
void InitDecorateTranslations();
@ -335,6 +336,11 @@ static void ParseDecorate (void (*process)(FState *, int))
def = DEF_Projectile;
SC_MustGetString ();
}
else if (SC_Compare ("class"))
{
ParseClass();
continue;
}
else if (SC_Compare ("Const"))
{
ParseGlobalConst();

1
src/infodefaults.cpp
View File

@ -64,7 +64,6 @@ void FActorInfo::BuildDefaults ()
parent->ActorInfo->BuildDefaults ();
Class->Meta = parent->Meta;
Class->Symbols.SetParentTable (&parent->Symbols);
assert (Class->Size >= parent->Size);
memcpy (Class->Defaults, parent->Defaults, parent->Size);
if (Class->Size > parent->Size)

13
src/sc_man.cpp
View File

@ -738,11 +738,11 @@ FString SC_TokenName (int token, const char *string)
{
static const char *const names[] =
{
"an identifier",
"a string constant",
"a name constant",
"an integer constant",
"a float constant",
"identifier",
"string constant",
"name constant",
"integer constant",
"float constant",
"'...'",
"'>>='",
"'<<='",
@ -763,7 +763,8 @@ FString SC_TokenName (int token, const char *string)
"'<='",
"'>='",
"'=='",
"'!="
"'!='",
"'action'",
"'break'",
"'case'",
"'const'",

1
src/sc_man.h
View File

@ -63,6 +63,7 @@ enum
TK_Geq, // >=
TK_Eq, // ==
TK_Neq, // !=
TK_Action,
TK_Break,
TK_Case,
TK_Const,

5482
src/sc_man_scanner.h
View File

File diff suppressed because it is too large Load Diff

5
src/sc_man_scanner.re
View File

@ -139,8 +139,9 @@ std2:
'stop' { RET(TK_Stop); }
/* Needed for decorate action functions */
"eval" { RET(TK_Eval); }
"evalnot" { RET(TK_EvalNot); }
'eval' { RET(TK_Eval); }
'evalnot' { RET(TK_EvalNot); }
'action' { RET(TK_Action); }
L (L|D)* { RET(TK_Identifier); }

440
src/thingdef.cpp
View File

@ -413,336 +413,29 @@ void A_ChangeFlag(AActor * self)
struct AFuncDesc
{
const char * Name;
const char *Name;
actionf_p Function;
const char * parameters;
};
// Prototype the code pointers
#define WEAPON(x) void A_##x(AActor*);
#define ACTOR(x) void A_##x(AActor*);
ACTOR(MeleeAttack)
ACTOR(MissileAttack)
ACTOR(ComboAttack)
ACTOR(BulletAttack)
ACTOR(ScreamAndUnblock)
ACTOR(ActiveAndUnblock)
ACTOR(ActiveSound)
ACTOR(FastChase)
ACTOR(CentaurDefend)
ACTOR(FreezeDeath)
ACTOR(FreezeDeathChunks)
ACTOR(GenericFreezeDeath)
ACTOR(IceGuyDie)
ACTOR(M_Saw)
ACTOR(Wander)
ACTOR(Look2)
ACTOR(TossGib)
ACTOR(SentinelBob)
ACTOR(SentinelRefire)
ACTOR(Tracer2)
ACTOR(SetShadow)
ACTOR(ClearShadow)
ACTOR(GetHurt)
ACTOR(TurretLook)
ACTOR(KlaxonBlare)
ACTOR(CheckTerrain)
ACTOR(Countdown)
ACTOR(AlertMonsters)
ACTOR(ClearSoundTarget)
ACTOR(FireAssaultGun)
ACTOR(PlaySound)
ACTOR(PlayWeaponSound)
ACTOR(FLoopActiveSound)
ACTOR(LoopActiveSound)
ACTOR(StopSound)
ACTOR(PlaySoundEx)
ACTOR(StopSoundEx)
ACTOR(SeekerMissile)
ACTOR(Jump)
ACTOR(ExplodeParms)
ACTOR(CallSpecial)
ACTOR(CustomMissile)
ACTOR(CustomBulletAttack)
ACTOR(JumpIfHealthLower)
ACTOR(JumpIfCloser)
ACTOR(JumpIfNoAmmo)
ACTOR(JumpIfInventory)
ACTOR(CustomPunch)
ACTOR(FireBullets)
ACTOR(FireCustomMissile)
ACTOR(RailAttack)
ACTOR(CustomRailgun)
ACTOR(LightInverse)
ACTOR(GiveInventory)
ACTOR(TakeInventory)
ACTOR(SpawnItem)
ACTOR(SpawnItemEx)
ACTOR(ThrowGrenade)
ACTOR(Recoil)
ACTOR(SelectWeapon)
ACTOR(Print)
ACTOR(SetTranslucent)
ACTOR(FadeIn)
ACTOR(FadeOut)
ACTOR(SpawnDebris)
ACTOR(SetSolid)
ACTOR(UnsetSolid)
ACTOR(SetFloat)
ACTOR(UnsetFloat)
ACTOR(BishopMissileWeave)
ACTOR(CStaffMissileSlither)
ACTOR(CheckSight)
ACTOR(ExtChase)
ACTOR(DropInventory)
ACTOR(SetBlend)
ACTOR(JumpIf)
ACTOR(SetUserVar)
ACTOR(SetUserVarRandom)
ACTOR(KillMaster)
ACTOR(KillChildren)
ACTOR(DualPainAttack)
ACTOR(GiveToTarget)
ACTOR(TakeFromTarget)
ACTOR(JumpIfInTargetInventory)
ACTOR(CountdownArg)
ACTOR(CustomMeleeAttack)
ACTOR(CustomComboAttack)
ACTOR(Light)
ACTOR(Burst)
ACTOR(SkullPop)
ACTOR(CheckFloor)
ACTOR(CheckPlayerDone)
ACTOR(RadiusThrust)
ACTOR(Stop)
ACTOR(SPosAttackUseAtkSound)
ACTOR(Respawn)
ACTOR(BarrelDestroy)
ACTOR(PlayerSkinCheck)
ACTOR(QueueCorpse)
#include "codepointers.h"
#include "d_dehackedactions.h"
void A_ComboAttack(AActor*);
/* What do the parameter letters mean?
*
* If the letter is uppercase, it is required. Lowercase letters are optional.
* i = integer
* f = fixed point
* s = sound name
* m = actor name
* t = string
* l = jump label
* c = color
* x = expression
* y = expression
* If the final character is a +, the previous parameter is repeated indefinitely,
* and an "imaginary" first parameter is inserted containing the total number of
* parameters passed.
*/
#define FUNC(name, parm) { #name, name, parm },
// Declare the code pointer table
AFuncDesc AFTable[]=
AFuncDesc AFTable[] =
{
// most of the functions available in Dehacked
FUNC(A_MonsterRail, NULL)
FUNC(A_BFGSpray, "mxx")
FUNC(A_Pain, NULL)
FUNC(A_NoBlocking, NULL)
FUNC(A_XScream, NULL)
FUNC(A_Look, NULL)
FUNC(A_Chase, NULL)
FUNC(A_FaceTarget, NULL)
FUNC(A_PosAttack, NULL)
FUNC(A_Scream, NULL)
FUNC(A_SPosAttack, NULL)
FUNC(A_SPosAttackUseAtkSound, NULL)
FUNC(A_VileChase, NULL)
FUNC(A_VileStart, NULL)
FUNC(A_VileTarget, NULL)
FUNC(A_VileAttack, NULL)
FUNC(A_StartFire, NULL)
FUNC(A_Fire, NULL)
FUNC(A_FireCrackle, NULL)
FUNC(A_Tracer, NULL)
FUNC(A_SkelWhoosh, NULL)
FUNC(A_SkelFist, NULL)
FUNC(A_SkelMissile, NULL)
FUNC(A_FatRaise, NULL)
FUNC(A_FatAttack1, "m")
FUNC(A_FatAttack2, "m")
FUNC(A_FatAttack3, "m")
FUNC(A_BossDeath, NULL)
FUNC(A_CPosAttack, NULL)
FUNC(A_CPosRefire, NULL)
FUNC(A_TroopAttack, NULL)
FUNC(A_SargAttack, NULL)
FUNC(A_HeadAttack, NULL)
FUNC(A_BruisAttack, NULL)
FUNC(A_SkullAttack, NULL)
FUNC(A_Metal, NULL)
FUNC(A_SpidRefire, NULL)
FUNC(A_BabyMetal, NULL)
FUNC(A_BspiAttack, NULL)
FUNC(A_Hoof, NULL)
FUNC(A_CyberAttack, NULL)
FUNC(A_PainAttack, "m")
FUNC(A_DualPainAttack, "m")
FUNC(A_PainDie, "m")
FUNC(A_KeenDie, NULL)
FUNC(A_BrainPain, NULL)
FUNC(A_BrainScream, NULL)
FUNC(A_BrainDie, NULL)
FUNC(A_BrainAwake, NULL)
FUNC(A_BrainSpit, NULL)
FUNC(A_SpawnSound, NULL)
FUNC(A_SpawnFly, NULL)
FUNC(A_BrainExplode, NULL)
FUNC(A_Die, NULL)
FUNC(A_Detonate, NULL)
FUNC(A_Mushroom, "mx")
FUNC(A_SetFloorClip, NULL)
FUNC(A_UnSetFloorClip, NULL)
FUNC(A_HideThing, NULL)
FUNC(A_UnHideThing, NULL)
FUNC(A_SetInvulnerable, NULL)
FUNC(A_UnSetInvulnerable, NULL)
FUNC(A_SetReflective, NULL)
FUNC(A_UnSetReflective, NULL)
FUNC(A_SetReflectiveInvulnerable, NULL)
FUNC(A_UnSetReflectiveInvulnerable, NULL)
FUNC(A_SetShootable, NULL)
FUNC(A_UnSetShootable, NULL)
FUNC(A_NoGravity, NULL)
FUNC(A_Gravity, NULL)
FUNC(A_LowGravity, NULL)
{"A_Fall", A_NoBlocking, NULL}, // Allow Doom's old name, too, for this function
FUNC(A_SetSolid, NULL)
FUNC(A_UnsetSolid, NULL)
FUNC(A_SetFloat, NULL)
FUNC(A_UnsetFloat, NULL)
// For better chainsaw attacks
FUNC(A_M_Saw, NULL)
// some functions from the old DECORATE parser
FUNC(A_BulletAttack, NULL)
FUNC(A_ScreamAndUnblock, NULL)
FUNC(A_ActiveAndUnblock, NULL)
FUNC(A_ActiveSound, NULL)
// useful functions from Hexen
FUNC(A_FastChase, NULL)
FUNC(A_FreezeDeath, NULL)
FUNC(A_FreezeDeathChunks, NULL)
FUNC(A_GenericFreezeDeath, NULL)
FUNC(A_IceGuyDie, NULL) // useful for bursting a monster into ice chunks without delay
FUNC(A_CentaurDefend, NULL)
FUNC(A_BishopMissileWeave, NULL)
FUNC(A_CStaffMissileSlither, NULL)
FUNC(A_PlayerScream, NULL)
FUNC(A_SkullPop, "m")
FUNC(A_CheckPlayerDone, NULL)
// useful functions from Strife
FUNC(A_Wander, NULL)
FUNC(A_Look2, NULL)
FUNC(A_TossGib, NULL)
FUNC(A_SentinelBob, NULL)
FUNC(A_SentinelRefire, NULL)
FUNC(A_Tracer2, NULL)
FUNC(A_SetShadow, NULL)
FUNC(A_ClearShadow, NULL)
FUNC(A_GetHurt, NULL)
FUNC(A_TurretLook, NULL)
FUNC(A_KlaxonBlare, NULL)
FUNC(A_Countdown, NULL)
FUNC(A_AlertMonsters, NULL)
FUNC(A_ClearSoundTarget, NULL)
FUNC(A_FireAssaultGun, NULL)
FUNC(A_CheckTerrain, NULL )
// Only selected original weapon functions will be available.
// All the attack pointers are somewhat tricky due to the way the flash state is handled
FUNC(A_Light, "X")
FUNC(A_Light0, NULL)
FUNC(A_Light1, NULL)
FUNC(A_Light2, NULL)
FUNC(A_LightInverse, NULL)
FUNC(A_WeaponReady, NULL)
FUNC(A_Lower, NULL)
FUNC(A_Raise, NULL)
FUNC(A_ReFire, NULL)
FUNC(A_Punch, NULL)
FUNC(A_CheckReload, NULL)
FUNC(A_GunFlash, NULL)
FUNC(A_Saw, "ssxm")
// DECORATE specific functions
FUNC(A_BulletAttack, NULL)
FUNC(A_PlaySound, "S" )
FUNC(A_PlayWeaponSound, "S" )
FUNC(A_FLoopActiveSound, NULL )
FUNC(A_LoopActiveSound, NULL )
FUNC(A_StopSound, NULL )
FUNC(A_PlaySoundEx, "STi" )
FUNC(A_StopSoundEx, "T" )
FUNC(A_SeekerMissile, "XX" )
FUNC(A_Jump, "XL+" )
FUNC(A_CustomMissile, "MXXxxx" )
FUNC(A_CustomBulletAttack, "XXXXmx" )
FUNC(A_CustomRailgun, "Xxccxxxm" )
FUNC(A_JumpIfHealthLower, "XL" )
FUNC(A_JumpIfCloser, "XL" )
FUNC(A_JumpIfInventory, "MXL" )
FUNC(A_GiveInventory, "Mx" )
FUNC(A_TakeInventory, "Mx" )
FUNC(A_SpawnItem, "Mxxyx" )
FUNC(A_SpawnItemEx, "Mxxxxxxxxx" )
FUNC(A_ThrowGrenade, "Mxxxy" )
FUNC(A_SelectWeapon, "M")
FUNC(A_Print, "Txt")
FUNC(A_SetTranslucent, "Xx")
FUNC(A_FadeIn, "x")
FUNC(A_FadeOut, "x")
FUNC(A_SpawnDebris, "Mx")
FUNC(A_CheckSight, "L")
FUNC(A_ExtChase, "XXyx")
FUNC(A_DropInventory, "M")
FUNC(A_SetBlend, "CXXc")
FUNC(A_ChangeFlag, "TX")
FUNC(A_JumpIf, "XL")
FUNC(A_KillMaster, NULL)
FUNC(A_KillChildren, NULL)
FUNC(A_CheckFloor, "L")
FUNC(A_PlayerSkinCheck, "L")
{"A_BasicAttack", A_ComboAttack, "ISMF" },
// Weapon only functions
FUNC(A_JumpIfNoAmmo, "L" )
FUNC(A_CustomPunch, "Xxymx" )
FUNC(A_FireBullets, "XXXXmyx" )
FUNC(A_FireCustomMissile, "Mxyxxx" )
FUNC(A_RailAttack, "Xxyccxxm" )
FUNC(A_Recoil, "X")
FUNC(A_JumpIfInTargetInventory, "MXL" )
FUNC(A_GiveToTarget, "Mx" )
FUNC(A_TakeFromTarget, "Mx" )
FUNC(A_CountdownArg, "X")
FUNC(A_CustomMeleeAttack, "Xssty" )
FUNC(A_CustomComboAttack, "MXXsty" )
FUNC(A_Burst, "M")
FUNC(A_RadiusThrust, "xxy")
{"A_Explode", A_ExplodeParms, "xxy" },
FUNC(A_Stop, NULL)
FUNC(A_Respawn, "y")
FUNC(A_BarrelDestroy, NULL)
FUNC(A_QueueCorpse, NULL)
#define WEAPON(x) { "A_" #x, A_##x },
#define ACTOR(x) { "A_" #x, A_##x },
#include "codepointers.h"
#include "d_dehackedactions.h"
{ "A_Fall", A_NoBlocking },
{ "A_BasicAttack", A_ComboAttack }
};
//==========================================================================
//
// Find a function by name using a binary search
@ -753,7 +446,7 @@ static int STACK_ARGS funccmp(const void * a, const void * b)
return stricmp( ((AFuncDesc*)a)->Name, ((AFuncDesc*)b)->Name);
}
static AFuncDesc * FindFunction(char * string)
static AFuncDesc * FindFunction(const char * string)
{
static bool funcsorted=false;
@ -1851,24 +1544,15 @@ do_stop:
goto endofstate;
}
//AFuncDesc * afd = FindFunction(sc_String);
//PSymbolActionFunction *sym = bag.Info->Class->Symbols.FindSymbol (FName(sc_String, true), true);
//if (sym != NULL && sym->SymbolType == SYM_ActionFunction)
//{
// PSymbolActionFunction *afd = static_cast<PSymbolActionFunction *>(sym);
// state.Action = afd->Function;
// if (!afd->Arguments.IsEmpty())
// {
// const char *params = afd->Arguments.GetChars();
// int numparams = afd->Arguments.Len();
AFuncDesc * afd = FindFunction(sc_String);
if (afd != NULL)
PSymbol *sym = bag.Info->Class->Symbols.FindSymbol (FName(sc_String, true), true);
if (sym != NULL && sym->SymbolType == SYM_ActionFunction)
{
PSymbolActionFunction *afd = static_cast<PSymbolActionFunction *>(sym);
state.Action = afd->Function;
if (afd->parameters !=NULL)
if (!afd->Arguments.IsEmpty())
{
const char * params = afd->parameters;
int numparams = (int)strlen(params);
const char *params = afd->Arguments.GetChars();
int numparams = (int)afd->Arguments.Len();
int v;
@ -2582,7 +2266,9 @@ void ParseGlobalConst()
//
// ActorActionDef
//
// Parses an action function definition.
// Parses an action function definition. A lot of this is essentially
// documentation in the declaration for when I have a proper language
// ready.
//
//==========================================================================
@ -2592,11 +2278,18 @@ static void ActorActionDef (AActor *defaults, Baggage &bag)
#define EVAL 2
#define EVALNOT 4
AFuncDesc *afd;
FName funcname;
FString args;
SC_MustGetToken(TK_Native);
SC_MustGetToken(TK_Identifier);
funcname = sc_Name;
afd = FindFunction(sc_String);
if (afd == NULL)
{
SC_ScriptError ("The function '%s' has not been exported from the executable.", sc_String);
}
SC_MustGetToken('(');
if (!SC_CheckToken(')'))
{
@ -2628,6 +2321,8 @@ static void ActorActionDef (AActor *defaults, Baggage &bag)
break;
}
}
// Read the variable type
SC_MustGetAnyToken();
switch (sc_TokenType)
{
case TK_Bool: type = 'i'; break;
@ -2640,11 +2335,7 @@ static void ActorActionDef (AActor *defaults, Baggage &bag)
case TK_Color: type = 'c'; break;
case TK_Class:
SC_MustGetToken('<');
SC_MustGetToken(TK_Identifier);
if (sc_Name != NAME_Actor)
{
SC_ScriptError ("Sorry, you can only use class<actor>");
}
SC_MustGetToken(TK_Identifier); // Skip class name, since the parser doesn't care
SC_MustGetToken('>');
type = 'm';
break;
@ -2657,6 +2348,16 @@ static void ActorActionDef (AActor *defaults, Baggage &bag)
SC_ScriptError ("Unknown variable type %s", SC_TokenName(sc_TokenType, sc_String).GetChars());
break;
}
// Read the optional variable name
if (!SC_CheckToken(',') && !SC_CheckToken(')'))
{
SC_MustGetToken(TK_Identifier);
}
else
{
SC_UnGet();
}
// If eval or evalnot were a flag, hey the decorate parser doesn't actually care about the type.
if (flags & EVALNOT)
{
type = 'y';
@ -2665,10 +2366,9 @@ static void ActorActionDef (AActor *defaults, Baggage &bag)
{
type = 'x';
}
if (!(flags & OPTIONAL))
if (!(flags & OPTIONAL) && type != '+')
{
type -= 'a' - 'A';
break;
}
#undef OPTIONAL
#undef EVAL
@ -2686,7 +2386,7 @@ static void ActorActionDef (AActor *defaults, Baggage &bag)
sym->SymbolName = funcname;
sym->SymbolType = SYM_ActionFunction;
sym->Arguments = args;
sym->Function = NULL;
sym->Function = afd->Function;
if (bag.Info->Class->Symbols.AddSymbol (sym) == NULL)
{
delete sym;
@ -4579,3 +4279,57 @@ void FinishThingdef()
QuestItemClasses[i]=PClass::FindClass(fmt);
}
}
//==========================================================================
//
// ParseClass
//
// A minimal placeholder so that I can assign properties to some native
// classes. Please, no end users use this until it's finalized.
//
//==========================================================================
void ParseClass()
{
Baggage bag;
const PClass *cls;
FName classname;
FName supername;
SC_MustGetToken(TK_Identifier); // class name
classname = sc_Name;
SC_MustGetToken(TK_Extends); // because I'm not supporting Object
SC_MustGetToken(TK_Identifier); // superclass name
supername = sc_Name;
SC_MustGetToken(TK_Native); // use actor definitions for your own stuff
SC_MustGetToken('{');
cls = PClass::FindClass (classname);
if (cls == NULL)
{
SC_ScriptError ("'%s' is not a native class", classname.GetChars());
}
if (cls->ParentClass == NULL || cls->ParentClass->TypeName != supername)
{
SC_ScriptError ("'%s' does not extend '%s'", classname.GetChars(), supername.GetChars());
}
bag.Info = cls->ActorInfo;
SC_MustGetAnyToken();
while (sc_TokenType != '}')
{
if (sc_TokenType == TK_Action)
{
ActorActionDef (0, bag);
}
else if (sc_TokenType == TK_Const)
{
ActorConstDef (0, bag);
}
else
{
SC_ScriptError ("Expected 'action' or 'const' but got %s", SC_TokenName(sc_TokenType, sc_String));
}
SC_MustGetAnyToken();
}
}

1
wadsrc/decorate/decorate.txt
View File

@ -1,3 +1,4 @@
#include "actors/nativeclasses.txt"
#include "actors/constants.txt"
#include "actors/shared/botstuff.txt"

205
wadsrc/decorate/nativeclasses.txt Normal file
View File

@ -0,0 +1,205 @@
class Actor extends Thinker
native
{
action native A_MonsterRail();
action native A_BFGSpray(optional class<Actor> spraytype, optional eval int numrays, optional eval int damagecount);
action native A_Pain();
action native A_NoBlocking();
action native A_XScream();
action native A_Look();
action native A_Chase();
action native A_FaceTarget();
action native A_PosAttack();
action native A_Scream();
action native A_SPosAttack();
action native A_SPosAttackUseAtkSound();
action native A_VileChase();
action native A_VileStart();
action native A_VileTarget();
action native A_VileAttack();
action native A_StartFire();
action native A_Fire();
action native A_FireCrackle();
action native A_Tracer();
action native A_SkelWhoosh();
action native A_SkelFist();
action native A_SkelMissile();
action native A_FatRaise();
action native A_FatAttack1(optional class<Actor> spawntype);
action native A_FatAttack2(optional class<Actor> spawntype);
action native A_FatAttack3(optional class<Actor> spawntype);
action native A_BossDeath();
action native A_CPosAttack();
action native A_CPosRefire();
action native A_TroopAttack();
action native A_SargAttack();
action native A_HeadAttack();
action native A_BruisAttack();
action native A_SkullAttack();
action native A_Metal();
action native A_SpidRefire();
action native A_BabyMetal();
action native A_BspiAttack();
action native A_Hoof();
action native A_CyberAttack();
action native A_PainAttack(optional class<Actor> spawntype);
action native A_DualPainAttack(optional class<Actor> spawntype);
action native A_PainDie(optional class<Actor> spawntype);
action native A_KeenDie();
action native A_BrainPain();
action native A_BrainScream();
action native A_BrainDie();
action native A_BrainAwake();
action native A_BrainSpit();
action native A_SpawnSound();
action native A_SpawnFly();
action native A_BrainExplode();
action native A_Die();
action native A_Detonate();
action native A_Mushroom(optional class<Actor> spawntype, optional eval int numspawns);
action native A_SetFloorClip();
action native A_UnSetFloorClip();
action native A_HideThing();
action native A_UnHideThing();
action native A_SetInvulnerable();
action native A_UnSetInvulnerable();
action native A_SetReflective();
action native A_UnSetReflective();
action native A_SetReflectiveInvulnerable();
action native A_UnSetReflectiveInvulnerable();
action native A_SetShootable();
action native A_UnSetShootable();
action native A_NoGravity();
action native A_Gravity();
action native A_LowGravity();
action native A_Fall();
action native A_SetSolid();
action native A_UnsetSolid();
action native A_SetFloat();
action native A_UnsetFloat();
action native A_M_Saw();
action native A_ScreamAndUnblock();
action native A_ActiveAndUnblock();
action native A_ActiveSound();
action native A_FastChase();
action native A_FreezeDeath();
action native A_FreezeDeathChunks();
action native A_GenericFreezeDeath();
action native A_IceGuyDie();
action native A_CentaurDefend();
action native A_BishopMissileWeave();
action native A_CStaffMissileSlither();
action native A_PlayerScream();
action native A_SkullPop(optional class<Actor> skulltype);
action native A_CheckPlayerDone();
action native A_Wander();
action native A_Look2();
action native A_TossGib();
action native A_SentinelBob();
action native A_SentinelRefire();
action native A_Tracer2();
action native A_SetShadow();
action native A_ClearShadow();
action native A_GetHurt();
action native A_TurretLook();
action native A_KlaxonBlare();
action native A_Countdown();
action native A_AlertMonsters();
action native A_ClearSoundTarget();
action native A_FireAssaultGun();
action native A_CheckTerrain();
action native A_BulletAttack();
action native A_PlaySound(sound whattoplay);
action native A_PlayWeaponSound(sound whattoplay);
action native A_FLoopActiveSound();
action native A_LoopActiveSound();
action native A_StopSound();
action native A_PlaySoundEx(sound whattoplay, coerce name slot, optional bool looping);
action native A_StopSoundEx(coerce name slot);
action native A_SeekerMissile(eval int threshold, eval int turnmax);
action native A_Jump(eval int chance, state label, ...);
action native A_CustomMissile(class<Actor> missiletype, eval float spawnheight, eval int spawnofs_xy, optional eval float angle, optional eval int flags, optional eval float pitch);
action native A_CustomBulletAttack(eval float spread_xy, eval float spread_z, eval int numbullets, eval int damageperbullet, optional class<Actor> pufftype, optional eval float range);
action native A_CustomRailgun(eval int damage, optional eval int spawnofs_xy, optional color color1, optional color color2, optional eval bool silent, optional eval bool aim, optional eval float maxdiff, optional class<Actor> pufftype);
action native A_JumpIfHealthLower(eval int health, state label);
action native A_JumpIfCloser(eval float distance, state label);
action native A_JumpIfInventory(class<Inventory> itemtype, eval int itemamount, state label);
action native A_GiveInventory(class<Inventory> itemtype, optional eval int amount);
action native A_TakeInventory(class<Inventory> itemtype, optional eval int amount);
action native A_SpawnItem(class<Actor> itemtype, optional eval float distance, optional eval float zheight, optional evalnot bool useammo, optional eval bool transfer_translation);
action native A_SpawnItemEx(class<Actor> itemtype, optional eval float xofs, optional eval float yofs, optional eval float zofs, optional eval float xmom, optional eval float ymom, optional eval float zmom, optional eval float angle, optional eval int flags, optional eval int chance);
action native A_Print(string whattoprint, optional eval float time, optional string fontname);
action native A_SetTranslucent(eval float alpha, optional eval int style);
action native A_FadeIn(optional eval float reduce);
action native A_FadeOut(optional eval float reduce);
action native A_SpawnDebris(class<Actor> spawntype, optional eval bool transfer_translation);
action native A_CheckSight(state label);
action native A_ExtChase(eval bool usemelee, eval bool usemissile, optional evalnot bool playactive, optional eval bool nightmarefast);
action native A_DropInventory(class<Inventory> itemtype);
action native A_SetBlend(color color1, eval float alpha, eval int tics, optional color color2);
action native A_ChangeFlag(string flagname, eval bool value);
action native A_JumpIf(eval bool expression, state label);
action native A_KillMaster();
action native A_KillChildren();
action native A_CheckFloor(state label);
action native A_PlayerSkinCheck(state label);
action native A_BasicAttack(int meleedamage, sound meleesound, class<actor> missiletype, float missileheight);
action native A_Recoil(eval float xymom);
action native A_JumpIfInTargetInventory(class<Inventory> itemtype, eval int amount, state label);
action native A_GiveToTarget(class<Inventory> itemtype, optional eval int amount);
action native A_TakeFromTarget(class<Inventory> itemtype, optional eval int amount);
action native A_CountdownArg(eval int argnum);
action native A_CustomMeleeAttack(eval int damage, optional sound meleesound, optional sound misssound, optional name damagetype, optional evalnot bool bleed);
action native A_CustomComboAttack(class<Actor> missiletype, eval float spawnheight, eval int damage, optional sound meleesound, optional name damagetype, optional evalnot bool bleed);
action native A_Burst(class<Actor> chunktype);
action native A_RadiusThrust(optional eval int force, optional eval int distance, optional evalnot bool affectsource);
action native A_Explode(optional eval int damage, optional eval int distance, optional evalnot bool hurtsource);
action native A_Stop();
action native A_Respawn(optional evalnot bool fog);
action native A_BarrelDestroy();
action native A_QueueCorpse();
action native A_SelectWeapon(class<Weapon> whichweapon);
}
class Inventory extends Actor
native
{
action native A_JumpIfNoAmmo(state label);
action native A_CustomPunch(eval int damage, optional eval bool norandom, optional evalnot bool useammo, optional class<Actor> pufftype, optional eval float range);
action native A_FireBullets(eval float spread_xy, eval float spread_z, eval int numbullets, eval int damageperbullet, optional class<Actor> pufftype, optional evalnot bool useammo, optional eval float range);
action native A_FireCustomMissile(class<Actor> missiletype, optional eval float angle, optional evalnot bool useammo, optional eval int spawnofs_xy, optional eval float spawnheight, optional eval bool aimatangle);
action native A_RailAttack(eval int damage, optional eval int spawnofs_xy, optional evalnot int useammo, optional color color1, optional color color2, optional eval bool silent, optional eval float maxdiff, optional class<Actor> pufftype);
action native A_Light(eval int extralight);
action native A_Light0();
action native A_Light1();
action native A_Light2();
action native A_LightInverse();
action native A_WeaponReady();
action native A_Lower();
action native A_Raise();
action native A_Punch();
action native A_FirePistol();
action native A_FireShotgun();
action native A_FireShotgun2();
action native A_OpenShotgun2();
action native A_LoadShotgun2();
action native A_CloseShotgun2();
action native A_FireCGun();
action native A_FireMissile();
action native A_FirePlasma();
action native A_BFGsound();
action native A_FireBFG();
action native A_ReFire();
action native A_CheckReload();
action native A_GunFlash();
action native A_Saw(optional coerce sound fullsound, optional coerce sound hitsound, optional eval int damage, optional class<Actor> pufftype);
action native A_ThrowGrenade(class<Actor> itemtype, optional eval float zheight, optional eval float xymom, optional eval float zmom, optional evalnot bool useammo);
}

22
wadsrc/wadsrc.vcproj
View File

@ -360,10 +360,18 @@
<Filter
Name="Decorate"
>
<File
RelativePath=".\decorate\constants.txt"
>
</File>
<File
RelativePath=".\decorate\decorate.txt"
>
</File>
<File
RelativePath=".\decorate\nativeclasses.txt"
>
</File>
<Filter
Name="Doom"
>
@ -528,7 +536,19 @@
Name="Shared"
>
<File
RelativePath=".\shared\debris.txt"
RelativePath=".\decorate\shared\blood.txt"
>
</File>
<File
RelativePath=".\decorate\shared\botstuff.txt"
>
</File>
<File
RelativePath=".\decorate\shared\debris.txt"
>
</File>
<File
RelativePath=".\decorate\shared\pickups.txt"
>
</File>
<File

1
wadsrc/zdoom.lst
View File

@ -240,6 +240,7 @@ textcolors.txt textcolors.txt
# Decorate stuff
decorate.txt decorate/decorate.txt
actors/nativeclasses.txt decorate/nativeclasses.txt
actors/constants.txt decorate/constants.txt
actors/shared/botstuff.txt decorate/shared/botstuff.txt

1246
zdoom.vcproj
View File

File diff suppressed because it is too large Load Diff