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

- removed ZDOOMADD and updated actors in question with ZDOOMTRANS

Browse source
This commit is contained in:
Rachael Alexanderson 2017-06-01 14:03:51 -04:00
parent b4dea12a4f
commit bf12d38afd
41 changed files with 57 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/actor.h
View file

@ -445,7 +445,6 @@ enum ActorRenderFlag
RF_SPRITEFLIP = 0x08000000, // sprite flipped on x-axis
RF_ZDOOMTRANS = 0x10000000, // is not normally transparent in Vanilla Doom
RF_ZDOOMADD = 0x20000000, // is not normally additive in Vanilla Hexen/Heretic/Strife
};
// This translucency value produces the closest match to Heretic's TINTTAB.

7
src/gl/scene/gl_sprite.cpp
View file

@ -1004,13 +1004,6 @@ void GLSprite::Process(AActor* thing, sector_t * sector, int thruportal)
RenderStyle.SrcAlpha = STYLEALPHA_One;
RenderStyle.DestAlpha = STYLEALPHA_Zero;
}
if (thing->renderflags & RF_ZDOOMADD)
{
RenderStyle.BlendOp = STYLEOP_Add;
RenderStyle.SrcAlpha = STYLEALPHA_Src;
RenderStyle.DestAlpha = STYLEALPHA_InvSrc;
}
}
if (trans >= 1.f - FLT_EPSILON && RenderStyle.BlendOp != STYLEOP_Shadow && (
(RenderStyle.SrcAlpha == STYLEALPHA_One && RenderStyle.DestAlpha == STYLEALPHA_Zero) ||

2
src/polyrenderer/scene/poly_sprite.cpp
View file

@ -148,8 +148,6 @@ void RenderPolySprite::Render(const TriMatrix &worldToClip, const PolyClipPlane
args.SetClipPlane(clipPlane);
if ((thing->renderflags & RF_ZDOOMTRANS) && r_vanillatrans)
args.SetStyle(LegacyRenderStyles[STYLE_Normal], 1.0f, thing->fillcolor, thing->Translation, tex, fullbrightSprite);
else if ((thing->renderflags & RF_ZDOOMADD) && r_vanillatrans)
args.SetStyle(LegacyRenderStyles[STYLE_Translucent], thing->Alpha, thing->fillcolor, thing->Translation, tex, fullbrightSprite);
else
args.SetStyle(thing->RenderStyle, thing->Alpha, thing->fillcolor, thing->Translation, tex, fullbrightSprite);
args.SetSubsectorDepthTest(true);

1
src/scripting/thingdef_data.cpp
View file

@ -347,7 +347,6 @@ static FFlagDef ActorFlagDefs[]=
DEFINE_FLAG(RF, DONTINTERPOLATE, AActor, renderflags),
DEFINE_FLAG(RF, SPRITEFLIP, AActor, renderflags),
DEFINE_FLAG(RF, ZDOOMTRANS, AActor, renderflags),
DEFINE_FLAG(RF, ZDOOMADD, AActor, renderflags),
// Bounce flags
DEFINE_FLAG2(BOUNCE_Walls, BOUNCEONWALLS, AActor, BounceFlags),

2
src/swrenderer/things/r_sprite.cpp
View file

@ -217,8 +217,6 @@ namespace swrenderer
{
if (thing->renderflags & RF_ZDOOMTRANS)
vis->RenderStyle = LegacyRenderStyles[STYLE_Normal];
if (thing->renderflags & RF_ZDOOMADD)
vis->RenderStyle = LegacyRenderStyles[STYLE_Translucent];
}
vis->FillColor = thing->fillcolor;
vis->Translation = thing->Translation; // [RH] thing translation table

4
wadsrc/static/zscript/heretic/beast.txt
View file

@ -75,7 +75,7 @@ class BeastBall : Actor
-NOBLOCKMAP
+WINDTHRUST
+SPAWNSOUNDSOURCE
+ZDOOMADD
+ZDOOMTRANS
RenderStyle "Add";
SeeSound "beast/attack";
}
@ -105,7 +105,7 @@ class Puffy : Actor
+MISSILE
+NOTELEPORT
+DONTSPLASH
+ZDOOMADD
+ZDOOMTRANS
RenderStyle "Add";
}
States

8
wadsrc/static/zscript/heretic/dsparil.txt
View file

@ -192,7 +192,7 @@ class SorcererFX1 : Actor
Projectile;
-ACTIVATEIMPACT
-ACTIVATEPCROSS
+ZDOOMADD
+ZDOOMTRANS
RenderStyle "Add";
}
@ -411,7 +411,7 @@ class Sorcerer2FX1 : Actor
Projectile;
-ACTIVATEIMPACT
-ACTIVATEPCROSS
+ZDOOMADD
+ZDOOMTRANS
RenderStyle "Add";
}
@ -459,7 +459,7 @@ class Sorcerer2FXSpark : Actor
+NOGRAVITY
+NOTELEPORT
+CANNOTPUSH
+ZDOOMADD
+ZDOOMTRANS
RenderStyle "Add";
}
@ -484,7 +484,7 @@ class Sorcerer2FX2 : Actor
Projectile;
-ACTIVATEIMPACT
-ACTIVATEPCROSS
+ZDOOMADD
+ZDOOMTRANS
RenderStyle "Add";
}

