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

Changed RTF_THRUSTZ to match RADF_THRUSTZ's bitmap.

Browse source
This commit is contained in:
MajorCooke 2016-05-11 07:28:05 -05:00 committed by Christoph Oelckers
parent 952219a018
commit 39f64383cb
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/thingdef/thingdef_codeptr.cpp
View file

@ -1146,7 +1146,6 @@ enum
RTF_AFFECTSOURCE = 1, RTF_AFFECTSOURCE = 1,
RTF_NOIMPACTDAMAGE = 2, RTF_NOIMPACTDAMAGE = 2,
RTF_NOTMISSILE = 4, RTF_NOTMISSILE = 4,
RTF_THRUSTZ = 8,
}; };
DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_RadiusThrust) DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_RadiusThrust)
@ -1168,7 +1167,6 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_RadiusThrust)
sourcenothrust = true; sourcenothrust = true;
self->target->flags2 &= ~MF2_NODMGTHRUST; self->target->flags2 &= ~MF2_NODMGTHRUST;
} }
if (flags & RTF_THRUSTZ) flags |= RADF_THRUSTZ;
P_RadiusAttack (self, self->target, force, distance, self->DamageType, flags | RADF_NODAMAGE, fullthrustdistance); P_RadiusAttack (self, self->target, force, distance, self->DamageType, flags | RADF_NODAMAGE, fullthrustdistance);
P_CheckSplash(self, distance); P_CheckSplash(self, distance);

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

@ -178,7 +178,7 @@ const int XF_NOTMISSILE = 4;
const int RTF_AFFECTSOURCE = 1; const int RTF_AFFECTSOURCE = 1;
const int RTF_NOIMPACTDAMAGE = 2; const int RTF_NOIMPACTDAMAGE = 2;
const int RTF_NOTMISSILE = 4; const int RTF_NOTMISSILE = 4;
const int RTF_THRUSTZ = 8; const int RTF_THRUSTZ = 16;
// Flags for A_Blast // Flags for A_Blast
const int BF_USEAMMO = 1; const int BF_USEAMMO = 1;