From 71425a94af33498e27c7cb78bb64d6fbbaf4589e Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Tue, 13 Dec 2022 18:21:33 +0100 Subject: [PATCH] - fixed pipe bombs sticking to ceilings. This was a typical case of doing too many things in one function - the bogus code was for one of RR's special projectiles piggybacking on the same function and doing it wrong. --- wadsrc/static/zscript/games/duke/actors/heavyhbomb.zs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wadsrc/static/zscript/games/duke/actors/heavyhbomb.zs b/wadsrc/static/zscript/games/duke/actors/heavyhbomb.zs index 28c702f9c..f465592e8 100644 --- a/wadsrc/static/zscript/games/duke/actors/heavyhbomb.zs +++ b/wadsrc/static/zscript/games/duke/actors/heavyhbomb.zs @@ -77,13 +77,13 @@ class DukePipeBomb : DukeActor self.PlayActorSound("PIPEBOMB_BOUNCE"); } self.vel.Z = -(4 - self.yint); - if (sectp.lotag == 2) + if (sectp.lotag == ST_2_UNDERWATER) self.vel.Z *= 0.25; self.yint++; } - if (self.pos.Z < self.ceilingz + 16 && (!Raze.isRR() || sectp.lotag != ST_2_UNDERWATER)) // underwater check only for RR + if (self.pos.Z < self.ceilingz) { - self.pos.Z = self.ceilingz + self.detail; + self.pos.Z = self.ceilingz + 3; self.vel.Z = 0; }