From d07a457f6b7465c9ea312148de5af4e12e707a53 Mon Sep 17 00:00:00 2001
From: Paul <paul@localhost>
Date: Mon, 16 Jul 2001 20:55:33 +0000
Subject: [PATCH]

---
 source/player/pmbloon.cpp  | 4 ++--
 source/player/pmbubble.cpp | 2 +-
 source/player/pmcoral.cpp  | 4 ++--
 source/player/pmjelly.cpp  | 2 +-
 source/player/pmnet.cpp    | 2 +-
 source/player/pmodes.cpp   | 4 +++-
 6 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/source/player/pmbloon.cpp b/source/player/pmbloon.cpp
index ac439ddbc..0585c4621 100644
--- a/source/player/pmbloon.cpp
+++ b/source/player/pmbloon.cpp
@@ -133,7 +133,7 @@ void	CPlayerModeBalloon::render(DVECTOR *_pos)
 	pos.vy=_pos->vy+balloony;
 	if(m_timer<BALLOON_TIMEOUT-BALLOON_POP_FRAMES)
 	{
-		frame=FRM__BALLOON;
+		frame=FRM__SMALL_BALLOON;
 	}
 	else
 	{
@@ -162,7 +162,7 @@ void	CPlayerModeBalloon::renderModeUi()
 		sFrameHdr	*fh;
 
 		sb=CGameScene::getSpriteBank();
-		fh=sb->getFrameHeader(FRM__BALLOON);
+		fh=sb->getFrameHeader(FRM__SMALL_BALLOON);
 
 		sb->printFT4Scaled(fh,CPlayer::POWERUPUI_ICONX,CPlayer::POWERUPUI_ICONY,0,0,CPlayer::POWERUPUI_OT,384);
 	}
diff --git a/source/player/pmbubble.cpp b/source/player/pmbubble.cpp
index 07ad1f8fc..fb66dbbe6 100644
--- a/source/player/pmbubble.cpp
+++ b/source/player/pmbubble.cpp
@@ -258,7 +258,7 @@ void	CPlayerModeBubbleMixture::renderModeUi()
 	FontBank	*fb;
 
 	sb=CGameScene::getSpriteBank();
-	fh=sb->getFrameHeader(FRM__BUBBLEWAND);
+	fh=sb->getFrameHeader(FRM__SMALL_BUBBLEWAND);
 	sb->printFT4(fh,CPlayer::POWERUPUI_ICONX,CPlayer::POWERUPUI_ICONY,0,0,CPlayer::POWERUPUI_OT);
 
 	fb=m_player->getFontBank();
diff --git a/source/player/pmcoral.cpp b/source/player/pmcoral.cpp
index 73bc2115d..512d27877 100644
--- a/source/player/pmcoral.cpp
+++ b/source/player/pmcoral.cpp
@@ -342,11 +342,11 @@ void	CPlayerModeCoralBlower::renderModeUi()
 //	char		buf[4];
 
 	sb=CGameScene::getSpriteBank();
-	fh=sb->getFrameHeader(FRM__BLOWER);
+	fh=sb->getFrameHeader(FRM__SMALL_BLOWER);
 	if(m_blowerState==BLOWER_STATE__FULL||m_blowerState==BLOWER_STATE__AIMING)
 	{
 		// Blower has a creature/object inside
-		sb->printFT4Scaled(FRM__BLOWER,CPlayer::POWERUPUI_ICONX,CPlayer::POWERUPUI_ICONY,0,0,CPlayer::POWERUPUI_OT,256+128);
+		sb->printFT4Scaled(fh,CPlayer::POWERUPUI_ICONX,CPlayer::POWERUPUI_ICONY,0,0,CPlayer::POWERUPUI_OT,256+128);
 
 		if(m_blowerState==BLOWER_STATE__AIMING)
 		{
diff --git a/source/player/pmjelly.cpp b/source/player/pmjelly.cpp
index 2b0f4afb3..9d8481040 100644
--- a/source/player/pmjelly.cpp
+++ b/source/player/pmjelly.cpp
@@ -247,7 +247,7 @@ void	CPlayerModeJellyLauncher::renderModeUi()
 	char		buf[4];
 
 	sb=CGameScene::getSpriteBank();
-	fh=sb->getFrameHeader(FRM__LAUNCHER);
+	fh=sb->getFrameHeader(FRM__SMALL_LAUNCHER);
 	switch(m_firingState)
 	{
 		case FIRING_STATE__NONE:
diff --git a/source/player/pmnet.cpp b/source/player/pmnet.cpp
index e99e00ee0..68b8e1e94 100644
--- a/source/player/pmnet.cpp
+++ b/source/player/pmnet.cpp
@@ -359,7 +359,7 @@ void	CPlayerModeNet::think()
 	char		buf[4];
 
 	sb=CGameScene::getSpriteBank();
-	fh=sb->getFrameHeader(FRM__NET);
+	fh=sb->getFrameHeader(FRM__SMALL_NET);
 	if(m_player->getJellyFishAmmo())
 	{
 		POLY_FT4	*ft4;
diff --git a/source/player/pmodes.cpp b/source/player/pmodes.cpp
index f448b3a67..5bf3da98b 100644
--- a/source/player/pmodes.cpp
+++ b/source/player/pmodes.cpp
@@ -423,7 +423,9 @@ void	CPlayerModeBase::playerHasHitGround()
 		// Landed from a painfully long fall
 		// This no longer hurts as per THQs request..
 		setState(STATE_HITGROUND);
-//		m_player->takeDamage(DAMAGE__FALL,REACT__NO_REACTION);
+#ifdef __USER_paul__
+		m_player->takeDamage(DAMAGE__FALL,REACT__NO_REACTION);
+#endif
 		moveVel.vx=0;
 		CGameScene::setCameraShake(0,8);
 	}