diff --git a/source/fx/fxfire.cpp b/source/fx/fxfire.cpp index 25e9c442c..99ac952ef 100644 --- a/source/fx/fxfire.cpp +++ b/source/fx/fxfire.cpp @@ -54,7 +54,7 @@ int FYO=0; setRGB0(Frame,FC,FC,FC); setSemiTrans(Frame,1); Frame->tpage|=FT<<5; - Frame->u1--; Frame->u2--; + Frame->u1--; Frame->u3--; Frame->v2--; Frame->v3--; if (CurrentHeading<1024*1) diff --git a/source/fx/fxgeyser.cpp b/source/fx/fxgeyser.cpp index 6f3b4ee5a..bfb93c127 100644 --- a/source/fx/fxgeyser.cpp +++ b/source/fx/fxgeyser.cpp @@ -24,6 +24,7 @@ void CFXGeyser::init(DVECTOR const &_Pos) SoundId = NOT_PLAYING; BasePos=_Pos; OtPos+=3; + } /*****************************************************************************/ @@ -40,6 +41,8 @@ void CFXGeyser::shutdown() /*****************************************************************************/ void CFXGeyser::think(int Frames) { + setCollisionCentreOffset(0,-512/2); + setCollisionSize(32,512); CFX::think(Frames); Pos=BasePos; currentFrame++; @@ -112,10 +115,10 @@ int W; } -int FrameW=Ft4->x1-Ft4->x0; - setCollisionCentreOffset(FrameW>>1,-Height/2); - setCollisionCentreOffset(0,-Height/2); - setCollisionSize(FrameW,Height); +//int FrameW=Ft4->x1-Ft4->x0; +// setCollisionCentreOffset(FrameW>>1,-Height/2); +// setCollisionCentreOffset(0,-Height/2); +// setCollisionSize(FrameW,Height); // Base Ft4=SprBank->printFT4(FRM__GUSHBASE,RenderPos.vx-8,RenderPos.vy,currentFrame&2,0/*currentFrame&2*/,OtPos);