mirror of
https://github.com/ZDoom/qzdoom.git
synced 2024-11-24 04:51:19 +00:00
- Added ML_BLOCKUSE line flag, accessible through UDMF and Line_SetBlocking.
SVN r1561 (trunk)
This commit is contained in:
parent
511ddb028c
commit
3bbef315f6
7 changed files with 17 additions and 3 deletions
|
@ -1,4 +1,7 @@
|
|||
April 25, 2009 (Changes by Graf Zahl)
|
||||
April 28, 2009 (Changes by Graf Zahl)
|
||||
- Added ML_BLOCKUSE line flag, accessible through UDMF and Line_SetBlocking.
|
||||
|
||||
April 25, 2009 (Changes by Graf Zahl)
|
||||
- Fixed handling of embedded WADs.
|
||||
|
||||
April 23, 2009 (Changes by Graf Zahl)
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
===============================================================================
|
||||
Universal Doom Map Format ZDoom extensions v1.5 - 22.02.2009
|
||||
Universal Doom Map Format ZDoom extensions v1.6 - 28.04.2009
|
||||
|
||||
|
||||
Copyright (c) 2008 Christoph Oelckers.
|
||||
|
@ -103,6 +103,7 @@ Note: All <bool> fields default to false unless mentioned otherwise.
|
|||
midtex3d = <bool>; // Actors can walk on mid texture.
|
||||
checkswitchrange = <bool>;// Switches can only be activated when vertically reachable.
|
||||
blockprojectiles = <bool>;// Line blocks all projectiles
|
||||
blockuse = <bool>; // Line blocks all use actions
|
||||
|
||||
}
|
||||
|
||||
|
@ -234,6 +235,9 @@ this uses array syntax. No functional changes
|
|||
1.5 22.02.2009
|
||||
Added blockprojectiles to lines and firstsideonly to conversion notes
|
||||
|
||||
1.6 28.04.2009
|
||||
Added blockuse line flag.
|
||||
|
||||
===============================================================================
|
||||
EOF
|
||||
===============================================================================
|
||||
|
|
|
@ -150,6 +150,7 @@ enum ELineFlags
|
|||
ML_CHECKSWITCHRANGE = 0x00400000,
|
||||
ML_FIRSTSIDEONLY = 0x00800000, // activated only when crossed from front side
|
||||
ML_BLOCKPROJECTILE = 0x01000000,
|
||||
ML_BLOCKUSE = 0x02000000, // blocks all use actions through this line
|
||||
};
|
||||
|
||||
|
||||
|
|
|
@ -412,5 +412,6 @@ xx(lightabsolute)
|
|||
xx(nofakecontrast)
|
||||
xx(smoothlighting)
|
||||
xx(blockprojectiles)
|
||||
xx(blockuse)
|
||||
|
||||
xx(Renderstyle)
|
||||
|
|
|
@ -2369,6 +2369,7 @@ FUNC(LS_Line_SetBlocking)
|
|||
ML_BLOCKPROJECTILE,
|
||||
ML_BLOCKEVERYTHING,
|
||||
ML_RAILING,
|
||||
ML_BLOCKUSE,
|
||||
-1
|
||||
};
|
||||
|
||||
|
|
|
@ -3636,7 +3636,7 @@ bool P_UseTraverse(AActor *usething, fixed_t endx, fixed_t endy, bool &foundline
|
|||
if (in->d.line->special == 0 || !(in->d.line->activation & (SPAC_Use|SPAC_UseThrough)))
|
||||
{
|
||||
blocked:
|
||||
if (in->d.line->flags & ML_BLOCKEVERYTHING)
|
||||
if (in->d.line->flags & (ML_BLOCKEVERYTHING|ML_BLOCKUSE))
|
||||
{
|
||||
open.range = 0;
|
||||
}
|
||||
|
|
|
@ -633,6 +633,10 @@ struct UDMFParser
|
|||
Flag(ld->flags, ML_BLOCKPROJECTILE, key);
|
||||
break;
|
||||
|
||||
case NAME_blockuse:
|
||||
Flag(ld->flags, ML_BLOCKUSE, key);
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue