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-05 21:11:51 +00:00
parent 4eef48176b
commit 93c3ae5e34
5 changed files with 60 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

11
source/player/player.cpp
View file

@ -1173,9 +1173,20 @@ void CPlayer::takeDamage(DAMAGE_TYPE _damage)
// Check if we are currently immune to this damage type
switch(_damage)
{
case DAMAGE__NONE:
break;
case DAMAGE__FALL:
case DAMAGE__LAVA:
case DAMAGE__HIT_ENEMY:
case DAMAGE__SHOCK_ENEMY:
case DAMAGE__GAS_ENEMY:
case DAMAGE__POISON_ENEMY:
case DAMAGE__SWALLOW_ENEMY:
case DAMAGE__PINCH_ENEMY:
case DAMAGE__SQUASH_ENEMY:
case DAMAGE__BURN_ENEMY:
case DAMAGE__BITE_ENEMY:
break;
case DAMAGE__ELECTROCUTION:

9
source/player/player.h
View file

@ -106,10 +106,19 @@ typedef enum
typedef enum
{
DAMAGE__NONE, // put in so that an item can push the user but not damage them
DAMAGE__FALL,
DAMAGE__ELECTROCUTION,
DAMAGE__LAVA,
DAMAGE__HIT_ENEMY,
DAMAGE__SHOCK_ENEMY,
DAMAGE__GAS_ENEMY,
DAMAGE__POISON_ENEMY,
DAMAGE__SWALLOW_ENEMY,
DAMAGE__PINCH_ENEMY,
DAMAGE__SQUASH_ENEMY,
DAMAGE__BURN_ENEMY,
DAMAGE__BITE_ENEMY,
}DAMAGE_TYPE;