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-03-06 20:13:16 +00:00
parent ff8ebd213b
commit f93f6f0643
6 changed files with 187 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
source/enemy/ngeneric.cpp
View file

@ -222,7 +222,7 @@ void CNpcEnemy::processGenericFixedPathMove( int _frames, s32 *moveX, s32 *moveY
*moveVel = ( _frames * m_data[m_type].speed ) << 8;
processGroundCollisionReverse( moveX, moveY );
//processGroundCollisionReverse( moveX, moveY );
}
}

25
source/enemy/npc.cpp
View file

@ -209,7 +209,7 @@ void CNpcEnemy::init()
{
CEnemyThing::init();
m_type = NPC_CLAM_STATIC;
m_type = NPC_LINEAR_PLATFORM;
// sActorHdr *Hdr = m_skel.Load( m_data[m_type].skelType );
// m_skel.Init( Hdr );
@ -256,25 +256,25 @@ void CNpcEnemy::init()
newPos.vx = 100;
//newPos.vy = 10;
newPos.vy = 400;
newPos.vy = 100;
m_npcPath.addWaypoint( newPos );
newPos.vx = 500;
//newPos.vy = 10;
newPos.vy = 400;
newPos.vy = 100;
m_npcPath.addWaypoint( newPos );
newPos.vx = 500;
//newPos.vy = 100;
newPos.vy = 350;
newPos.vy = 300;
m_npcPath.addWaypoint( newPos );
newPos.vx = 100;
//newPos.vy = 100;
newPos.vy = 350;
newPos.vy = 300;
m_npcPath.addWaypoint( newPos );
@ -527,8 +527,19 @@ void CNpcEnemy::collidedWith( CThing *_thisThing )
{
if ( m_data[m_type].detectCollision )
{
m_oldControlFunc = m_controlFunc;
m_controlFunc = NPC_CONTROL_COLLISION;
if ( m_data[m_type].damageToUserType == DAMAGE__NONE )
{
// if we can detect a collision, but the collision does no damage, this must be a platform
CPlayer *player = (CPlayer *) _thisThing;
player->setPlatform( this );
}
else
{
m_oldControlFunc = m_controlFunc;
m_controlFunc = NPC_CONTROL_COLLISION;
}
}
break;

5
source/enemy/npcdata.cpp
View file

@ -174,8 +174,9 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
NPC_TIMER_NONE,
false,
3,
128,
false,
//512,
2048,
true,
DAMAGE__NONE,
0,
},