diff --git a/source/player/player.cpp b/source/player/player.cpp index ea62cde66..1cecd6a27 100644 --- a/source/player/player.cpp +++ b/source/player/player.cpp @@ -1962,6 +1962,7 @@ void CPlayer::calcCameraFocusPointTarget() ---------------------------------------------------------------------- */ void CPlayer::respawn() { + // Set previous mode setMode(m_lastModeBeforeDeath); m_allowConversation=false; @@ -2003,6 +2004,16 @@ void CPlayer::respawn() m_pantFlashTimer=0; m_hasReceivedExtraLifeFor100Spats=false; + // Re-stock ammo if need be + if(m_currentMode==PLAYER_MODE_BUBBLE_MIXTURE) + { + giveBubbleAmmoFromWeapon(); + } + else if(m_currentMode==PLAYER_MODE_JELLY_LAUNCHER) + { + giveJellyAmmoFromWeapon(); + } + m_moveVelocity.vx=m_moveVelocity.vy=0; clearPlatform();