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

- removed duplicate portal_ceil_alpha and portal_floor_alpha UDMF properties.

Browse source 
These already existed as 'alphafloor' and 'alphaceiling' and got accidentally duplicated by Eternity.
This commit is contained in:
Christoph Oelckers 2016-12-29 11:44:07 +01:00
parent 625e97dfd1
commit 4f21ff275c
3 changed files with 0 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
specs/udmf_zdoom.txt
View file

@ -215,13 +215,11 @@ Note: All <bool> fields default to false unless mentioned otherwise.
floorterrain = <string>; // Sets the terrain for the sector's floor. Default = 'use the flat texture's terrain definition.' floorterrain = <string>; // Sets the terrain for the sector's floor. Default = 'use the flat texture's terrain definition.'
ceilingterrain = <string>; // Sets the terrain for the sector's ceiling. Default = 'use the flat texture's terrain definition.' ceilingterrain = <string>; // Sets the terrain for the sector's ceiling. Default = 'use the flat texture's terrain definition.'
portal_ceil_alpha = <float> // translucency of ceiling portal (default is 0 (not visible))
portal_ceil_blocksound = <bool> // ceiling portal blocks sound. portal_ceil_blocksound = <bool> // ceiling portal blocks sound.
portal_ceil_disabled = <bool> // ceiling portal disabled. portal_ceil_disabled = <bool> // ceiling portal disabled.
portal_ceil_nopass = <bool> // ceiling portal blocks movement if true. portal_ceil_nopass = <bool> // ceiling portal blocks movement if true.
portal_ceil_norender = <bool> // ceiling portal not rendered. portal_ceil_norender = <bool> // ceiling portal not rendered.
portal_ceil_overlaytype = <string> // defines translucency style, can either be "translucent" or "additive". Default is "translucent". portal_ceil_overlaytype = <string> // defines translucency style, can either be "translucent" or "additive". Default is "translucent".
portal_floor_alpha = <float> // translucency of floor portal (default is 0 (not visible))
portal_floor_blocksound = <bool> // floor portal blocks sound. portal_floor_blocksound = <bool> // floor portal blocks sound.
portal_floor_disabled = <bool> // floor portal disabled. portal_floor_disabled = <bool> // floor portal disabled.
portal_floor_nopass = <bool> // ceiling portal blocks movement if true. portal_floor_nopass = <bool> // ceiling portal blocks movement if true.

2
src/namedef.h
View file

@ -518,14 +518,12 @@ xx(Alphaceiling)
xx(Renderstylefloor) xx(Renderstylefloor)
xx(Renderstyleceiling) xx(Renderstyleceiling)
xx(Waterzone) xx(Waterzone)
xx(portal_ceil_alpha)
xx(portal_ceil_blocksound) xx(portal_ceil_blocksound)
xx(portal_ceil_disabled) xx(portal_ceil_disabled)
xx(portal_ceil_nopass) xx(portal_ceil_nopass)
xx(portal_ceil_norender) xx(portal_ceil_norender)
xx(portal_ceil_overlaytype) xx(portal_ceil_overlaytype)
xx(portal_ceil_useglobaltex) xx(portal_ceil_useglobaltex)
xx(portal_floor_alpha)
xx(portal_floor_blocksound) xx(portal_floor_blocksound)
xx(portal_floor_disabled) xx(portal_floor_disabled)
xx(portal_floor_nopass) xx(portal_floor_nopass)

8
src/p_udmf.cpp
View file

@ -1569,10 +1569,6 @@ public:
tagstring = CheckString(key); tagstring = CheckString(key);
break; break;
case NAME_portal_ceil_alpha:
sec->planes[sector_t::ceiling].alpha = CheckFloat(key);
break;
case NAME_portal_ceil_blocksound: case NAME_portal_ceil_blocksound:
Flag(sec->planes[sector_t::ceiling].Flags, PLANEF_BLOCKSOUND, key); Flag(sec->planes[sector_t::ceiling].Flags, PLANEF_BLOCKSOUND, key);
break; break;
@ -1594,10 +1590,6 @@ public:
else if (!stricmp(CheckString(key), "additive")) sec->planes[sector_t::ceiling].Flags |= PLANEF_ADDITIVE; else if (!stricmp(CheckString(key), "additive")) sec->planes[sector_t::ceiling].Flags |= PLANEF_ADDITIVE;
break; break;
case NAME_portal_floor_alpha:
sec->planes[sector_t::floor].alpha = CheckFloat(key);
break;
case NAME_portal_floor_blocksound: case NAME_portal_floor_blocksound:
Flag(sec->planes[sector_t::floor].Flags, PLANEF_BLOCKSOUND, key); Flag(sec->planes[sector_t::floor].Flags, PLANEF_BLOCKSOUND, key);
break; break;