This commit is contained in:
parent
92f0682887
commit
1efe7336c4
@ -72,10 +72,10 @@ CFX *NewFX;
|
|||||||
NewFX=new ("JellyFish Legs") CFXJellyFishLegs();
|
NewFX=new ("JellyFish Legs") CFXJellyFishLegs();
|
||||||
break;
|
break;
|
||||||
case FX_TYPE_BUBBLE:
|
case FX_TYPE_BUBBLE:
|
||||||
case FX_TYPE_BUBBLE_WATER:
|
case FX_TYPE_BUBBLE_WATER:
|
||||||
case FX_TYPE_BUBBLE_ACID:
|
case FX_TYPE_BUBBLE_ACID:
|
||||||
case FX_TYPE_BUBBLE_LAVA:
|
case FX_TYPE_BUBBLE_LAVA:
|
||||||
case FX_TYPE_BUBBLE_OIL:
|
case FX_TYPE_BUBBLE_OIL:
|
||||||
case FX_TYPE_LIGHTNING_BOLT:
|
case FX_TYPE_LIGHTNING_BOLT:
|
||||||
case FX_TYPE_LIGHTNING_SHEET:
|
case FX_TYPE_LIGHTNING_SHEET:
|
||||||
case FX_TYPE_LIGHTNING_BLAST:
|
case FX_TYPE_LIGHTNING_BLAST:
|
||||||
@ -84,22 +84,22 @@ CFX *NewFX;
|
|||||||
case FX_TYPE_SHOCKWAVE:
|
case FX_TYPE_SHOCKWAVE:
|
||||||
case FX_TYPE_DAZE:
|
case FX_TYPE_DAZE:
|
||||||
case FX_TYPE_DROP:
|
case FX_TYPE_DROP:
|
||||||
case FX_TYPE_DROP_WATER:
|
case FX_TYPE_DROP_WATER:
|
||||||
case FX_TYPE_DROP_ACID:
|
case FX_TYPE_DROP_ACID:
|
||||||
case FX_TYPE_DROP_LAVA:
|
case FX_TYPE_DROP_LAVA:
|
||||||
case FX_TYPE_DROP_OIL:
|
case FX_TYPE_DROP_OIL:
|
||||||
case FX_TYPE_SPLASH:
|
case FX_TYPE_SPLASH:
|
||||||
case FX_TYPE_SPLASH_WATER:
|
case FX_TYPE_SPLASH_WATER:
|
||||||
case FX_TYPE_SPLASH_ACID:
|
case FX_TYPE_SPLASH_ACID:
|
||||||
case FX_TYPE_SPLASH_LAVA:
|
case FX_TYPE_SPLASH_LAVA:
|
||||||
case FX_TYPE_SPLASH_OIL:
|
case FX_TYPE_SPLASH_OIL:
|
||||||
case FX_TYPE_CASCADE:
|
case FX_TYPE_CASCADE:
|
||||||
case FX_TYPE_CASCADE_SPLASH:
|
case FX_TYPE_CASCADE_SPLASH:
|
||||||
case FX_TYPE_FIREBALL:
|
case FX_TYPE_FIREBALL:
|
||||||
case FX_TYPE_CLOUD:
|
case FX_TYPE_CLOUD:
|
||||||
case FX_TYPE_CLOUD_STEAN:
|
case FX_TYPE_CLOUD_STEAN:
|
||||||
case FX_TYPE_CLOUD_SMOKE:
|
case FX_TYPE_CLOUD_SMOKE:
|
||||||
case FX_TYPE_CLOUD_GAS:
|
case FX_TYPE_CLOUD_GAS:
|
||||||
case FX_TYPE_FLAMES:
|
case FX_TYPE_FLAMES:
|
||||||
case FX_TYPE_EXPLODE:
|
case FX_TYPE_EXPLODE:
|
||||||
case FX_TYPE_DEBRIS:
|
case FX_TYPE_DEBRIS:
|
||||||
@ -109,17 +109,13 @@ CFX *NewFX;
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
NewFX->init();
|
|
||||||
// Pos=NewFX->getSizeForPlacement();
|
|
||||||
// Pos.vx=_pos->vx+(NewFXPos.vx/2);
|
|
||||||
// Pos.vy=_pos->vy+(NewFXPos.vy/2)-16;
|
|
||||||
// NewFX->setPos(&NewFXPos);
|
|
||||||
|
|
||||||
if (Parent)
|
if (Parent)
|
||||||
{
|
{
|
||||||
Parent->addChild(NewFX);
|
Parent->addChild(NewFX);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
NewFX->init();
|
||||||
|
|
||||||
return NewFX;
|
return NewFX;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -138,8 +134,8 @@ void CFX::init()
|
|||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
void CFX::shutdown()
|
void CFX::shutdown()
|
||||||
{
|
{
|
||||||
m_spriteBank->dump(); delete m_spriteBank;
|
m_spriteBank->dump(); delete m_spriteBank;
|
||||||
CFXThing::shutdown();
|
CFXThing::shutdown();
|
||||||
}
|
}
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
Loading…
Reference in New Issue
Block a user