Mirrors/SBSPSS
1
0
Fork 0
Code Releases Activity

Browse Source
This commit is contained in:
Charles 2001-05-10 20:27:33 +00:00
parent 78683c9539
commit 9a2314b3ad
5 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/enemy/npc.cpp
View File

@ -1284,6 +1284,7 @@ void CNpcEnemy::processCollision()
CPlayer *player = GameScene.getPlayer();
player->takeDamage( m_data[m_type].damageToUserType );
processUserCollision( (CThing *) player );
m_controlFunc = m_oldControlFunc;
}

2
source/enemy/npcdata.cpp
View File

@ -1045,7 +1045,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
2,
128,
DETECT_ALL_COLLISION,
DAMAGE__SHOCK_ENEMY,
DAMAGE__NONE,
16,
FRM_JELLYFISH1_SWIM1,
NPC_SHOT_GENERIC,

6
source/enemy/nsjback.cpp
View File

@ -193,6 +193,12 @@ void CNpcSmallJellyfishBackgroundEnemy::processUserCollision( CThing *thisThing
otherDelta.vy = -otherDelta.vy;
}
if ( !otherDelta.vx && !otherDelta.vy )
{
otherDelta.vx = ( 1 * xDist ) / abs( xDist );
otherDelta.vy = ( 1 * yDist ) / abs( yDist );
}
Pos.vx += otherDelta.vx;
Pos.vy += otherDelta.vy;

6
source/hazard/hboat.cpp
View File

@ -27,6 +27,11 @@
#include "system\vid.h"
#endif
#ifndef __PLAYER_PLAYER_H__
#include "player\player.h"
#endif
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
void CNpcBoatHazard::init()
@ -179,6 +184,7 @@ void CNpcBoatHazard::collidedWith( CThing *_thisThing )
{
CPlayer *player = (CPlayer *) _thisThing;
player->takeDamage( DAMAGE__KILL_OUTRIGHT );
break;
}

1
source/player/player.cpp
View File

@ -1493,6 +1493,7 @@ void CPlayer::takeDamage(DAMAGE_TYPE _damage)
switch(_damage)
{
case DAMAGE__NONE:
ouchThatHurt=false;
break;
case DAMAGE__ELECTROCUTION: