mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-23 12:32:34 +00:00
- added MF6_NOTONAUTOMAP flag to exclude things from being shown with the scanner powerup. The IDDT cheat will not be affected by this.
This commit is contained in:
parent
6a07118ea4
commit
211d293002
3 changed files with 91 additions and 87 deletions
|
@ -331,6 +331,7 @@ enum
|
||||||
MF6_DOHARMSPECIES = 0x08000000, // Do hurt one's own species with projectiles.
|
MF6_DOHARMSPECIES = 0x08000000, // Do hurt one's own species with projectiles.
|
||||||
MF6_INTRYMOVE = 0x10000000, // Executing P_TryMove
|
MF6_INTRYMOVE = 0x10000000, // Executing P_TryMove
|
||||||
MF6_NOTAUTOAIMED = 0x20000000, // Do not subject actor to player autoaim.
|
MF6_NOTAUTOAIMED = 0x20000000, // Do not subject actor to player autoaim.
|
||||||
|
MF6_NOTONAUTOMAP = 0x40000000, // will not be shown on automap with the 'scanner' powerup.
|
||||||
|
|
||||||
// --- mobj.renderflags ---
|
// --- mobj.renderflags ---
|
||||||
|
|
||||||
|
|
|
@ -2355,6 +2355,8 @@ void AM_drawThings ()
|
||||||
{
|
{
|
||||||
t = sectors[i].thinglist;
|
t = sectors[i].thinglist;
|
||||||
while (t)
|
while (t)
|
||||||
|
{
|
||||||
|
if (am_cheat > 0 || !(t->flags6 & MF6_NOTONAUTOMAP))
|
||||||
{
|
{
|
||||||
p.x = t->x >> FRACTOMAPBITS;
|
p.x = t->x >> FRACTOMAPBITS;
|
||||||
p.y = t->y >> FRACTOMAPBITS;
|
p.y = t->y >> FRACTOMAPBITS;
|
||||||
|
@ -2463,7 +2465,7 @@ void AM_drawThings ()
|
||||||
AM_drawLineCharacter (box, 4, t->radius >> FRACTOMAPBITS, angle - t->angle, color, p.x, p.y);
|
AM_drawLineCharacter (box, 4, t->radius >> FRACTOMAPBITS, angle - t->angle, color, p.x, p.y);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
t = t->snext;
|
t = t->snext;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -234,6 +234,7 @@ static FFlagDef ActorFlags[]=
|
||||||
DEFINE_FLAG(MF6, DOHARMSPECIES, AActor, flags6),
|
DEFINE_FLAG(MF6, DOHARMSPECIES, AActor, flags6),
|
||||||
DEFINE_FLAG(MF6, POISONALWAYS, AActor, flags6),
|
DEFINE_FLAG(MF6, POISONALWAYS, AActor, flags6),
|
||||||
DEFINE_FLAG(MF6, NOTAUTOAIMED, AActor, flags6),
|
DEFINE_FLAG(MF6, NOTAUTOAIMED, AActor, flags6),
|
||||||
|
DEFINE_FLAG(MF6, NOTONAUTOMAP, AActor, flags6),
|
||||||
|
|
||||||
// Effect flags
|
// Effect flags
|
||||||
DEFINE_FLAG(FX, VISIBILITYPULSE, AActor, effects),
|
DEFINE_FLAG(FX, VISIBILITYPULSE, AActor, effects),
|
||||||
|
|
Loading…
Reference in a new issue