From 4f21ff275c639de4b92f039868c1a637a8e43f49 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Thu, 29 Dec 2016 11:44:07 +0100 Subject: [PATCH] - removed duplicate portal_ceil_alpha and portal_floor_alpha UDMF properties. These already existed as 'alphafloor' and 'alphaceiling' and got accidentally duplicated by Eternity. --- specs/udmf_zdoom.txt | 2 -- src/namedef.h | 2 -- src/p_udmf.cpp | 8 -------- 3 files changed, 12 deletions(-) diff --git a/specs/udmf_zdoom.txt b/specs/udmf_zdoom.txt index 835f3780e3..775d67907e 100644 --- a/specs/udmf_zdoom.txt +++ b/specs/udmf_zdoom.txt @@ -215,13 +215,11 @@ Note: All fields default to false unless mentioned otherwise. floorterrain = ; // Sets the terrain for the sector's floor. Default = 'use the flat texture's terrain definition.' ceilingterrain = ; // Sets the terrain for the sector's ceiling. Default = 'use the flat texture's terrain definition.' - portal_ceil_alpha = // translucency of ceiling portal (default is 0 (not visible)) portal_ceil_blocksound = // ceiling portal blocks sound. portal_ceil_disabled = // ceiling portal disabled. portal_ceil_nopass = // ceiling portal blocks movement if true. portal_ceil_norender = // ceiling portal not rendered. portal_ceil_overlaytype = // defines translucency style, can either be "translucent" or "additive". Default is "translucent". - portal_floor_alpha = // translucency of floor portal (default is 0 (not visible)) portal_floor_blocksound = // floor portal blocks sound. portal_floor_disabled = // floor portal disabled. portal_floor_nopass = // ceiling portal blocks movement if true. diff --git a/src/namedef.h b/src/namedef.h index 62d513437c..a1b603995a 100644 --- a/src/namedef.h +++ b/src/namedef.h @@ -518,14 +518,12 @@ xx(Alphaceiling) xx(Renderstylefloor) xx(Renderstyleceiling) xx(Waterzone) -xx(portal_ceil_alpha) xx(portal_ceil_blocksound) xx(portal_ceil_disabled) xx(portal_ceil_nopass) xx(portal_ceil_norender) xx(portal_ceil_overlaytype) xx(portal_ceil_useglobaltex) -xx(portal_floor_alpha) xx(portal_floor_blocksound) xx(portal_floor_disabled) xx(portal_floor_nopass) diff --git a/src/p_udmf.cpp b/src/p_udmf.cpp index 2ef8a9ced0..783f1cdf47 100644 --- a/src/p_udmf.cpp +++ b/src/p_udmf.cpp @@ -1569,10 +1569,6 @@ public: tagstring = CheckString(key); break; - case NAME_portal_ceil_alpha: - sec->planes[sector_t::ceiling].alpha = CheckFloat(key); - break; - case NAME_portal_ceil_blocksound: Flag(sec->planes[sector_t::ceiling].Flags, PLANEF_BLOCKSOUND, key); break; @@ -1594,10 +1590,6 @@ public: else if (!stricmp(CheckString(key), "additive")) sec->planes[sector_t::ceiling].Flags |= PLANEF_ADDITIVE; break; - case NAME_portal_floor_alpha: - sec->planes[sector_t::floor].alpha = CheckFloat(key); - break; - case NAME_portal_floor_blocksound: Flag(sec->planes[sector_t::floor].Flags, PLANEF_BLOCKSOUND, key); break;