2
wadsrc/static/zscript/heretic/hereticimp.txt
View file

@ -228,7 +228,7 @@ class HereticImpBall : Actor
+SPAWNSOUNDSOURCE
-ACTIVATEPCROSS
-ACTIVATEIMPACT
+ZDOOMADD
+ZDOOMTRANS
RenderStyle "Add";
}
States

2
wadsrc/static/zscript/heretic/hereticmisc.txt
View file

@ -205,7 +205,7 @@ class TeleGlitter1 : Actor
{
Default
{
+NOBLOCKMAP +NOGRAVITY +MISSILE +ZDOOMADD
+NOBLOCKMAP +NOGRAVITY +MISSILE +ZDOOMTRANS
RenderStyle "Add";
Damage 0;
}

6
wadsrc/static/zscript/heretic/ironlich.txt
View file

@ -144,7 +144,7 @@ class HeadFX1 : Actor
-ACTIVATEIMPACT
-ACTIVATEPCROSS
+THRUGHOST
+ZDOOMADD
+ZDOOMTRANS
RenderStyle "Add";
}
@ -196,7 +196,7 @@ class HeadFX2 : Actor
Projectile;
-ACTIVATEIMPACT
-ACTIVATEPCROSS
+ZDOOMADD
+ZDOOMTRANS
RenderStyle "Add";
}
@ -225,7 +225,7 @@ class HeadFX3 : Actor
Damage 5;
Projectile;
+WINDTHRUST
+ZDOOMADD
+ZDOOMTRANS
-ACTIVATEIMPACT
-ACTIVATEPCROSS
-NOBLOCKMAP

2
wadsrc/static/zscript/heretic/mummy.txt
View file

@ -135,7 +135,7 @@ class MummyFX1 : Actor
-ACTIVATEPCROSS
-ACTIVATEIMPACT
+SEEKERMISSILE
+ZDOOMADD
+ZDOOMTRANS
}
States
{

2
wadsrc/static/zscript/heretic/snake.txt
View file

@ -64,7 +64,7 @@ class SnakeProjA : Actor
-ACTIVATEPCROSS
+WINDTHRUST
+SPAWNSOUNDSOURCE
+ZDOOMADD
+ZDOOMTRANS
RenderStyle "Add";
SeeSound "snake/attack";
}

2
wadsrc/static/zscript/heretic/weaponblaster.txt
View file

@ -244,7 +244,7 @@ class BlasterPuff : Actor
+NOBLOCKMAP
+NOGRAVITY
+PUFFONACTORS
+ZDOOMADD
+ZDOOMTRANS
RenderStyle "Add";
SeeSound "weapons/blasterhit";
}

2
wadsrc/static/zscript/heretic/weaponcrossbow.txt
View file

@ -129,7 +129,7 @@ class CrossbowFX1 : Actor
SeeSound "weapons/bowshoot";
DeathSound "weapons/bowhit";
Obituary "$OB_MPCROSSBOW";
+ZDOOMADD
+ZDOOMTRANS
}
States

2
wadsrc/static/zscript/heretic/weaponphoenix.txt
View file

@ -292,7 +292,7 @@ class PhoenixFX2 : Actor
DamageType "Fire";
Projectile;
RenderStyle "Add";
+ZDOOMADD
+ZDOOMTRANS
Obituary "$OB_MPPPHOENIXROD";
}

6
wadsrc/static/zscript/heretic/weaponskullrod.txt
View file

