This commit is contained in:
parent
327ea61789
commit
f11067a0ff
@ -0,0 +1 @@
|
|||||||
|
static
|
@ -187,4 +187,5 @@ actors/SPIDERCRAB.SBK
|
|||||||
actors/SPIKEYANENOME.SBK
|
actors/SPIKEYANENOME.SBK
|
||||||
actors/STOMPER.SBK
|
actors/STOMPER.SBK
|
||||||
|
|
||||||
actors/SHARKSUB.SBK
|
actors/SHARKSUB.SBK
|
||||||
|
actors/MOTHERJELLYFISH.SBK
|
@ -113,7 +113,7 @@ ACTOR_NPC := BarnacleBoy Krusty Squidward Gary Sandy Patrick MermaidMan
|
|||||||
ACTOR_ENEMY := Anenome BabyOctopus Ballblob Caterpillar clam Dustdevil Eyeball \
|
ACTOR_ENEMY := Anenome BabyOctopus Ballblob Caterpillar clam Dustdevil Eyeball \
|
||||||
Flamingskull FlyingDutchman Ghost HermitCrab IronDogFish Lrgjellyfish \
|
Flamingskull FlyingDutchman Ghost HermitCrab IronDogFish Lrgjellyfish \
|
||||||
PuffaFish Sharkman Skeletalfish SpiderCrab SpikeyAnenome Stomper \
|
PuffaFish Sharkman Skeletalfish SpiderCrab SpikeyAnenome Stomper \
|
||||||
SharkSub
|
SharkSub Motherjellyfish
|
||||||
|
|
||||||
# Boogermonster GiantWorm Jellyfish2 Motherjellyfish Nautilus Neptune SeaSnake SharkSub
|
# Boogermonster GiantWorm Jellyfish2 Motherjellyfish Nautilus Neptune SeaSnake SharkSub
|
||||||
|
|
||||||
|
@ -223,7 +223,9 @@ void CNpcMotherJellyfishEnemy::processClose( int _frames )
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*void CNpcMotherJellyfishEnemy::render()
|
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
void CNpcMotherJellyfishEnemy::render()
|
||||||
{
|
{
|
||||||
SprFrame = NULL;
|
SprFrame = NULL;
|
||||||
|
|
||||||
@ -233,59 +235,22 @@ void CNpcMotherJellyfishEnemy::processClose( int _frames )
|
|||||||
|
|
||||||
// Render
|
// Render
|
||||||
DVECTOR renderPos;
|
DVECTOR renderPos;
|
||||||
DVECTOR origRenderPos;
|
|
||||||
DVECTOR offset = CLevel::getCameraPos();
|
DVECTOR offset = CLevel::getCameraPos();
|
||||||
int spriteWidth = m_spriteBank->getFrameWidth( m_frame >> 8 );
|
|
||||||
int spriteHeight = m_spriteBank->getFrameHeight( m_frame >> 8 );
|
|
||||||
|
|
||||||
renderPos.vx = Pos.vx - offset.vx;
|
renderPos.vx = Pos.vx - offset.vx;
|
||||||
origRenderPos.vx = renderPos.vx;
|
|
||||||
renderPos.vx += m_drawOffset.vx;
|
|
||||||
|
|
||||||
renderPos.vy = Pos.vy - offset.vy;
|
renderPos.vy = Pos.vy - offset.vy;
|
||||||
origRenderPos.vy = renderPos.vy;
|
|
||||||
renderPos.vy += m_drawOffset.vy - ( spriteHeight >> 1 );
|
|
||||||
|
|
||||||
if ( renderPos.vx >= 0 && renderPos.vx <= VidGetScrW() )
|
if ( renderPos.vx >= 0 && renderPos.vx <= VidGetScrW() )
|
||||||
{
|
{
|
||||||
if ( renderPos.vy >= 0 && renderPos.vy <= VidGetScrH() )
|
if ( renderPos.vy >= 0 && renderPos.vy <= VidGetScrH() )
|
||||||
{
|
{
|
||||||
SprFrame = m_spriteBank->printRotatedScaledSprite( FRM_JELLYFISH1_SWIM1,renderPos.vx,renderPos.vy,4096,4096,0,10);
|
SprFrame = m_actorGfx->Render(renderPos,m_animNo,( m_frame >> 8 ),m_reversed);
|
||||||
setRGB0( SprFrame, 255, 128, 255 );
|
m_actorGfx->RotateScale( SprFrame, renderPos, m_drawRotation, 8192, 8192 );
|
||||||
|
|
||||||
// get xmax, xmin, ymax, ymin
|
sBBox boundingBox = m_actorGfx->GetBBox();
|
||||||
|
setCollisionSize( ( boundingBox.XMax - boundingBox.XMin ), ( boundingBox.YMax - boundingBox.YMin ) );
|
||||||
s32 XMax;
|
setCollisionCentreOffset( ( boundingBox.XMax + boundingBox.XMin ) >> 1, ( boundingBox.YMax + boundingBox.YMin ) >> 1 );
|
||||||
s32 XMin;
|
|
||||||
|
|
||||||
s32 YMax;
|
|
||||||
s32 YMin;
|
|
||||||
|
|
||||||
XMin=SprFrame->x0;
|
|
||||||
if (XMin>SprFrame->x1) XMin=SprFrame->x1;
|
|
||||||
if (XMin>SprFrame->x2) XMin=SprFrame->x2;
|
|
||||||
if (XMin>SprFrame->x3) XMin=SprFrame->x3;
|
|
||||||
XMax=SprFrame->x0;
|
|
||||||
if (XMax<SprFrame->x1) XMax=SprFrame->x1;
|
|
||||||
if (XMax<SprFrame->x2) XMax=SprFrame->x2;
|
|
||||||
if (XMax<SprFrame->x3) XMax=SprFrame->x3;
|
|
||||||
YMin=SprFrame->y0;
|
|
||||||
if (YMin>SprFrame->y1) YMin=SprFrame->y1;
|
|
||||||
if (YMin>SprFrame->y2) YMin=SprFrame->y2;
|
|
||||||
if (YMin>SprFrame->y3) YMin=SprFrame->y3;
|
|
||||||
YMax=SprFrame->y0;
|
|
||||||
if (YMax<SprFrame->y1) YMax=SprFrame->y1;
|
|
||||||
if (YMax<SprFrame->y2) YMax=SprFrame->y2;
|
|
||||||
if (YMax<SprFrame->y3) YMax=SprFrame->y3;
|
|
||||||
|
|
||||||
XMax -= origRenderPos.vx;
|
|
||||||
XMin -= origRenderPos.vx;
|
|
||||||
YMax -= origRenderPos.vy;
|
|
||||||
YMin -= origRenderPos.vy;
|
|
||||||
|
|
||||||
setCollisionSize( ( XMax - XMin ), ( YMax - YMin ) );
|
|
||||||
setCollisionCentreOffset( ( XMax + XMin ) >> 1, ( YMax + YMin ) >> 1 );
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}*/
|
}
|
||||||
|
@ -18,7 +18,7 @@ class CNpcMotherJellyfishEnemy : public CNpcEnemy
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
virtual void postInit();
|
virtual void postInit();
|
||||||
//void render();
|
void render();
|
||||||
protected:
|
protected:
|
||||||
virtual void processClose( int _frames );
|
virtual void processClose( int _frames );
|
||||||
virtual void processMovement( int _frames );
|
virtual void processMovement( int _frames );
|
||||||
|
@ -771,7 +771,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
|
|||||||
},
|
},
|
||||||
|
|
||||||
{ // NPC_MOTHER_JELLYFISH
|
{ // NPC_MOTHER_JELLYFISH
|
||||||
ACTORS_CLAM_SBK,
|
ACTORS_MOTHERJELLYFISH_SBK,
|
||||||
ANIM_CLAM_SIDESNAP,
|
ANIM_CLAM_SIDESNAP,
|
||||||
NPC_SENSOR_NONE,
|
NPC_SENSOR_NONE,
|
||||||
NPC_MOVEMENT_STATIC,
|
NPC_MOVEMENT_STATIC,
|
||||||
|
@ -1904,6 +1904,10 @@ SOURCE=..\..\..\out\USA\include\ACTOR_LRGJELLYFISH_Anim.h
|
|||||||
# End Source File
|
# End Source File
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=..\..\..\out\USA\include\ACTOR_MOTHERJELLYFISH_Anim.h
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
SOURCE=..\..\..\out\USA\include\ACTOR_PATRICK_Anim.h
|
SOURCE=..\..\..\out\USA\include\ACTOR_PATRICK_Anim.h
|
||||||
# End Source File
|
# End Source File
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
|
Loading…
Reference in New Issue
Block a user