zdoom
/
gzdoom-gles
mirror of https://github.com/ZDoom/gzdoom-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Rachael Alexanderson 2016-12-24 02:31:38 -05:00
parent fa622710f1 4fcf9933f0
commit 4755d56bbe
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/compatibility.cpp
View File

@ -533,8 +533,9 @@ void SetCompatibilityParams()
if (CompatParams[i+1] < numsectors) if (CompatParams[i+1] < numsectors)
{ {
sector_t *sec = &sectors[CompatParams[i+1]]; sector_t *sec = &sectors[CompatParams[i+1]];
sec->floorplane.ChangeHeight(CompatParams[i+2]); const double delta = CompatParams[i + 2] / 65536.0;
sec->ChangePlaneTexZ(sector_t::floor, CompatParams[i+2] / 65536.); sec->floorplane.ChangeHeight(delta);
sec->ChangePlaneTexZ(sector_t::floor, delta);
} }
i += 3; i += 3;
break; break;

15
wadsrc/static/zscript/doom/archvile.txt
View File

@ -125,25 +125,26 @@ extend class Actor
void A_VileAttack(sound snd = "vile/stop", int initialdmg = 20, int blastdmg = 70, int blastradius = 70, double thrust = 1.0, name damagetype = "Fire", int flags = 0) void A_VileAttack(sound snd = "vile/stop", int initialdmg = 20, int blastdmg = 70, int blastradius = 70, double thrust = 1.0, name damagetype = "Fire", int flags = 0)
{ {
if (target) Actor targ = target;
if (targ)
{ {
A_FaceTarget(); A_FaceTarget();
if (!CheckSight(target, 0)) return; if (!CheckSight(targ, 0)) return;
A_PlaySound(snd, CHAN_WEAPON); A_PlaySound(snd, CHAN_WEAPON);
int newdam = target.DamageMobj (self, self, initialdmg, (flags & VAF_DMGTYPEAPPLYTODIRECT)? damagetype : 'none'); int newdam = targ.DamageMobj (self, self, initialdmg, (flags & VAF_DMGTYPEAPPLYTODIRECT)? damagetype : 'none');
TraceBleed (newdam > 0 ? newdam : initialdmg, target); TraceBleed (newdam > 0 ? newdam : initialdmg, targ);
Actor fire = tracer; Actor fire = tracer;
if (fire) if (fire)
{ {
// move the fire between the vile and the player // move the fire between the vile and the player
fire.SetOrigin(target.Vec3Angle(-24., angle, 0), true); fire.SetOrigin(targ.Vec3Angle(-24., angle, 0), true);
fire.A_Explode(blastdmg, blastradius, XF_NOSPLASH, false, 0, 0, 0, "BulletPuff", damagetype); fire.A_Explode(blastdmg, blastradius, XF_NOSPLASH, false, 0, 0, 0, "BulletPuff", damagetype);
} }
if (!target.bDontThrust) if (!targ.bDontThrust)
{ {
target.Vel.z = thrust * 1000 / max(1, target.Mass); targ.Vel.z = thrust * 1000 / max(1, targ.Mass);
} }
} }
} }