@ -143,7 +143,7 @@ class HornRodFX1 : Actor
Damage 3;
Projectile;
+WINDTHRUST
+ZDOOMADD
+ZDOOMTRANS
-NOBLOCKMAP
RenderStyle "Add";
SeeSound "weapons/hornrodshoot";
@ -178,7 +178,7 @@ class HornRodFX2 : Actor
Health 140;
Projectile;
RenderStyle "Add";
+ZDOOMADD
+ZDOOMTRANS
SeeSound "weapons/hornrodpowshoot";
DeathSound "weapons/hornrodpowhit";
Obituary "$OB_MPPSKULLROD";
@ -366,7 +366,7 @@ class RainPillar : Actor
Projectile;
-ACTIVATEPCROSS
-ACTIVATEIMPACT
+ZDOOMADD
+ZDOOMTRANS
RenderStyle "Add";
Obituary "$OB_MPPSKULLROD";
}

2
wadsrc/static/zscript/heretic/weaponstaff.txt
View file

@ -132,7 +132,7 @@ class StaffPuff2 : Actor
+NOBLOCKMAP
+NOGRAVITY
+PUFFONACTORS
+ZDOOMADD
+ZDOOMTRANS
AttackSound "weapons/staffpowerhit";
}

2
wadsrc/static/zscript/heretic/weaponwand.txt
View file

@ -142,7 +142,7 @@ class GoldWandFX1 : Actor
Damage 2;
Projectile;
RenderStyle "Add";
+ZDOOMADD
+ZDOOMTRANS
DeathSound "weapons/wandhit";
Obituary "$OB_MPPGOLDWAND";
}

2
wadsrc/static/zscript/heretic/wizard.txt
View file

@ -145,7 +145,7 @@ class WizardFX1 : Actor
Projectile;
-ACTIVATEIMPACT
-ACTIVATEPCROSS
+ZDOOMADD
+ZDOOMTRANS
RenderStyle "Add";
}

2
wadsrc/static/zscript/hexen/bishop.txt
View file

@ -290,7 +290,7 @@ class BishopFX : Actor
Projectile;
+SEEKERMISSILE
-ACTIVATEIMPACT -ACTIVATEPCROSS
+STRIFEDAMAGE +ZDOOMADD
+STRIFEDAMAGE +ZDOOMTRANS
RenderStyle "Add";
DeathSound "BishopMissileExplode";
}

2
wadsrc/static/zscript/hexen/centaur.txt
View file

@ -154,7 +154,7 @@ class CentaurFX : Actor
Damage 4;
Projectile;
+SPAWNSOUNDSOURCE
+ZDOOMADD
+ZDOOMTRANS
RenderStyle "Add";
SeeSound "CentaurLeaderAttack";
DeathSound "CentaurMissileExplode";

8
wadsrc/static/zscript/hexen/clericflame.txt
View file

@ -72,7 +72,7 @@ class CFlameFloor : Actor
{
Default
{
+NOBLOCKMAP +NOGRAVITY +ZDOOMADD
+NOBLOCKMAP +NOGRAVITY +ZDOOMTRANS
RenderStyle "Add";
}
States
@ -93,7 +93,7 @@ class FlamePuff : Actor
{
Radius 1;
Height 1;
+NOBLOCKMAP +NOGRAVITY +ZDOOMADD
+NOBLOCKMAP +NOGRAVITY +ZDOOMTRANS
RenderStyle "Add";
SeeSound "ClericFlameExplode";
AttackSound "ClericFlameExplode";
@ -159,7 +159,7 @@ class CircleFlame : Actor
Projectile;
-ACTIVATEIMPACT
-ACTIVATEPCROSS
+ZDOOMADD
+ZDOOMTRANS
RenderStyle "Add";
DeathSound "ClericFlameCircle";
Obituary "$OB_MPCWEAPFLAME";
@ -217,7 +217,7 @@ class CFlameMissile : FastProjectile
Damage 8;
DamageType "Fire";
+INVISIBLE
+ZDOOMADD
+ZDOOMTRANS
RenderStyle "Add";
Obituary "$OB_MPCWEAPFLAME";
}

4
wadsrc/static/zscript/hexen/demons.txt
View file

@ -205,7 +205,7 @@ class Demon1FX1 : Actor
DamageType "Fire";
Projectile;
+SPAWNSOUNDSOURCE
+ZDOOMADD
+ZDOOMTRANS
RenderStyle "Add";
SeeSound "DemonMissileFire";
DeathSound "DemonMissileExplode";
@ -393,7 +393,7 @@ class Demon2FX1 : Actor
DamageType "Fire";
Projectile;
+SPAWNSOUNDSOURCE
+ZDOOMADD
+ZDOOMTRANS
RenderStyle "Add";
SeeSound "DemonMissileFire";
DeathSound "DemonMissileExplode";

4
wadsrc/static/zscript/hexen/dragon.txt
View file

@ -311,7 +311,7 @@ class DragonFireball : Actor
DamageType "Fire";
Projectile;
-ACTIVATEIMPACT -ACTIVATEPCROSS
+ZDOOMADD
+ZDOOMTRANS
RenderStyle "Add";
DeathSound "DragonFireballExplode";
}
@ -365,7 +365,7 @@ class DragonExplosion : Actor
+NOBLOCKMAP
+NOTELEPORT
+INVISIBLE
+ZDOOMADD
+ZDOOMTRANS
RenderStyle "Add";
DeathSound "DragonFireballExplode";
}

