2006-04-15 15:00:29 +00:00
|
|
|
#ifndef __THINGDEF_H
|
|
|
|
#define __THINGDEF_H
|
|
|
|
|
2008-09-15 14:11:05 +00:00
|
|
|
#include "doomtype.h"
|
2008-10-19 21:43:36 +00:00
|
|
|
#include "info.h"
|
2008-10-25 17:38:00 +00:00
|
|
|
#include "s_sound.h"
|
|
|
|
#include "sc_man.h"
|
2009-09-14 19:44:14 +00:00
|
|
|
#include "cmdlib.h"
|
2008-10-19 21:43:36 +00:00
|
|
|
|
2008-09-15 14:11:05 +00:00
|
|
|
|
- Updated lempar.c to v1.31.
- Added .txt files to the list of types (wad, zip, and pk3) that can be
loaded without listing them after -file.
- Fonts that are created by the ACS setfont command to wrap a texture now
support animated textures.
- FON2 fonts can now use their full palette for CR_UNTRANSLATED when drawn
with the hardware 2D path instead of being restricted to the game palette.
- Fixed: Toggling vid_vsync would reset the displayed fullscreen gamma to 1
on a Radeon 9000.
- Added back the off-by-one palette handling, but in a much more limited
scope than before. The skipped entry is assumed to always be at 248, and
it is assumed that all Shader Model 1.4 cards suffer from this. That's
because all SM1.4 cards are based on variants of the ATI R200 core, and the
RV250 in a Radeon 9000 craps up like this. I see no reason to assume that
other flavors of the R200 are any different. (Interesting note: With the
Radeon 9000, D3DTADDRESS_CLAMP is an invalid address mode when using the
debug Direct3D 9 runtime, but it works perfectly fine with the retail
Direct3D 9 runtime.) (Insight: The R200 probably uses bytes for all its
math inside pixel shaders. That would explain perfectly why I can't use
constants greater than 1 with PS1.4 and why it can't do an exact mapping to
every entry in the color palette.
- Fixed: The software shaded drawer did not work for 2D, because its selected
"color"map was replaced with the identitymap before being used.
- Fixed: I cannot use Printf to output messages before the framebuffer was
completely setup, meaning that Shader Model 1.4 cards could not change
resolution.
- I have decided to let remap palettes specify variable alpha values for
their colors. D3DFB no longer forces them to 255.
- Updated re2c to version 0.12.3.
- Fixed: A_Wander used threshold as a timer, when it should have used
reactiontime.
- Fixed: A_CustomRailgun would not fire at all for actors without a target
when the aim parameter was disabled.
- Made the warp command work in multiplayer, again courtesy of Karate Chris.
- Fixed: Trying to spawn a bot while not in a game made for a crashing time.
(Patch courtesy of Karate Chris.)
- Removed some floating point math from hu_scores.cpp that somebody's GCC
gave warnings for (not mine, though).
- Fixed: The SBarInfo drawbar command crashed if the sprite image was
unavailable.
- Fixed: FString::operator=(const char *) did not release its old buffer when
being assigned to the null string.
- The scanner no longer has an upper limit on the length of strings it
accepts, though short strings will be faster than long ones.
- Moved all the text scanning functions into a class. Mainly, this means that
multiple script scanner states can be stored without being forced to do so
recursively. I think I might be taking advantage of that in the near
future. Possibly. Maybe.
- Removed some potential buffer overflows from the decal parser.
- Applied Blzut3's SBARINFO update #9:
* Fixed: When using even length values in drawnumber it would cap to a 98
value instead of a 99 as intended.
* The SBarInfo parser can now accept negatives for coordinates. This
doesn't allow much right now, but later I plan to add better fullscreen
hud support in which the negatives will be more useful. This also cleans
up the source a bit since all calls for (x, y) coordinates are with the
function getCoordinates().
- Added support for stencilling actors.
- Added support for non-black colors specified with DTA_ColorOverlay to the
software renderer.
- Fixed: The inverse, gold, red, and green fixed colormaps each allocated
space for 32 different colormaps, even though each only used the first one.
- Added two new blending flags to make reverse subtract blending more useful:
STYLEF_InvertSource and STYLEF_InvertOverlay. These invert the color that
gets blended with the background, since that seems like a good idea for
reverse subtraction. They also work with the other two blending operations.
- Added subtract and reverse subtract blending operations to the renderer.
Since the ERenderStyle enumeration was getting rather unwieldy, I converted
it into a new FRenderStyle structure that lets each parameter of the
blending equation be set separately. This simplified the set up for the
blend quite a bit, and it means a number of new combinations are available
by setting the parameters properly.
SVN r710 (trunk)
2008-01-25 23:57:44 +00:00
|
|
|
class FScanner;
|
|
|
|
|
2008-09-21 18:02:38 +00:00
|
|
|
|
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// A flag descriptor
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
|
|
|
struct FFlagDef
|
|
|
|
{
|
2013-01-21 22:30:30 +00:00
|
|
|
unsigned int flagbit;
|
2008-09-21 18:02:38 +00:00
|
|
|
const char *name;
|
|
|
|
int structoffset;
|
2013-05-05 00:01:51 +00:00
|
|
|
int fieldsize;
|
2008-09-21 18:02:38 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
FFlagDef *FindFlag (const PClass *type, const char *part1, const char *part2);
|
2010-03-24 02:49:37 +00:00
|
|
|
void HandleDeprecatedFlags(AActor *defaults, PClassActor *info, bool set, int index);
|
2013-06-07 03:31:30 +00:00
|
|
|
bool CheckDeprecatedFlags(const AActor *actor, PClassActor *info, int index);
|
2013-01-21 22:30:30 +00:00
|
|
|
const char *GetFlagName(unsigned int flagnum, int flagoffset);
|
2013-05-05 00:01:51 +00:00
|
|
|
void ModActorFlag(AActor *actor, FFlagDef *fd, bool set);
|
|
|
|
INTBOOL CheckActorFlag(const AActor *actor, FFlagDef *fd);
|
2013-08-12 20:38:52 +00:00
|
|
|
INTBOOL CheckActorFlag(const AActor *owner, const char *flagname, bool printerror = true);
|
2009-09-14 19:44:14 +00:00
|
|
|
|
|
|
|
#define FLAG_NAME(flagnum, flagvar) GetFlagName(flagnum, myoffsetof(AActor, flagvar))
|
2008-09-21 18:02:38 +00:00
|
|
|
|
|
|
|
|
2008-09-22 18:55:29 +00:00
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// State parser
|
|
|
|
//
|
|
|
|
//==========================================================================
|
2008-10-25 17:38:00 +00:00
|
|
|
class FxExpression;
|
2008-09-22 18:55:29 +00:00
|
|
|
|
|
|
|
struct FStateLabels;
|
|
|
|
|
|
|
|
enum EStateDefineFlags
|
|
|
|
{
|
|
|
|
SDF_NEXT = 0,
|
|
|
|
SDF_STATE = 1,
|
|
|
|
SDF_STOP = 2,
|
|
|
|
SDF_WAIT = 3,
|
|
|
|
SDF_LABEL = 4,
|
|
|
|
SDF_INDEX = 5,
|
2009-09-14 20:47:53 +00:00
|
|
|
SDF_MASK = 7,
|
|
|
|
SDF_DEHACKED = 8, // Identify a state as having been modified by a dehacked lump
|
2008-09-22 18:55:29 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
struct FStateDefine
|
|
|
|
{
|
|
|
|
FName Label;
|
|
|
|
TArray<FStateDefine> Children;
|
|
|
|
FState *State;
|
|
|
|
BYTE DefineFlags;
|
|
|
|
};
|
|
|
|
|
|
|
|
class FStateDefinitions
|
|
|
|
{
|
|
|
|
TArray<FStateDefine> StateLabels;
|
2008-12-07 12:11:59 +00:00
|
|
|
FState *laststate;
|
2012-05-17 11:16:20 +00:00
|
|
|
FState *laststatebeforelabel;
|
2008-12-07 12:11:59 +00:00
|
|
|
intptr_t lastlabel;
|
|
|
|
TArray<FState> StateArray;
|
2008-09-22 18:55:29 +00:00
|
|
|
|
|
|
|
static FStateDefine *FindStateLabelInList(TArray<FStateDefine> &list, FName name, bool create);
|
|
|
|
static FStateLabels *CreateStateLabelList(TArray<FStateDefine> &statelist);
|
|
|
|
static void MakeStateList(const FStateLabels *list, TArray<FStateDefine> &dest);
|
2010-03-24 02:49:37 +00:00
|
|
|
static void RetargetStatePointers(intptr_t count, const char *target, TArray<FStateDefine> & statelist);
|
2008-09-22 18:55:29 +00:00
|
|
|
FStateDefine *FindStateAddress(const char *name);
|
|
|
|
FState *FindState(const char *name);
|
|
|
|
|
2010-03-24 02:49:37 +00:00
|
|
|
FState *ResolveGotoLabel(AActor *actor, PClassActor *mytype, char *name);
|
|
|
|
static void FixStatePointers(PClassActor *actor, TArray<FStateDefine> & list);
|
|
|
|
void ResolveGotoLabels(PClassActor *actor, AActor *defaults, TArray<FStateDefine> & list);
|
2008-09-22 18:55:29 +00:00
|
|
|
|
|
|
|
public:
|
|
|
|
|
2008-12-07 12:11:59 +00:00
|
|
|
FStateDefinitions()
|
2008-09-22 18:55:29 +00:00
|
|
|
{
|
2008-12-07 12:11:59 +00:00
|
|
|
laststate = NULL;
|
2012-05-17 11:16:20 +00:00
|
|
|
laststatebeforelabel = NULL;
|
2008-12-07 12:11:59 +00:00
|
|
|
lastlabel = -1;
|
2008-09-22 18:55:29 +00:00
|
|
|
}
|
|
|
|
|
2010-03-24 02:49:37 +00:00
|
|
|
void SetStateLabel(const char *statename, FState *state, BYTE defflags = SDF_STATE);
|
|
|
|
void AddStateLabel(const char *statename);
|
2013-04-30 04:20:09 +00:00
|
|
|
int GetStateLabelIndex (FName statename);
|
2010-03-24 02:49:37 +00:00
|
|
|
void InstallStates(PClassActor *info, AActor *defaults);
|
|
|
|
int FinishStates(PClassActor *actor, AActor *defaults);
|
2008-09-22 18:55:29 +00:00
|
|
|
|
2010-03-24 02:49:37 +00:00
|
|
|
void MakeStateDefines(const PClassActor *cls);
|
2008-09-22 18:55:29 +00:00
|
|
|
void AddStateDefines(const FStateLabels *list);
|
|
|
|
void RetargetStates (intptr_t count, const char *target);
|
|
|
|
|
2008-12-07 12:11:59 +00:00
|
|
|
bool SetGotoLabel(const char *string);
|
|
|
|
bool SetStop();
|
|
|
|
bool SetWait();
|
|
|
|
bool SetLoop();
|
2009-10-15 03:58:23 +00:00
|
|
|
int AddStates(FState *state, const char *framechars);
|
2008-12-07 12:11:59 +00:00
|
|
|
int GetStateCount() const { return StateArray.Size(); }
|
2008-09-22 18:55:29 +00:00
|
|
|
};
|
|
|
|
|
2008-10-25 17:38:00 +00:00
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
//
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
2009-10-15 03:58:23 +00:00
|
|
|
struct FStateTempCall
|
|
|
|
{
|
2015-01-08 04:32:58 +00:00
|
|
|
FStateTempCall() : ActorClass(NULL), Code(NULL), FirstState(0), NumStates(0) {}
|
2010-02-14 19:59:21 +00:00
|
|
|
|
2010-03-24 02:49:37 +00:00
|
|
|
PClassActor *ActorClass;
|
2016-02-19 02:39:40 +00:00
|
|
|
class FxExpression *Code;
|
|
|
|
class PPrototype *Proto;
|
2009-10-15 03:58:23 +00:00
|
|
|
int FirstState;
|
|
|
|
int NumStates;
|
|
|
|
};
|
|
|
|
extern TDeletingArray<FStateTempCall *> StateTempCalls;
|
2013-07-26 02:42:30 +00:00
|
|
|
extern TDeletingArray<class FxExpression *> ActorDamageFuncs;
|
2008-10-25 17:38:00 +00:00
|
|
|
|
2007-05-28 22:18:51 +00:00
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// Extra info maintained while defining an actor.
|
|
|
|
//
|
|
|
|
//==========================================================================
|
2010-03-25 20:38:00 +00:00
|
|
|
class DDropItem;
|
2007-05-28 22:18:51 +00:00
|
|
|
|
|
|
|
struct Baggage
|
|
|
|
{
|
2008-10-05 08:50:47 +00:00
|
|
|
#ifdef _DEBUG
|
|
|
|
FString ClassName; // This is here so that during debugging the class name can be seen
|
|
|
|
#endif
|
2010-03-24 02:49:37 +00:00
|
|
|
PClassActor *Info;
|
2007-05-28 22:18:51 +00:00
|
|
|
bool DropItemSet;
|
|
|
|
bool StateSet;
|
|
|
|
int CurrentState;
|
2008-09-21 18:02:38 +00:00
|
|
|
int Lumpnum;
|
2008-09-22 18:55:29 +00:00
|
|
|
FStateDefinitions statedef;
|
2007-05-28 22:18:51 +00:00
|
|
|
|
2010-03-25 20:38:00 +00:00
|
|
|
DDropItem *DropItemList;
|
2008-12-07 12:11:59 +00:00
|
|
|
|
|
|
|
FScriptPosition ScriptPosition;
|
2007-05-28 22:18:51 +00:00
|
|
|
};
|
|
|
|
|
2010-03-24 02:49:37 +00:00
|
|
|
inline void ResetBaggage (Baggage *bag, PClassActor *stateclass)
|
2007-05-28 22:18:51 +00:00
|
|
|
{
|
|
|
|
bag->DropItemList = NULL;
|
|
|
|
bag->DropItemSet = false;
|
|
|
|
bag->CurrentState = 0;
|
|
|
|
bag->StateSet = false;
|
2008-09-22 18:55:29 +00:00
|
|
|
bag->statedef.MakeStateDefines(stateclass);
|
2007-05-28 22:18:51 +00:00
|
|
|
}
|
|
|
|
|
2012-10-28 04:36:52 +00:00
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// Damage function creation
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
|
|
|
VMScriptFunction *CreateDamageFunction(int dmg);
|
|
|
|
|
2007-05-28 22:18:51 +00:00
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// Action function lookup
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
|
|
|
struct AFuncDesc
|
|
|
|
{
|
|
|
|
const char *Name;
|
|
|
|
actionf_p Function;
|
2010-02-12 06:04:57 +00:00
|
|
|
VMNativeFunction **VMPointer;
|
2007-05-28 22:18:51 +00:00
|
|
|
};
|
|
|
|
|
2009-08-02 03:38:57 +00:00
|
|
|
AFuncDesc *FindFunction(const char * string);
|
2007-05-28 22:18:51 +00:00
|
|
|
|
2008-08-12 14:30:07 +00:00
|
|
|
|
2010-03-24 02:49:37 +00:00
|
|
|
void ParseStates(FScanner &sc, PClassActor *actor, AActor *defaults, Baggage &bag);
|
2014-12-31 05:31:07 +00:00
|
|
|
void ParseFunctionParameters(FScanner &sc, PClassActor *cls, TArray<FxExpression *> &out_params,
|
|
|
|
PFunction *afd, FString statestring, FStateDefinitions *statedef);
|
2016-02-19 02:39:40 +00:00
|
|
|
FxExpression *ParseActions(FScanner &sc, FState state, FString statestring, Baggage &bag, PPrototype *&proto, bool &endswithret);
|
2015-01-08 04:32:58 +00:00
|
|
|
class FxVMFunctionCall *ParseAction(FScanner &sc, FState state, FString statestring, Baggage &bag);
|
2016-02-21 04:05:17 +00:00
|
|
|
FName CheckCastKludges(FName in);
|
2016-02-19 02:39:40 +00:00
|
|
|
void AddImplicitReturn(class FxSequence *code, const PPrototype *proto, FScanner &sc);
|
|
|
|
void SetImplicitArgs(TArray<PType *> *args, TArray<DWORD> *argflags, PClassActor *cls, DWORD funcflags);
|
2006-07-13 10:17:56 +00:00
|
|
|
|
2013-08-15 03:00:16 +00:00
|
|
|
PFunction *FindGlobalActionFunction(const char *name);
|
2006-07-13 10:17:56 +00:00
|
|
|
|
2007-05-28 22:18:51 +00:00
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// Property parser
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
2010-03-24 02:49:37 +00:00
|
|
|
PClassActor *CreateNewActor(const FScriptPosition &sc, FName typeName, FName parentName, bool native);
|
2012-10-17 04:24:54 +00:00
|
|
|
void SetReplacement(FScanner &sc, PClassActor *info, FName replaceName);
|
2007-05-28 22:18:51 +00:00
|
|
|
|
2008-10-25 17:38:00 +00:00
|
|
|
void HandleActorFlag(FScanner &sc, Baggage &bag, const char *part1, const char *part2, int mod);
|
2010-03-24 02:49:37 +00:00
|
|
|
void FinishActor(const FScriptPosition &sc, PClassActor *info, Baggage &bag);
|
2013-08-15 03:00:16 +00:00
|
|
|
FxExpression *ParseParameter(FScanner &sc, PClassActor *cls, PType *type, bool constant);
|
2007-05-28 22:18:51 +00:00
|
|
|
|
2006-07-13 10:17:56 +00:00
|
|
|
|
2008-10-19 21:43:36 +00:00
|
|
|
enum
|
|
|
|
{
|
|
|
|
DEPF_UNUSED,
|
|
|
|
DEPF_FIREDAMAGE,
|
|
|
|
DEPF_ICEDAMAGE,
|
|
|
|
DEPF_LOWGRAVITY,
|
|
|
|
DEPF_LONGMELEERANGE,
|
|
|
|
DEPF_SHORTMISSILERANGE,
|
|
|
|
DEPF_PICKUPFLASH,
|
|
|
|
DEPF_QUARTERGRAVITY,
|
|
|
|
DEPF_FIRERESIST,
|
2009-05-23 08:30:36 +00:00
|
|
|
DEPF_HERETICBOUNCE,
|
|
|
|
DEPF_HEXENBOUNCE,
|
|
|
|
DEPF_DOOMBOUNCE,
|
2009-08-02 15:54:34 +00:00
|
|
|
DEPF_INTERHUBSTRIP,
|
2008-10-19 21:43:36 +00:00
|
|
|
};
|
2006-07-13 10:17:56 +00:00
|
|
|
|
2007-05-28 14:46:49 +00:00
|
|
|
// Types of old style decorations
|
|
|
|
enum EDefinitionType
|
|
|
|
{
|
|
|
|
DEF_Decoration,
|
|
|
|
DEF_BreakableDecoration,
|
|
|
|
DEF_Pickup,
|
|
|
|
DEF_Projectile,
|
|
|
|
};
|
|
|
|
|
2008-08-10 20:48:55 +00:00
|
|
|
#if defined(_MSC_VER)
|
2009-09-17 01:36:14 +00:00
|
|
|
#pragma section(".areg$u",read)
|
|
|
|
#pragma section(".greg$u",read)
|
|
|
|
#pragma section(".mreg$u",read)
|
2008-08-10 20:48:55 +00:00
|
|
|
|
|
|
|
#define MSVC_ASEG __declspec(allocate(".areg$u"))
|
|
|
|
#define GCC_ASEG
|
2008-09-21 18:02:38 +00:00
|
|
|
#define MSVC_PSEG __declspec(allocate(".greg$u"))
|
|
|
|
#define GCC_PSEG
|
2008-10-19 21:43:36 +00:00
|
|
|
#define MSVC_MSEG __declspec(allocate(".mreg$u"))
|
|
|
|
#define GCC_MSEG
|
2008-08-10 20:48:55 +00:00
|
|
|
#else
|
|
|
|
#define MSVC_ASEG
|
2014-08-03 09:20:30 +00:00
|
|
|
#define GCC_ASEG __attribute__((section(SECTION_AREG))) __attribute__((used))
|
2008-09-21 18:02:38 +00:00
|
|
|
#define MSVC_PSEG
|
2014-08-03 09:20:30 +00:00
|
|
|
#define GCC_PSEG __attribute__((section(SECTION_GREG))) __attribute__((used))
|
2008-10-19 21:43:36 +00:00
|
|
|
#define MSVC_MSEG
|
2014-08-03 09:20:30 +00:00
|
|
|
#define GCC_MSEG __attribute__((section(SECTION_MREG))) __attribute__((used))
|
2008-08-10 20:48:55 +00:00
|
|
|
#endif
|
|
|
|
|
2008-08-10 22:48:37 +00:00
|
|
|
|
2008-09-21 18:02:38 +00:00
|
|
|
union FPropParam
|
|
|
|
{
|
|
|
|
int i;
|
2016-02-12 00:21:29 +00:00
|
|
|
double d;
|
2008-09-21 18:02:38 +00:00
|
|
|
const char *s;
|
2012-10-28 04:36:52 +00:00
|
|
|
FxExpression *exp;
|
2008-09-21 18:02:38 +00:00
|
|
|
};
|
|
|
|
|
2010-03-24 02:49:37 +00:00
|
|
|
typedef void (*PropHandler)(AActor *defaults, PClassActor *info, Baggage &bag, FPropParam *params);
|
2008-09-21 18:02:38 +00:00
|
|
|
|
|
|
|
enum ECategory
|
|
|
|
{
|
|
|
|
CAT_PROPERTY, // Inheritable property
|
|
|
|
CAT_INFO // non-inheritable info (spawn ID, Doomednum, game filter, conversation ID)
|
|
|
|
};
|
|
|
|
|
|
|
|
struct FPropertyInfo
|
|
|
|
{
|
|
|
|
const char *name;
|
|
|
|
const char *params;
|
2009-09-17 01:36:14 +00:00
|
|
|
const PClass * const *cls;
|
2008-09-21 18:02:38 +00:00
|
|
|
PropHandler Handler;
|
|
|
|
int category;
|
|
|
|
};
|
|
|
|
|
|
|
|
FPropertyInfo *FindProperty(const char * string);
|
|
|
|
int MatchString (const char *in, const char **strings);
|
|
|
|
|
|
|
|
|
|
|
|
#define DEFINE_PROPERTY_BASE(name, paramlist, clas, cat) \
|
2010-03-24 02:49:37 +00:00
|
|
|
static void Handler_##name##_##paramlist##_##clas(A##clas *defaults, PClassActor *info, Baggage &bag, FPropParam *params); \
|
2008-09-23 07:46:23 +00:00
|
|
|
static FPropertyInfo Prop_##name##_##paramlist##_##clas = \
|
2010-03-24 02:49:37 +00:00
|
|
|
{ #name, #paramlist, &RUNTIME_CLASS_CASTLESS(A##clas), (PropHandler)Handler_##name##_##paramlist##_##clas, cat }; \
|
2008-09-23 07:46:23 +00:00
|
|
|
MSVC_PSEG FPropertyInfo *infoptr_##name##_##paramlist##_##clas GCC_PSEG = &Prop_##name##_##paramlist##_##clas; \
|
2010-03-24 02:49:37 +00:00
|
|
|
static void Handler_##name##_##paramlist##_##clas(A##clas *defaults, PClassActor *info, Baggage &bag, FPropParam *params)
|
2008-09-21 18:02:38 +00:00
|
|
|
|
|
|
|
#define DEFINE_PREFIXED_PROPERTY_BASE(prefix, name, paramlist, clas, cat) \
|
2010-03-24 02:49:37 +00:00
|
|
|
static void Handler_##name##_##paramlist##_##clas(A##clas *defaults, PClassActor *info, Baggage &bag, FPropParam *params); \
|
2008-09-23 07:46:23 +00:00
|
|
|
static FPropertyInfo Prop_##name##_##paramlist##_##clas = \
|
2010-03-24 02:49:37 +00:00
|
|
|
{ #prefix"."#name, #paramlist, &RUNTIME_CLASS_CASTLESS(A##clas), (PropHandler)Handler_##name##_##paramlist##_##clas, cat }; \
|
2008-09-23 07:46:23 +00:00
|
|
|
MSVC_PSEG FPropertyInfo *infoptr_##name##_##paramlist##_##clas GCC_PSEG = &Prop_##name##_##paramlist##_##clas; \
|
2010-03-24 02:49:37 +00:00
|
|
|
static void Handler_##name##_##paramlist##_##clas(A##clas *defaults, PClassActor *info, Baggage &bag, FPropParam *params)
|
2008-09-21 18:02:38 +00:00
|
|
|
|
|
|
|
|
|
|
|
#define DEFINE_PROPERTY(name, paramlist, clas) DEFINE_PROPERTY_BASE(name, paramlist, clas, CAT_PROPERTY)
|
|
|
|
#define DEFINE_INFO_PROPERTY(name, paramlist, clas) DEFINE_PROPERTY_BASE(name, paramlist, clas, CAT_INFO)
|
|
|
|
|
|
|
|
#define DEFINE_CLASS_PROPERTY(name, paramlist, clas) DEFINE_PREFIXED_PROPERTY_BASE(clas, name, paramlist, clas, CAT_PROPERTY)
|
|
|
|
#define DEFINE_CLASS_PROPERTY_PREFIX(prefix, name, paramlist, clas) DEFINE_PREFIXED_PROPERTY_BASE(prefix, name, paramlist, clas, CAT_PROPERTY)
|
|
|
|
|
|
|
|
#define PROP_PARM_COUNT (params[0].i)
|
|
|
|
|
|
|
|
#define PROP_STRING_PARM(var, no) \
|
|
|
|
const char *var = params[(no)+1].s;
|
|
|
|
|
2012-10-28 04:36:52 +00:00
|
|
|
#define PROP_EXP_PARM(var, no) \
|
|
|
|
FxExpression *var = params[(no)+1].exp;
|
|
|
|
|
2008-09-21 18:02:38 +00:00
|
|
|
#define PROP_INT_PARM(var, no) \
|
|
|
|
int var = params[(no)+1].i;
|
|
|
|
|
|
|
|
#define PROP_FLOAT_PARM(var, no) \
|
2016-02-12 00:21:29 +00:00
|
|
|
float var = float(params[(no)+1].d);
|
|
|
|
|
|
|
|
#define PROP_DOUBLE_PARM(var, no) \
|
|
|
|
double var = params[(no)+1].d;
|
2008-09-21 18:02:38 +00:00
|
|
|
|
|
|
|
#define PROP_FIXED_PARM(var, no) \
|
2016-02-12 00:21:29 +00:00
|
|
|
fixed_t var = FLOAT2FIXED(params[(no)+1].d);
|
2008-09-21 18:02:38 +00:00
|
|
|
|
|
|
|
#define PROP_COLOR_PARM(var, no) \
|
|
|
|
int var = params[(no)+1].i== 0? params[(no)+2].i : V_GetColor(NULL, params[(no)+2].s);
|
|
|
|
|
2008-10-19 21:43:36 +00:00
|
|
|
|
2008-08-10 22:48:37 +00:00
|
|
|
// Macros to handle action functions. These are here so that I don't have to
|
|
|
|
// change every single use in case the parameters change.
|
2010-02-12 06:04:57 +00:00
|
|
|
#define DECLARE_ACTION(name) extern VMNativeFunction *name##_VMPtr;
|
2008-08-10 20:48:55 +00:00
|
|
|
|
2008-08-12 14:30:07 +00:00
|
|
|
// This distinction is here so that CALL_ACTION produces errors when trying to
|
|
|
|
// access a function that requires parameters.
|
2008-08-10 20:48:55 +00:00
|
|
|
#define DEFINE_ACTION_FUNCTION(cls, name) \
|
2010-02-12 06:04:57 +00:00
|
|
|
static int AF_##name(VM_ARGS); \
|
|
|
|
VMNativeFunction *name##_VMPtr; \
|
|
|
|
static const AFuncDesc cls##_##name##_Hook = { #name, AF_##name, &name##_VMPtr }; \
|
|
|
|
extern AFuncDesc const *const cls##_##name##_HookPtr; \
|
|
|
|
MSVC_ASEG AFuncDesc const *const cls##_##name##_HookPtr GCC_ASEG = &cls##_##name##_Hook; \
|
|
|
|
static int AF_##name(VM_ARGS)
|
2008-08-12 14:30:07 +00:00
|
|
|
|
2010-02-12 06:04:57 +00:00
|
|
|
#define DEFINE_ACTION_FUNCTION_PARAMS(cls, name) DEFINE_ACTION_FUNCTION(cls, name)
|
2008-08-10 22:48:37 +00:00
|
|
|
|
2010-02-12 06:04:57 +00:00
|
|
|
//#define DECLARE_PARAMINFO AActor *self, AActor *stateowner, FState *CallingState, int ParameterIndex, StateCallData *statecall
|
|
|
|
//#define PUSH_PARAMINFO self, stateowner, CallingState, ParameterIndex, statecall
|
2008-08-12 14:30:07 +00:00
|
|
|
|
2010-02-12 06:04:57 +00:00
|
|
|
#define CALL_ACTION(name,self) { /*AF_##name(self, self, NULL, 0, NULL)*/ \
|
2012-07-17 05:31:41 +00:00
|
|
|
VMValue params[3] = { self, self, VMValue(NULL, ATAG_STATE) }; \
|
2010-02-12 06:04:57 +00:00
|
|
|
stack->Call(name##_VMPtr, params, countof(params), NULL, 0, NULL); \
|
|
|
|
}
|
2008-08-12 14:30:07 +00:00
|
|
|
|
2008-10-25 17:38:00 +00:00
|
|
|
|
2016-02-21 03:34:58 +00:00
|
|
|
#define ACTION_RETURN_STATE(v) do { FState *state = v; if (numret > 0) { assert(ret != NULL); ret->SetPointer(state, ATAG_STATE); return 1; } return 0; } while(0)
|
|
|
|
#define ACTION_RETURN_INT(v) do { int u = v; if (numret > 0) { assert(ret != NULL); ret->SetInt(u); return 1; } return 0; } while(0)
|
2016-02-19 02:39:40 +00:00
|
|
|
#define ACTION_RETURN_BOOL(v) ACTION_RETURN_INT(v)
|
2008-08-14 08:52:55 +00:00
|
|
|
|
|
|
|
// Checks to see what called the current action function
|
2010-02-12 06:04:57 +00:00
|
|
|
#define ACTION_CALL_FROM_ACTOR() (callingstate == self->state)
|
2012-07-17 05:31:41 +00:00
|
|
|
#define ACTION_CALL_FROM_WEAPON() (self->player && callingstate != self->state && !(stateowner->flags5 & MF5_INSTATECALL))
|
|
|
|
#define ACTION_CALL_FROM_INVENTORY() (!(stateowner->flags5 & MF5_INSTATECALL))
|
- Fixed compilation with mingw again.
- Added multiple-choice sound sequences. These overcome one of the major
deficiences of the Hexen-inherited SNDSEQ system while still being Hexen
compatible: Custom door sounds can now use different opening and closing
sequences, for both normal and blazing speeds.
- Added a serializer for TArray.
- Added a countof macro to doomtype.h. See the1's blog to find out why
it's implemented the way it is.
<http://blogs.msdn.com/the1/articles/210011.aspx>
- Added a new method to FRandom for getting random numbers larger than 255,
which lets me:
- Fixed: SNDSEQ delayrand commands could delay for no more than 255 tics.
- Fixed: If you're going to have sector_t.SoundTarget, then they need to
be included in the pointer cleanup scans.
- Ported back newer name code from 2.1.
- Fixed: Using -warp with only one parameter in Doom and Heretic to
select a map on episode 1 no longer worked.
- New: Loading a multiplayer save now restores the players based on
their names rather than on their connection order. Using connection
order was sensible when -net was the only way to start a network game,
but with -host/-join, it's not so nice. Also, if there aren't enough
players in the save, then the extra players will be spawned normally,
so you can continue a saved game with more players than you started it
with.
- Added some new SNDSEQ commands to make it possible to define Heretic's
ambient sounds in SNDSEQ: volumerel, volumerand, slot, randomsequence,
delayonce, and restart. With these, it is basically possible to obsolete
all of the $ambient SNDINFO commands.
- Fixed: Sound sequences would only execute one command each time they were
ticked.
- Fixed: No bounds checking was done on the volume sound sequences played at.
- Fixed: The tic parameter to playloop was useless and caused it to
act like a redundant playrepeat. I have removed all the logic that
caused playloop to play repeating sounds, and now it acts like an
infinite sequence of play/delay commands until the sequence is
stopped.
- Fixed: Sound sequences were ticked every frame, not every tic, so all
the delay commands were timed incorrectly and varied depending on your
framerate. Since this is useful for restarting looping sounds that got
cut off, I have not changed this. Instead, the delay commands now
record the tic when execution should resume, not the number of tics
left to delay.
SVN r57 (trunk)
2006-04-21 01:22:55 +00:00
|
|
|
#endif
|