Mirrors/SBSPSS
1
0
Fork 0
Code Releases Activity

Browse Source
This commit is contained in:
Paul 2001-07-10 18:28:13 +00:00
parent bc46fb6873
commit 1f96b6ec30
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/player/player.cpp
View File

@ -2056,12 +2056,14 @@ void CPlayer::takeDamage(DAMAGE_TYPE _damage,REACT_DIRECTION _reactDirection,CTh
} }
else else
{ {
if(ouchThatHurtSoMuchThatImJustGoingToDieNow||(getSpatulasHeld()==0&&m_currentMode!=PLAYER_MODE_NET)) if(ouchThatHurtSoMuchThatImJustGoingToDieNow||getSpatulasHeld()==0/*&&m_currentMode!=PLAYER_MODE_NET)*/)
{ {
died=true; died=true;
} }
else else
{ {
// NET REMOVED FROM HIT SYSTEM (PKG)
/*
if(m_currentMode==PLAYER_MODE_NET) if(m_currentMode==PLAYER_MODE_NET)
{ {
// Launch net pickup // Launch net pickup
@ -2074,6 +2076,7 @@ void CPlayer::takeDamage(DAMAGE_TYPE _damage,REACT_DIRECTION _reactDirection,CTh
pickup->setPos(&pickupPos); pickup->setPos(&pickupPos);
} }
else else
*/
{ {
// Launch all spatulas! // Launch all spatulas!
GameScene.dropHealth(Pos,m_numSpatulasHeld,1); GameScene.dropHealth(Pos,m_numSpatulasHeld,1);