2
wadsrc/static/zscript/hexen/fighteraxe.txt
View file

@ -307,7 +307,7 @@ class AxePuffGlow : AxePuff
Default
{
+PUFFONACTORS
+ZDOOMADD
+ZDOOMTRANS
RenderStyle "Add";
Alpha 1;
}

2
wadsrc/static/zscript/hexen/fighterquietus.txt
View file

@ -168,7 +168,7 @@ class FSwordMissile : Actor
Damage 8;
Projectile;
+EXTREMEDEATH
+ZDOOMADD
+ZDOOMTRANS
RenderStyle "Add";
DeathSound "FighterSwordExplode";
Obituary "$OB_MPFWEAPQUIETUS";

2
wadsrc/static/zscript/hexen/firedemon.txt
View file

@ -436,7 +436,7 @@ class FireDemonMissile : Actor
Projectile;
RenderStyle "Add";
DeathSound "FireDemonMissileHit";
+ZDOOMADD
+ZDOOMTRANS
}
States
{

8
wadsrc/static/zscript/hexen/flame.txt
View file

@ -5,7 +5,7 @@ class FlameSmallTemp : Actor
Default
{
+NOTELEPORT
+ZDOOMADD
+ZDOOMTRANS
RenderStyle "Add";
}
@ -29,7 +29,7 @@ class FlameLargeTemp : Actor
Default
{
+NOTELEPORT
+ZDOOMADD
+ZDOOMTRANS
RenderStyle "Add";
}
@ -64,7 +64,7 @@ class FlameSmall : SwitchableDecoration
{
+NOTELEPORT
+INVISIBLE
+ZDOOMADD
+ZDOOMTRANS
Radius 15;
RenderStyle "Add";
}
@ -98,7 +98,7 @@ class FlameLarge : SwitchableDecoration
{
+NOTELEPORT
+INVISIBLE
+ZDOOMADD
+ZDOOMTRANS
Radius 15;
RenderStyle "Add";
}

2
wadsrc/static/zscript/hexen/heresiarch.txt
View file

@ -1125,7 +1125,7 @@ class SorcSpark1 : Actor
+NOBLOCKMAP
+DROPOFF
+NOTELEPORT
+ZDOOMADD
+ZDOOMTRANS
RenderStyle "Add";
}
States

6
wadsrc/static/zscript/hexen/magelightning.txt
View file

@ -165,7 +165,7 @@ class LightningCeiling : Lightning
Damage 8;
Projectile;
+CEILINGHUGGER
+ZDOOMADD
+ZDOOMTRANS
RenderStyle "Add";
}
@ -320,7 +320,7 @@ class LightningFloor : LightningCeiling
{
-CEILINGHUGGER
+FLOORHUGGER
+ZDOOMADD
+ZDOOMTRANS
RenderStyle "Add";
}
@ -376,7 +376,7 @@ class LightningZap : Actor
Projectile;
-ACTIVATEIMPACT
-ACTIVATEPCROSS
+ZDOOMADD
+ZDOOMTRANS
RenderStyle "Add";
Obituary "$OB_MPMWEAPLIGHTNING";
}

2
wadsrc/static/zscript/hexen/scriptprojectiles.txt
View file

@ -11,7 +11,7 @@ class FireBall : Actor
DamageType "Fire";
+NOBLOCKMAP +NOGRAVITY +DROPOFF +MISSILE
+NOTELEPORT
+ZDOOMADD
+ZDOOMTRANS
RenderStyle "Add";
DeathSound "Fireball";
}

