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

Browse source
This commit is contained in:
Charles 2001-07-06 15:21:14 +00:00
parent d00521459d
commit c483e466aa
6 changed files with 27 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
Graphics/levels/Chapter02/Level04/Level04.MEX
View file

Binary file not shown.

BIN
Graphics/levels/Chapter02/Level04/level04.Mep
View file

Binary file not shown.

2
source/enemy/ndogfish.cpp
View file

@ -436,7 +436,7 @@ void CNpcIronDogfishEnemy::hasBeenSteamed( DVECTOR &steamPos )
//hasBeenAttacked(); //hasBeenAttacked();
m_steamTimer = 4 * GameState::getOneSecondInFrames(); m_steamTimer = 4 * GameState::getOneSecondInFrames();
m_effect->killFX(); //m_effect->killFX();
} }
} }

30
source/enemy/nfdutch.cpp
View file

@ -753,6 +753,18 @@ void CNpcFlyingDutchmanEnemy::collidedWith(CThing *_thisThing)
m_controlFunc = NPC_CONTROL_SHOT; m_controlFunc = NPC_CONTROL_SHOT;
m_state = NPC_GENERIC_HIT_CHECK_HEALTH; m_state = NPC_GENERIC_HIT_CHECK_HEALTH;
s32 minX, maxX;
m_npcPath.getPathXExtents( &minX, &maxX );
if ( m_extension == minX )
{
m_extension = maxX;
}
else
{
m_extension = minX;
}
drawAttackEffect(); drawAttackEffect();
} }
} }
@ -797,14 +809,20 @@ u8 CNpcFlyingDutchmanEnemy::hasBeenAttacked()
m_fadeDown = true; m_fadeDown = true;
m_timerTimer = 0; m_timerTimer = 0;
m_fireCount = 0;*/ m_fireCount = 0;*/
s32 minX, maxX;
m_npcPath.getPathXExtents( &minX, &maxX );
if ( m_extension == minX )
{
m_extension = maxX;
}
else
{
m_extension = minX;
}
} }
} }
return( true ); return( true );
} }
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
void CNpcFlyingDutchmanEnemy::shakePlatformLoose()
{
}

1
source/enemy/nfdutch.h
View file

@ -33,7 +33,6 @@ protected:
void processShotRecoil( int _frames ); void processShotRecoil( int _frames );
void processShotDeathEnd( int _frames ); void processShotDeathEnd( int _frames );
void collidedWith(CThing *_thisThing); void collidedWith(CThing *_thisThing);
void shakePlatformLoose();
enum NPC_FLYING_DUTCHMAN_STATE enum NPC_FLYING_DUTCHMAN_STATE
{ {

4
source/enemy/npcdata.cpp
View file

@ -434,7 +434,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
NPC_CLOSE_NONE, NPC_CLOSE_NONE,
NPC_TIMER_NONE, NPC_TIMER_NONE,
false, false,
4, 3,
64, 64,
DETECT_ALL_COLLISION, DETECT_ALL_COLLISION,
DAMAGE__SHOCK_ENEMY, DAMAGE__SHOCK_ENEMY,
@ -798,7 +798,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
NPC_CLOSE_NONE, NPC_CLOSE_NONE,
NPC_TIMER_NONE, NPC_TIMER_NONE,
false, false,
4, 3,
256, 256,
DETECT_ALL_COLLISION, DETECT_ALL_COLLISION,
DAMAGE__SHOCK_ENEMY, DAMAGE__SHOCK_ENEMY,