From 59914477b428af11a4a5deb57cd2f8e9f0ec5440 Mon Sep 17 00:00:00 2001
From: Paul <paul@localhost>
Date: Thu, 14 Jun 2001 21:22:40 +0000
Subject: [PATCH]

---
 source/player/player.cpp   | 4 ++--
 source/player/player.h     | 4 ++--
 source/player/pmodes.cpp   | 2 +-
 source/player/pmodes.h     | 8 ++++++--
 source/player/psspring.cpp | 7 +++----
 5 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/source/player/player.cpp b/source/player/player.cpp
index 3782c0c9b..39225e9dd 100644
--- a/source/player/player.cpp
+++ b/source/player/player.cpp
@@ -1548,9 +1548,9 @@ void CPlayer::setAnimNo(int _animNo)
 	Params:
 	Returns:
   ---------------------------------------------------------------------- */
-void	CPlayer::springPlayerUp()
+void	CPlayer::springPlayerUp(int _springHeight)
 {
-	m_currentPlayerModeClass->springPlayerUp();
+	m_currentPlayerModeClass->springPlayerUp(_springHeight);
 }
 
 /*----------------------------------------------------------------------
diff --git a/source/player/player.h b/source/player/player.h
index 78bb345ff..9a562b7d2 100644
--- a/source/player/player.h
+++ b/source/player/player.h
@@ -246,8 +246,8 @@ public:
 	int				getAnimNo();
 	void			setAnimNo(int _animNo);
 
-	void			springPlayerUp();		// Springy branches
-	void			floatPlayerUp();		// Geysers
+	void			springPlayerUp(int _springHeight=55);		// Springy branches
+	void			floatPlayerUp();							// Geysers
 	void			teleportTo(int _x,int _y);
 
 private:
diff --git a/source/player/pmodes.cpp b/source/player/pmodes.cpp
index 09d44348b..430289022 100644
--- a/source/player/pmodes.cpp
+++ b/source/player/pmodes.cpp
@@ -632,7 +632,7 @@ void	CPlayerModeBase::jump()
 	moveVel.vy=-getPlayerMetrics()->m_metric[PM__JUMP_VELOCITY]<<VELOCITY_SHIFT;
 	setMoveVelocity(&moveVel);
 }
-int spr=2;
+int spr=5;
 void	CPlayerModeBase::spring()
 {
 	DVECTOR				moveVel;
diff --git a/source/player/pmodes.h b/source/player/pmodes.h
index e686c0ad6..c66e1343f 100644
--- a/source/player/pmodes.h
+++ b/source/player/pmodes.h
@@ -91,7 +91,7 @@ public:
 	virtual void	render(DVECTOR *_pos)				{;}
 	virtual void	renderModeUi()						{;}		// Ui specific to this mode (eg: ammo)
 	virtual int		canDoLookAround()					{return false;}
-	virtual void	springPlayerUp()					{;}
+	virtual void	springPlayerUp(int _springHeight)	{;}
 	void			inSoakUpState();
 
 	virtual int		setState(int _state)				{return 0;}
@@ -127,7 +127,7 @@ public:
 	virtual void	think();
 	virtual void	render()							{;}
 	virtual int		canDoLookAround();
-	virtual void	springPlayerUp()					{setState(STATE_SPRINGUP);}
+	virtual void	springPlayerUp(int _springHeight)	{m_springHeight=_springHeight;setState(STATE_SPRINGUP);}
 
 	virtual ATTACK_STATE	getAttackState();
 
@@ -173,14 +173,18 @@ public:
 	void						fall();
 	void						buttFall();
 
+	int							getSpringHeight()		{return m_springHeight;}
+
 
 private:
 	int							m_fallFrames;
+	int							m_springHeight;
 
 
 protected:
 	virtual class CPlayerState	**getStateTable();
 
+
 private:
 	class CPlayerState			*m_currentStateClass;
 	PLAYER_STATE				m_currentState;
diff --git a/source/player/psspring.cpp b/source/player/psspring.cpp
index 092931d7b..8978c9021 100644
--- a/source/player/psspring.cpp
+++ b/source/player/psspring.cpp
@@ -71,8 +71,7 @@ void CPlayerStateSpring::enter(CPlayerModeBase *_playerMode)
 {
 	_playerMode->setAnimNo(ANIM_SPONGEBOB_JUMP);
 	m_springFrames=0;
-
-	_playerMode->jump();
+	_playerMode->spring();
 }
 
 
@@ -82,7 +81,6 @@ void CPlayerStateSpring::enter(CPlayerModeBase *_playerMode)
 	Params:
 	Returns:
   ---------------------------------------------------------------------- */
-int maxplayerspringframes=50;
 void CPlayerStateSpring::think(CPlayerModeBase *_playerMode)
 {
 	const PlayerMetrics	*metrics;
@@ -94,8 +92,9 @@ void CPlayerStateSpring::think(CPlayerModeBase *_playerMode)
 
 	_playerMode->advanceAnimFrameAndCheckForEndOfAnim();
 
-	if(m_springFrames<=maxplayerspringframes)
+	if(m_springFrames<=_playerMode->getSpringHeight())
 	{
+		_playerMode->spring();
 		m_springFrames++;
 	}
 	else