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

ThruBits is now opt-in for convenience with the +THRUBITS flag.

Browse source
This commit is contained in:
Major Cooke 2020-10-23 11:38:47 -05:00 committed by Christoph Oelckers
parent 66abbf647c
commit 85a121ad28
3 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/playsim/actor.h
View file

@ -414,7 +414,7 @@ enum ActorFlag8
MF8_STOPRAILS = 0x00000200, // [MC] Prevent rails from going further if an actor has this flag. MF8_STOPRAILS = 0x00000200, // [MC] Prevent rails from going further if an actor has this flag.
MF8_ABSVIEWANGLES = 0x00000400, // [MC] By default view angle/pitch/roll is an offset. This will make it absolute instead. MF8_ABSVIEWANGLES = 0x00000400, // [MC] By default view angle/pitch/roll is an offset. This will make it absolute instead.
MF8_FALLDAMAGE = 0x00000800, // Monster will take fall damage regardless of map settings. MF8_FALLDAMAGE = 0x00000800, // Monster will take fall damage regardless of map settings.
MF8_THRUBITS = 0x00008000, // [MC] Enable ThruBits property
}; };
// --- mobj.renderflags --- // --- mobj.renderflags ---

13
src/playsim/p_map.cpp
View file

@ -450,7 +450,7 @@ bool P_TeleportMove(AActor* thing, const DVector3 &pos, bool telefrag, bool modi
if ((th->flags2 | tmf.thing->flags2) & MF2_THRUACTORS) if ((th->flags2 | tmf.thing->flags2) & MF2_THRUACTORS)
continue; continue;
if (th->ThruBits & tmf.thing->ThruBits) if (((th->flags8 | tmf.thing->flags8) & MF8_THRUBITS) && th->ThruBits & tmf.thing->ThruBits)
continue; continue;
double blockdist = th->radius + tmf.thing->radius; double blockdist = th->radius + tmf.thing->radius;
@ -1304,7 +1304,7 @@ bool PIT_CheckThing(FMultiBlockThingsIterator &it, FMultiBlockThingsIterator::Ch
if ((thing->flags2 | tm.thing->flags2) & MF2_THRUACTORS) if ((thing->flags2 | tm.thing->flags2) & MF2_THRUACTORS)
return true; return true;
if (thing->ThruBits & tm.thing->ThruBits) if (((thing->flags8 | tm.thing->flags8) & MF8_THRUBITS) && thing->ThruBits & tm.thing->ThruBits)
return true; return true;
if (!((thing->flags & (MF_SOLID | MF_SPECIAL | MF_SHOOTABLE)) || thing->flags6 & MF6_TOUCHY)) if (!((thing->flags & (MF_SOLID | MF_SPECIAL | MF_SHOOTABLE)) || thing->flags6 & MF6_TOUCHY))
@ -2000,7 +2000,7 @@ int P_TestMobjZ(AActor *actor, bool quick, AActor **pOnmobj)
{ {
continue; continue;
} }
if (actor->ThruBits & thing->ThruBits) if (((actor->flags8 | thing->flags8) & MF8_THRUBITS) && actor->ThruBits & thing->ThruBits)
{ {
continue; continue;
} }
@ -4498,7 +4498,7 @@ AActor *P_LineAttack(AActor *t1, DAngle angle, double distance,
{ {
TData.ThruSpecies = (puffDefaults && (puffDefaults->flags6 & MF6_THRUSPECIES)); TData.ThruSpecies = (puffDefaults && (puffDefaults->flags6 & MF6_THRUSPECIES));
TData.ThruActors = (puffDefaults && (puffDefaults->flags2 & MF2_THRUACTORS)); TData.ThruActors = (puffDefaults && (puffDefaults->flags2 & MF2_THRUACTORS));
TData.UseThruBits = true;
// [MC] Because this is a one-hit trace event, we need to spawn the puff, get the species // [MC] Because this is a one-hit trace event, we need to spawn the puff, get the species
// and destroy it. Assume there is no species unless tempuff isn't NULL. We cannot get // and destroy it. Assume there is no species unless tempuff isn't NULL. We cannot get
// a proper species the same way as puffDefaults flags it appears... // a proper species the same way as puffDefaults flags it appears...
@ -4509,6 +4509,7 @@ AActor *P_LineAttack(AActor *t1, DAngle angle, double distance,
if (tempuff != NULL) if (tempuff != NULL)
{ {
TData.PuffSpecies = tempuff->GetSpecies(); TData.PuffSpecies = tempuff->GetSpecies();
TData.UseThruBits = tempuff->flags8 & MF8_THRUBITS;
TData.ThruBits = tempuff->ThruBits; TData.ThruBits = tempuff->ThruBits;
tempuff->Destroy(); tempuff->Destroy();
} }
@ -5265,7 +5266,11 @@ void P_RailAttack(FRailParams *p)
rail_data.PuffSpecies = (thepuff != NULL) ? thepuff->GetSpecies() : NAME_None; rail_data.PuffSpecies = (thepuff != NULL) ? thepuff->GetSpecies() : NAME_None;
if (thepuff) if (thepuff)
{
rail_data.ThruBits = thepuff->ThruBits; rail_data.ThruBits = thepuff->ThruBits;
if (rail_data.UseThruBits)
rail_data.UseThruBits = (thepuff->flags8 & MF8_THRUBITS);
}
Trace(start, source->Sector, vec, p->distance, MF_SHOOTABLE, ML_BLOCKEVERYTHING, source, trace, flags, ProcessRailHit, &rail_data); Trace(start, source->Sector, vec, p->distance, MF_SHOOTABLE, ML_BLOCKEVERYTHING, source, trace, flags, ProcessRailHit, &rail_data);

1
src/scripting/thingdef_data.cpp
View file

@ -327,6 +327,7 @@ static FFlagDef ActorFlagDefs[]=
DEFINE_FLAG(MF8, STOPRAILS, AActor, flags8), DEFINE_FLAG(MF8, STOPRAILS, AActor, flags8),
DEFINE_FLAG(MF8, FALLDAMAGE, AActor, flags8), DEFINE_FLAG(MF8, FALLDAMAGE, AActor, flags8),
DEFINE_FLAG(MF8, ABSVIEWANGLES, AActor, flags8), DEFINE_FLAG(MF8, ABSVIEWANGLES, AActor, flags8),
DEFINE_FLAG(MF8, THRUBITS, AActor, flags8),
// Effect flags // Effect flags
DEFINE_FLAG(FX, VISIBILITYPULSE, AActor, effects), DEFINE_FLAG(FX, VISIBILITYPULSE, AActor, effects),