OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Fix Eviscerator chunks passing through solids.

Browse source
This commit is contained in:
Mari the Deer 2022-12-08 14:42:13 +01:00
commit dc2e3d0a55
3 changed files with 6 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
zscript/weapons/swwm_danmaku_fx.zsc
View file

@ -297,17 +297,17 @@ Class EvisceratorChunk : Actor
override bool CanCollideWith( Actor other, bool passive )
{
// safer to do here
if ( !(other.bSHOOTABLE && other.bSOLID) || ((vel.length() <= 5) && other.bSHOOTABLE) || ((other == target) && !bHITOWNER) || (other == lasthit) )
if ( !(other.bSHOOTABLE || other.bSOLID) || ((vel.length() <= 5) && other.bSHOOTABLE) || ((other == target) && !bHITOWNER) || (other == lasthit) )
return false;
return true;
}
override int SpecialMissileHit( Actor victim )
{
// directly bounce off shootable solids
// directly bounce off non-shootable solids
if ( !victim.bSHOOTABLE )
{
if ( bSOLID )
if ( victim.bSOLID )
{
BlockingMobj = victim;
A_HandleBounce();