2
wadsrc/static/zscript/hexen/serpent.txt
View file

@ -317,7 +317,7 @@ class SerpentFX : Actor
Damage 4;
Projectile;
-ACTIVATEIMPACT -ACTIVATEPCROSS
+ZDOOMADD
+ZDOOMTRANS
RenderStyle "Add";
DeathSound "SerpentFXHit";
}

2
wadsrc/static/zscript/raven/minotaur.txt
View file

@ -655,7 +655,7 @@ class MinotaurFX1 : Actor
Projectile;
-ACTIVATEIMPACT
-ACTIVATEPCROSS
+ZDOOMADD
+ZDOOMTRANS
RenderStyle "Add";
}
States

2
wadsrc/static/zscript/strife/sentinel.txt
View file

@ -97,7 +97,7 @@ class SentinelFX1 : Actor
DamageType "Disintegrate";
Projectile;
+STRIFEDAMAGE
+ZDOOMADD
+ZDOOMTRANS
MaxStepHeight 4;
RenderStyle "Add";
}

4
wadsrc/static/zscript/strife/spectral.txt
View file

@ -112,7 +112,7 @@ class SpectralLightningBase : Actor
+ACTIVATEIMPACT
+ACTIVATEPCROSS
+STRIFEDAMAGE
+ZDOOMADD
+ZDOOMTRANS
MaxStepHeight 4;
RenderStyle "Add";
SeeSound "weapons/sigil";
@ -258,7 +258,7 @@ class SpectralLightningHTail : Actor
+NOBLOCKMAP
+NOGRAVITY
+DROPOFF
+ZDOOMADD
+ZDOOMTRANS
RenderStyle "Add";
}
States

2
wadsrc/static/zscript/strife/strifestuff.txt
View file

@ -632,7 +632,7 @@ class TeleportSwirl : Actor
Default
{
+NOBLOCKMAP
+ZDOOMADD
+ZDOOMTRANS
RenderStyle "Add";
Alpha 0.25;
}

2
wadsrc/static/zscript/strife/strifeweapons.txt
View file

@ -40,7 +40,7 @@ class StrifeSpark : StrifePuff
{
Default
{
+ZDOOMADD
+ZDOOMTRANS
RenderStyle "Add";
}
States

2
wadsrc/static/zscript/strife/thingstoblowup.txt
View file

@ -49,7 +49,7 @@ class Bang4Cloud : Actor
{
+NOBLOCKMAP
+NOGRAVITY
+ZDOOMADD
+ZDOOMTRANS
RenderStyle "Add";
VSpeed 1;
}

2
wadsrc/static/zscript/strife/weaponflamer.txt
View file

@ -85,7 +85,7 @@ class FlameMissile : Actor
Projectile;
-NOGRAVITY
+STRIFEDAMAGE
+ZDOOMADD
+ZDOOMTRANS
MaxStepHeight 4;
RenderStyle "Add";
SeeSound "weapons/flamethrower";

2
wadsrc/static/zscript/strife/weapongrenade.txt
View file

@ -217,7 +217,7 @@ class PhosphorousFire : Actor
+NOTELEPORT
+NODAMAGETHRUST
+DONTSPLASH
+ZDOOMADD
+ZDOOMTRANS
RenderStyle "Add";
Obituary "$OB_MPPHOSPHOROUSGRENADE";
}

6
wadsrc/static/zscript/strife/weaponmauler.txt
View file

@ -181,7 +181,7 @@ class MaulerPuff : Actor
+NOBLOCKMAP
+NOGRAVITY
+PUFFONACTORS
+ZDOOMADD
+ZDOOMTRANS
RenderStyle "Add";
DamageType "Disintegrate";
}
@ -207,7 +207,7 @@ class MaulerTorpedo : Actor
DamageType "Disintegrate";
Projectile;
+STRIFEDAMAGE
+ZDOOMADD
+ZDOOMTRANS
MaxStepHeight 4;
RenderStyle "Add";
SeeSound "weapons/mauler2fire";
@ -270,7 +270,7 @@ class MaulerTorpedoWave : Actor
DamageType "Disintegrate";
Projectile;
+STRIFEDAMAGE
+ZDOOMADD
+ZDOOMTRANS
MaxStepHeight 4;
RenderStyle "Add";
Obituary "$OB_MPMAULER";