From f819091911a58b2c2696ab6d76254b1be8c20ab9 Mon Sep 17 00:00:00 2001
From: Paul <paul@localhost>
Date: Tue, 10 Jul 2001 19:56:51 +0000
Subject: [PATCH]

---
 source/player/player.cpp | 1 +
 source/player/pmcoral.h  | 1 +
 source/player/pmjelly.h  | 1 +
 source/player/pmodes.h   | 2 ++
 4 files changed, 5 insertions(+)

diff --git a/source/player/player.cpp b/source/player/player.cpp
index 76d163d7c..7b20d4822 100644
--- a/source/player/player.cpp
+++ b/source/player/player.cpp
@@ -815,6 +815,7 @@ if(PadGetDown(0)&PAD_TRIANGLE)
 
 		// Trying to converate?
 		if(m_allowConversation==false&&
+		   m_currentPlayerModeClass->canConverse()&&
 		   getPadInputDown()&PI_UP)
 		{
 			m_allowConversation=true;
diff --git a/source/player/pmcoral.h b/source/player/pmcoral.h
index 88e92a910..b469e53bc 100644
--- a/source/player/pmcoral.h
+++ b/source/player/pmcoral.h
@@ -41,6 +41,7 @@ public:
 	virtual void				think();
 	virtual void				renderModeUi();
 	virtual int					canDoLookAround();
+	virtual int					canConverse()						{return m_blowerState==BLOWER_STATE__EMPTY||m_blowerState==BLOWER_STATE__FULL;}
 
 	virtual const struct PlayerMetrics	*getPlayerMetrics();
 
diff --git a/source/player/pmjelly.h b/source/player/pmjelly.h
index 62ca4109a..d2dbf7429 100644
--- a/source/player/pmjelly.h
+++ b/source/player/pmjelly.h
@@ -40,6 +40,7 @@ public:
 	virtual void				enter();
 	virtual void				think();
 	virtual void				renderModeUi();
+	virtual int					canConverse()						{return m_firingState==FIRING_STATE__NONE;}
 
 	virtual int					setState(int _state);
 
diff --git a/source/player/pmodes.h b/source/player/pmodes.h
index c89a4471c..8f245fb42 100644
--- a/source/player/pmodes.h
+++ b/source/player/pmodes.h
@@ -94,6 +94,7 @@ public:
 	virtual void	springPlayerUp(int _springHeight)	{;}
 	virtual void	setFloating()						{;}
 	void			inSoakUpState();
+	virtual int		canConverse()						{return true;}
 
 	virtual int		setState(int _state)				{return 0;}
 	virtual int		getState()							{return STATE_IDLE;}			// ARSE.. states need to go back in CPlayer! (pkg)
@@ -102,6 +103,7 @@ public:
 	int				getPadInputHeld();
 	int				getPadInputDown();
 
+
 	virtual ATTACK_STATE	getAttackState()			{return ATTACK_STATE__NONE;}