OrdinaryMagician/flak_m
OrdinaryMagician/flak_m
1
Fork 0
Code Activity

Small fix for translocator modules bouncing on bridge actors.

Browse source
This commit is contained in:
Marisa the Magician 2019-08-11 17:25:07 +02:00
commit a8a720ab81
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
zscript/translocator.zsc
View file

@ -132,6 +132,7 @@ Class TranslocatorModule : Actor
+MOVEWITHSECTOR; +MOVEWITHSECTOR;
+CANBOUNCEWATER; +CANBOUNCEWATER;
+BLOCKASPLAYER; +BLOCKASPLAYER;
-ALLOWBOUNCEONACTORS;
BounceType "Hexen"; BounceType "Hexen";
BounceFactor 0.3; BounceFactor 0.3;
WallBounceFactor 0.3; WallBounceFactor 0.3;
@ -218,7 +219,7 @@ Class TranslocatorModule : Actor
{ {
A_SetPitch(0); A_SetPitch(0);
A_PlaySound("transloc/bounce"); A_PlaySound("transloc/bounce");
if ( BlockingFloor ) alreadyhit = true; if ( BlockingFloor || (tracer && (pos.z >= tracer.pos.z+tracer.height) && tracer.bACTLIKEBRIDGE) ) alreadyhit = true;
} }
} }
Goto Spawn; Goto Spawn;
@ -226,7 +227,7 @@ Class TranslocatorModule : Actor
TMOD A 0 TMOD A 0
{ {
A_SetPitch(0); A_SetPitch(0);
if ( tracer ) if ( tracer && !tracer.bACTLIKEBRIDGE )
{ {
SetOrigin(tracer.Vec2OffsetZ(0,0,pos.z),false); SetOrigin(tracer.Vec2OffsetZ(0,0,pos.z),false);
vel.xy *= 0; vel.xy *= 0;