zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-26 14:01:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into scripting

Browse source 
Conflicts:
	src/thingdef/thingdef_codeptr.cpp
This commit is contained in:
Christoph Oelckers 2015-05-02 22:44:31 +02:00
commit 48ae605b7d
3 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
specs/usdf_zdoom.txt
View file

@ -63,6 +63,10 @@ either refuse loading dialogues with the 'ZDoom' namespace or if it does not
outright abort on incompatible namespaces fail with a type mismatch error on
one of the specified propeties.
In addition ZDoom defines one new field in the top level of a conversation block:
id = <integer>; Assigns a conversation ID for use in Thing_SetConversation or in UDMF's 'conversation' actor property.
ZDoom-format dialogues need to start with the line:
namespace = "ZDoom";

10
src/thingdef/thingdef_codeptr.cpp
View file

@ -4578,6 +4578,7 @@ enum T_Flags
TF_NODESTFOG = 0x00000080, // Don't spawn any fog at the arrival position.
TF_USEACTORFOG = 0x00000100, // Use the actor's TeleFogSourceType and TeleFogDestType fogs.
TF_NOJUMP = 0x00000200, // Don't jump after teleporting.
TF_OVERRIDE = 0x00000400, // Ignore NOTELEPORT.
};
DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_Teleport)
@ -4593,14 +4594,17 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_Teleport)
AActor *ref = COPY_AAPTR(self, ptr);
ACTION_SET_RESULT(false);
if (!ref)
{
ACTION_SET_RESULT(false);
return 0;
return numret;
}
if (ref->flags2 & MF2_NOTELEPORT)
return 0;
if ((ref->flags2 & MF2_NOTELEPORT) && !(Flags & TF_OVERRIDE))
{
return numret;
}
// Randomly choose not to teleport like A_Srcr2Decide.
if (flags & TF_RANDOMDECIDE)

1
wadsrc/static/actors/constants.txt
View file

@ -199,6 +199,7 @@ enum
TF_NODESTFOG = 0x00000080, // Don't spawn any fog at the arrival position.
TF_USEACTORFOG = 0x00000100, // Use the actor's TeleFogSourceType and TeleFogDestType fogs.
TF_NOJUMP = 0x00000200, // Don't jump after teleporting.
TF_OVERRIDE = 0x00000400, // Ignore NOTELEPORT.
TF_KEEPORIENTATION = TF_KEEPVELOCITY|TF_KEEPANGLE,
TF_NOFOG = TF_NOSRCFOG|TF_NODESTFOG,