Merge http://github.com/rheit/zdoom

specs/udmf_zdoom.txt

@@ -215,6 +215,19 @@ 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.'
       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_disabled = <bool>   // ceiling portal disabled.
+      portal_ceil_nopass = <bool>     // ceiling portal blocks movement if true.
+      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_floor_alpha = <float>     // translucency of floor portal (default is 0 (not visible))
+      portal_floor_blocksound = <bool> // floor portal blocks sound.
+      portal_floor_disabled = <bool>   // floor portal disabled.
+      portal_floor_nopass = <bool>     // ceiling portal blocks movement if true.
+      portal_floor_norender = <bool>   // ceiling portal not rendered.
+      portal_floor_overlaytype = <string> // defines translucency style, can either be "translucent" or "additive". Default is "translucent".
+	  
       
       * Note about dropactors
 

src/namedef.h

@@ -507,6 +507,21 @@ 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)
+xx(portal_floor_norender)
+xx(portal_floor_overlaytype)
+xx(portal_floor_useglobaltex)
+
 
 xx(offsetx_top)
 xx(offsety_top)

src/p_mobj.cpp

@@ -3526,7 +3526,7 @@ void AActor::Tick ()
 				sector_t *sec = node->m_sector;
 				DVector2 scrollv;
 
-				if (level.Scrolls.Size() > (sec-sectors))
+				if (level.Scrolls.Size() > unsigned(sec-sectors))
 				{
 					scrollv = level.Scrolls[sec - sectors];
 				}

src/p_udmf.cpp

@@ -1568,6 +1568,60 @@ 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;
+
+				case NAME_portal_ceil_disabled:
+					Flag(sec->planes[sector_t::ceiling].Flags, PLANEF_DISABLED, key);
+					break;
+
+				case NAME_portal_ceil_nopass:
+					Flag(sec->planes[sector_t::ceiling].Flags, PLANEF_NOPASS, key);
+					break;
+
+				case NAME_portal_ceil_norender:
+					Flag(sec->planes[sector_t::ceiling].Flags, PLANEF_NORENDER, key);
+					break;
+
+				case NAME_portal_ceil_overlaytype:
+					if (!stricmp(CheckString(key), "translucent")) sec->planes[sector_t::ceiling].Flags &= ~PLANEF_ADDITIVE;
+					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;
+
+				case NAME_portal_floor_disabled:
+					Flag(sec->planes[sector_t::floor].Flags, PLANEF_DISABLED, key);
+					break;
+
+				case NAME_portal_floor_nopass:
+					Flag(sec->planes[sector_t::floor].Flags, PLANEF_NOPASS, key);
+					break;
+
+				case NAME_portal_floor_norender:
+					Flag(sec->planes[sector_t::floor].Flags, PLANEF_NORENDER, key);
+					break;
+
+				case NAME_portal_floor_overlaytype:
+					if (!stricmp(CheckString(key), "translucent")) sec->planes[sector_t::floor].Flags &= ~PLANEF_ADDITIVE;
+					else if (!stricmp(CheckString(key), "additive")) sec->planes[sector_t::floor].Flags |= PLANEF_ADDITIVE;
+					break;
+
+				// These two are used by Eternity for something I do not understand.
+				//case NAME_portal_ceil_useglobaltex:
+				//case NAME_portal_floor_useglobaltex:
+					
 				default:
 					break;
 			}

src/serializer.cpp

@@ -821,7 +821,6 @@ void FSerializer::WriteObjects()
 		for (unsigned i = 0; i < w->mDObjects.Size(); i++)
 		{
 			auto obj = w->mDObjects[i];
-			player_t *player;
 
 			BeginObject(nullptr);
 			w->Key("classtype");

src/thingdef/thingdef_codeptr.cpp

@@ -3322,6 +3322,22 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_SetTranslucent)
 	return 0;
 }
 
+//===========================================================================
+//
+// A_SetRenderStyle
+//
+//===========================================================================
+DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_SetRenderStyle)
+{
+	PARAM_SELF_PROLOGUE(AActor);
+	PARAM_FLOAT(alpha);
+	PARAM_INT_OPT(mode) { mode = 0; }
+
+	self->Alpha = clamp(alpha, 0., 1.);
+	self->RenderStyle = ERenderStyle(mode);
+	return 0;
+}
+
 //===========================================================================
 //
 // A_FadeIn

wadsrc/static/actors/actor.txt

@@ -218,6 +218,7 @@ ACTOR Actor native //: Thinker
 	native void A_LogInt(int whattoprint);
 	native void A_LogFloat(float whattoprint);
 	native void A_SetTranslucent(float alpha, int style = 0);
+	native void A_SetRenderStyle(float alpha, int style);
 	action native A_FadeIn(float reduce = 0.1, int flags = 0);
 	action native A_FadeOut(float reduce = 0.1, int flags = 1); //bool remove == true
 	native void A_FadeTo(float target, float amount = 0.1, int flags = 0);

wadsrc/static/actors/constants.txt

@@ -690,3 +690,21 @@ enum
 	VRF_NOANGLE = VRF_NOANGLESTART|VRF_NOANGLEEND,
 	VRF_NOPITCH = VRF_NOPITCHSTART|VRF_NOPITCHEND,
 };
+
+enum
+{
+	STYLE_None,
+	STYLE_Normal,
+	STYLE_Fuzzy,
+	STYLE_SoulTrans,
+	STYLE_OptFuzzy,
+	STYLE_Stencil,
+	STYLE_Translucent,
+	STYLE_Add,
+	STYLE_Shaded,
+	STYLE_TranslucentStencil,
+	STYLE_Shadow,
+	STYLE_Subtract,
+	STYLE_AddStencil,
+	STYLE_AddShaded,
+};