zydronium/SBSPSS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Browse source
This commit is contained in:
Daveo 2001-05-21 14:52:09 +00:00
parent 2405173f37
commit 4258538252
4 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
source/enemy/neyeball.cpp
View file

@ -105,6 +105,8 @@ bool CNpcEyeballEnemy::processSensor()
void CNpcEyeballEnemy::processClose( int _frames ) void CNpcEyeballEnemy::processClose( int _frames )
{ {
CThing *Next=getNext();
if ( Next ) if ( Next )
{ {
CProjectile *projectile; CProjectile *projectile;
@ -265,6 +267,7 @@ void CNpcEyeballEnemy::processShot( int _frames )
m_actorGfx->SetOtPos( 0 ); m_actorGfx->SetOtPos( 0 );
} }
CThing *Next=getNext();
if ( Next ) if ( Next )
{ {
CProjectile *projectile; CProjectile *projectile;
@ -298,6 +301,7 @@ void CNpcEyeballEnemy::processShot( int _frames )
m_speed++; m_speed++;
} }
CThing *Next=getNext();
if ( Next ) if ( Next )
{ {
CProjectile *projectile; CProjectile *projectile;

9
source/fx/fxjfish.cpp
View file

@ -40,7 +40,7 @@ void CFXJellyFishLegs::shutdown()
/*****************************************************************************/ /*****************************************************************************/
void CFXJellyFishLegs::SetUp(int _Width,int _Gap,int _Length,int _Count) void CFXJellyFishLegs::SetUp(int _Width,int _Gap,int _Length,int _Count)
{ {
/*
XOfs=-(_Width/2); XOfs=-(_Width/2);
Width=_Width/_Gap; Width=_Width/_Gap;
Gap=_Gap; Gap=_Gap;
@ -74,7 +74,7 @@ int AInc=1024/Width;
HeightTable[H]=(s16)dH; HeightTable[H]=(s16)dH;
// printf("%i %i =%i\n",H,Ofs,HeightTable[H]); // printf("%i %i =%i\n",H,Ofs,HeightTable[H]);
} }
*/
} }
/*****************************************************************************/ /*****************************************************************************/
@ -84,7 +84,7 @@ int AInc=1024/Width;
int XT[]={-3,-2,-2,-2,-2,-1,-1,-1, +1,+1,+1,+2,+2,+2,+2,+3}; int XT[]={-3,-2,-2,-2,-2,-1,-1,-1, +1,+1,+1,+2,+2,+2,+2,+3};
void CFXJellyFishLegs::think(int _frames) void CFXJellyFishLegs::think(int _frames)
{ {
ASSERT(FXList); /* ASSERT(FXList);
CFX::think(_frames); CFX::think(_frames);
ListIdx--; ListIdx--;
@ -100,6 +100,7 @@ void CFXJellyFishLegs::think(int _frames)
ThisList[ListIdx].Ofs.vx+=XT[XO]; ThisList[ListIdx].Ofs.vx+=XT[XO];
} }
*/
} }
/*****************************************************************************/ /*****************************************************************************/
@ -111,6 +112,7 @@ int LY=32;
void CFXJellyFishLegs::render() void CFXJellyFishLegs::render()
{ {
/*
DVECTOR _MapOfs=CLevel::getCameraPos(); DVECTOR _MapOfs=CLevel::getCameraPos();
DVECTOR MapOfs; DVECTOR MapOfs;
int dRGB=256/Count; int dRGB=256/Count;
@ -160,4 +162,5 @@ s16 *dH=HeightTable;
} }
MapOfs.vx+=Gap; MapOfs.vx+=Gap;
} }
*/
} }

2
source/fx/fxjfish.h
View file

@ -22,7 +22,7 @@ virtual void think(int _frames);
virtual void render(); virtual void render();
void SetUp(int _Width,int _Gap,int _Length,int _Count); void SetUp(int _Width,int _Gap,int _Length,int _Count);
virtual CRECT const &getCollisionArea() {return (Parent->getCollisionArea());} //virtual CRECT const &getCollisionArea() {return (Parent->getCollisionArea());}
protected: protected:

1
source/projectl/projectl.cpp
View file

@ -261,6 +261,7 @@ void CProjectile::think(int _frames)
{ {
if ( processTargetSeek( _frames, m_initPos ) ) if ( processTargetSeek( _frames, m_initPos ) )
{ {
CThing *Parent=getParent();
Parent->processEvent( PROJECTILE_RETURNED_TO_SOURCE_EVENT, this ); Parent->processEvent( PROJECTILE_RETURNED_TO_SOURCE_EVENT, this );
m_heading = m_initHeading; m_heading = m_initHeading;
} }