This commit is contained in:
parent
3a25edb723
commit
6f9aa791a2
1 changed files with 13 additions and 7 deletions
|
@ -41,8 +41,12 @@ void CFXGeyser::shutdown()
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
void CFXGeyser::think(int Frames)
|
void CFXGeyser::think(int Frames)
|
||||||
{
|
{
|
||||||
|
if (getParent())
|
||||||
|
{ // make huge box
|
||||||
setCollisionCentreOffset(0,-512/2);
|
setCollisionCentreOffset(0,-512/2);
|
||||||
setCollisionSize(32,512);
|
setCollisionSize(32,512);
|
||||||
|
}
|
||||||
|
|
||||||
CFX::think(Frames);
|
CFX::think(Frames);
|
||||||
Pos=BasePos;
|
Pos=BasePos;
|
||||||
currentFrame++;
|
currentFrame++;
|
||||||
|
@ -115,11 +119,13 @@ int W;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//int FrameW=Ft4->x1-Ft4->x0;
|
if (!Parent)
|
||||||
// setCollisionCentreOffset(FrameW>>1,-Height/2);
|
{
|
||||||
// setCollisionCentreOffset(0,-Height/2);
|
int FrameW=Ft4->x1-Ft4->x0;
|
||||||
// setCollisionSize(FrameW,Height);
|
setCollisionCentreOffset(FrameW>>1,-Height/2);
|
||||||
|
setCollisionCentreOffset(0,-Height/2);
|
||||||
|
setCollisionSize(FrameW,Height);
|
||||||
|
}
|
||||||
// Base
|
// Base
|
||||||
Ft4=SprBank->printFT4(FRM__GUSHBASE,RenderPos.vx-8,RenderPos.vy,currentFrame&2,0/*currentFrame&2*/,OtPos);
|
Ft4=SprBank->printFT4(FRM__GUSHBASE,RenderPos.vx-8,RenderPos.vy,currentFrame&2,0/*currentFrame&2*/,OtPos);
|
||||||
setShadeTex(Ft4,0);
|
setShadeTex(Ft4,0);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue