From 524150e0a8c3dde7bc0f56881e31a97f9f7a63e6 Mon Sep 17 00:00:00 2001
From: Paul <paul@localhost>
Date: Fri, 2 Feb 2001 17:48:40 +0000
Subject: [PATCH]

---
 source/game/convo.cpp    |  6 +++---
 source/player/player.cpp | 25 ++++++++++++++++++++++---
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/source/game/convo.cpp b/source/game/convo.cpp
index 436f59324..3ba392e03 100644
--- a/source/game/convo.cpp
+++ b/source/game/convo.cpp
@@ -323,19 +323,19 @@ void CConversation::thinkQuestion()
 
 		if(s_currentQuestion==QUESTION_YES_NO)
 		{
-			if(pad&PAD_CROSS)
+			if(pad&CPadConfig::getButton(CPadConfig::PAD_CFG_ACTION))
 			{
 				s_currentAnswer=s_currentSelectedAnswer==0?ANSWER_YES:ANSWER_NO;
 				s_currentQuestion=QUESTION_NONE;
 			}
-			else if(pad&(PAD_LEFT|PAD_RIGHT))
+			else if(pad&(CPadConfig::getButton(CPadConfig::PAD_CFG_LEFT)|CPadConfig::getButton(CPadConfig::PAD_CFG_RIGHT)))
 			{
 				s_currentSelectedAnswer^=1;
 			}
 		}
 		else if(s_currentQuestion==QUESTION_OK)
 		{
-			if(pad&PAD_CROSS)
+			if(pad&CPadConfig::getButton(CPadConfig::PAD_CFG_ACTION))
 			{
 				s_currentAnswer=ANSWER_OK;
 				s_currentQuestion=QUESTION_NONE;
diff --git a/source/player/player.cpp b/source/player/player.cpp
index cabd8d71e..fd3412e50 100644
--- a/source/player/player.cpp
+++ b/source/player/player.cpp
@@ -156,7 +156,7 @@ if(newmode!=-1)
 	if(padInput&PAD_RIGHT)	Pos.vx+=move;
 	m_invincibleFrameCount=0;
 
-	if ( padInput & PAD_UP ) // not sure where you want to put this, Paul (Charles)
+	if ( padInput & CPadConfig::getButton(CPadConfig::PAD_CFG_UP) ) // not sure where you want to put this, Paul (Charles)
 	{
 		GameScene.sendEvent( USER_REQUEST_TALK_EVENT, this );
 	}
@@ -242,7 +242,11 @@ Pos.vy=23*16+1;//16*15;
 
 		// Look around
 		int	pad=getPadInputHeld();
-		if(pad&PAD_UP)
+if(getPadInputDown()&PAD_CIRCLE)
+{
+	m_skel.blink();
+}
+		if(pad&CPadConfig::getButton(CPadConfig::PAD_CFG_UP))
 		{
 			if(m_cameraLookTimer<=-LOOKAROUND_DELAY)
 			{
@@ -257,7 +261,7 @@ Pos.vy=23*16+1;//16*15;
 				m_cameraLookTimer--;
 			}
 		}
-		else if(pad&PAD_DOWN)
+		else if(pad&CPadConfig::getButton(CPadConfig::PAD_CFG_DOWN))
 		{
 			if(m_cameraLookTimer>=LOOKAROUND_DELAY)
 			{
@@ -332,6 +336,9 @@ m_cameraOffset=ofs;
   ---------------------------------------------------------------------- */
 int panim=-1;
 DVECTOR ppos={0,1024};
+#ifdef __USER_paul__
+int mouth=-1,eyes=-1;
+#endif
 void	CPlayer::render()
 {
 	CThing::render();
@@ -339,6 +346,18 @@ void	CPlayer::render()
 	// Render
 	if(m_invincibleFrameCount==0||m_invincibleFrameCount&2)
 	{
+#ifdef __USER_paul__
+if(mouth!=-1)
+{
+	m_skel.setMouthTex(mouth);
+	mouth=-1;
+}
+if(eyes!=-1)
+{
+	m_skel.setEyeTex(eyes);
+	eyes=-1;
+}
+#endif
 		m_skel.setPos(ppos);
 		if(panim!=-1)
 			m_skel.setAnimNo(panim);