Mirrors/SBSPSS
1
0
Fork 0
Code Releases Activity

Browse Source
This commit is contained in:
Charles 2001-06-11 21:49:49 +00:00
parent 7e7975ba2b
commit b9f3116c28
7 changed files with 250 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Graphics/characters/IronDogFish/AnimList.Txt
View File

@ -2,4 +2,5 @@ gethit
idle
punch
tailsmash
walk
walk
die

2
Graphics/characters/SharkSub/AnimList.txt
View File

@ -1,5 +1,5 @@
chomp
# death
death
# gethit
# sprintclosed
sprintopen

117
source/enemy/ndogfish.cpp
View File

@ -35,6 +35,10 @@
#include <ACTOR_IRONDOGFISH_ANIM.h>
#endif
#ifndef __VID_HEADER_
#include "system\vid.h"
#endif
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@ -333,3 +337,116 @@ void CNpcIronDogfishEnemy::processTimer(int _frames)
CNpcEnemy::processTimer( _frames );
}
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
void CNpcIronDogfishEnemy::processShot( int _frames )
{
switch( m_data[m_type].shotFunc )
{
case NPC_SHOT_NONE:
{
// do nothing
break;
}
case NPC_SHOT_GENERIC:
{
switch ( m_state )
{
case NPC_GENERIC_HIT_CHECK_HEALTH:
{
m_health -= 5;
if ( m_health < 0 )
{
m_state = NPC_GENERIC_HIT_DEATH_START;
m_isDying = true;
}
else
{
m_state = NPC_GENERIC_HIT_RECOIL;
m_animPlaying = true;
m_animNo = m_data[m_type].recoilAnim;
m_frame = 0;
}
break;
}
case NPC_GENERIC_HIT_RECOIL:
{
if ( !m_animPlaying )
{
m_state = 0;
m_controlFunc = NPC_CONTROL_MOVEMENT;
}
break;
}
case NPC_GENERIC_HIT_DEATH_START:
{
m_animPlaying = true;
m_animNo = m_data[m_type].dieAnim;
m_frame = 0;
m_state = NPC_GENERIC_HIT_DEATH_END;
m_isDying = true;
if ( m_data[m_type].deathSfx < CSoundMediator::NUM_SFXIDS )
{
CSoundMediator::playSfx( m_data[m_type].deathSfx );
}
m_speed = -5;
if (m_data[m_type].skelType)
{
m_actorGfx->SetOtPos( 0 );
}
break;
}
case NPC_GENERIC_HIT_DEATH_END:
{
if ( !m_animPlaying )
{
m_drawRotation += 64 * _frames;
m_drawRotation &= 4095;
Pos.vy += m_speed * _frames;
if ( m_speed < 5 )
{
m_speed++;
}
DVECTOR offset = CLevel::getCameraPos();
if ( Pos.vy - offset.vy > VidGetScrH() )
{
if ( m_data[m_type].respawning )
{
m_isActive = false;
m_timerFunc = NPC_TIMER_RESPAWN;
m_timerTimer = 4 * GameState::getOneSecondInFrames();
}
else
{
setToShutdown();
}
}
}
break;
}
}
break;
}
}
}

1
source/enemy/ndogfish.h
View File

@ -27,6 +27,7 @@ protected:
void processWalkToUser( int _frames, int speed );
virtual void processAttackCollision();
virtual void hasBeenSteamed( DVECTOR &steamPos );
virtual void processShot( int _frames );
enum NPC_IRON_DOGFISH_STATE
{

8
source/enemy/npcdata.cpp
View File

@ -935,7 +935,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
50,
0,
NPC_SHOT_GENERIC,
0,
ANIM_SHARKSUB_DEATH,
0,
false,
false,
@ -943,7 +943,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
false,
CSoundMediator::NUM_SFXIDS,
CSoundMediator::NUM_SFXIDS,
false,
true,
},
{ // NPC_PARASITIC_WORM
@ -1013,7 +1013,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
50,
ANIM_IRONDOGFISH_WALK,
NPC_SHOT_GENERIC,
0,
ANIM_IRONDOGFISH_DIE,
ANIM_IRONDOGFISH_GETHIT,
false,
false,
@ -1021,7 +1021,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
false,
CSoundMediator::NUM_SFXIDS,
CSoundMediator::NUM_SFXIDS,
false,
true,
},
{ // NPC_PARASITIC_WORM_SEGMENT

125
source/enemy/nsshark.cpp
View File

@ -35,6 +35,12 @@
#include <ACTOR_SHARKSUB_ANIM.h>
#endif
#ifndef __VID_HEADER_
#include "system\vid.h"
#endif
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
void CNpcSubSharkEnemy::postInit()
{
@ -44,6 +50,8 @@ void CNpcSubSharkEnemy::postInit()
m_salvoCount = 0;
}
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
void CNpcSubSharkEnemy::processMovement( int _frames )
{
if ( !m_animPlaying )
@ -152,6 +160,8 @@ void CNpcSubSharkEnemy::processMovement( int _frames )
}*/
}
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
void CNpcSubSharkEnemy::processClose( int _frames )
{
if ( m_state != SUB_SHARK_SWALLOW )
@ -276,4 +286,117 @@ void CNpcSubSharkEnemy::processClose( int _frames )
break;
}
}
}
}
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
void CNpcSubSharkEnemy::processShot( int _frames )
{
switch( m_data[m_type].shotFunc )
{
case NPC_SHOT_NONE:
{
// do nothing
break;
}
case NPC_SHOT_GENERIC:
{
switch ( m_state )
{
case NPC_GENERIC_HIT_CHECK_HEALTH:
{
m_health -= 5;
if ( m_health < 0 )
{
m_state = NPC_GENERIC_HIT_DEATH_START;
m_isDying = true;
}
else
{
m_state = NPC_GENERIC_HIT_RECOIL;
m_animPlaying = true;
m_animNo = m_data[m_type].recoilAnim;
m_frame = 0;
}
break;
}
case NPC_GENERIC_HIT_RECOIL:
{
if ( !m_animPlaying )
{
m_state = 0;
m_controlFunc = NPC_CONTROL_MOVEMENT;
}
break;
}
case NPC_GENERIC_HIT_DEATH_START:
{
m_animPlaying = true;
m_animNo = m_data[m_type].dieAnim;
m_frame = 0;
m_state = NPC_GENERIC_HIT_DEATH_END;
m_isDying = true;
if ( m_data[m_type].deathSfx < CSoundMediator::NUM_SFXIDS )
{
CSoundMediator::playSfx( m_data[m_type].deathSfx );
}
m_speed = -5;
if (m_data[m_type].skelType)
{
m_actorGfx->SetOtPos( 0 );
}
break;
}
case NPC_GENERIC_HIT_DEATH_END:
{
if ( !m_animPlaying )
{
m_drawRotation += 64 * _frames;
m_drawRotation &= 4095;
Pos.vy += m_speed * _frames;
if ( m_speed < 5 )
{
m_speed++;
}
DVECTOR offset = CLevel::getCameraPos();
if ( Pos.vy - offset.vy > VidGetScrH() )
{
if ( m_data[m_type].respawning )
{
m_isActive = false;
m_timerFunc = NPC_TIMER_RESPAWN;
m_timerTimer = 4 * GameState::getOneSecondInFrames();
}
else
{
setToShutdown();
}
}
}
break;
}
}
break;
}
}
}

1
source/enemy/nsshark.h
View File

@ -21,6 +21,7 @@ public:
protected:
virtual void processClose( int _frames );
virtual void processMovement( int _frames );
virtual void processShot( int _frames );
enum NPC_SUB_SHARK_STATE
{