From 8dfb2b0591947f547af61489f0f6ac630a06df5e Mon Sep 17 00:00:00 2001
From: Paul <paul@localhost>
Date: Sat, 21 Jul 2001 18:39:43 +0000
Subject: [PATCH]

---
 source/player/player.cpp | 10 +++++++---
 source/player/player.h   |  3 ++-
 source/player/pmcart.cpp |  1 +
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/source/player/player.cpp b/source/player/player.cpp
index facfa8240..b12b700fc 100644
--- a/source/player/player.cpp
+++ b/source/player/player.cpp
@@ -219,7 +219,6 @@ static const char *s_modeText[NUM_PLAYERMODES]=
 #endif
 
 
-int		s_screenPos;
 int		m_cameraLookOffset;
 
 int MAP2D_CENTRE_X=-(INGAME_SCREENW/2);
@@ -645,7 +644,7 @@ m_animFrame=0;
 
 	m_lastPadInput=m_padInput=PI_NONE;
 
-	s_screenPos=128;
+	setCartCam(false);
 
 	resetPlayerCollisionSizeToBase();
 
@@ -702,7 +701,6 @@ void	CPlayer::shutdown()
 static int oldmode=-1;
 int newmode=-1;
 
-
 void	CPlayer::think(int _frames)
 {
 	int	i;
@@ -907,6 +905,12 @@ if(PadGetDown(0)&PAD_TRIANGLE)
 		}
 
 		// Camera scroll..
+		if(m_cartCamActive)
+		{
+			// Just force the cam eo think we are running right so that the cam
+			// is always in the right place when in a cart
+			m_cameraXScrollDir=-1;
+		}
 		if(m_cameraXScrollDir==-1)
 		{
 			if(m_cameraXScrollPos>-(CAMERA_SCROLLLIMIT*CAMERA_TILESIZE)<<CAMERA_ACCURACYSHIFT)
diff --git a/source/player/player.h b/source/player/player.h
index 632a743d4..223e725e2 100644
--- a/source/player/player.h
+++ b/source/player/player.h
@@ -237,7 +237,7 @@ public:
 	int				isTryingToConversateWithFriend()					{return m_allowConversation;}
 
 	DVECTOR			getCameraPos()										{return m_cameraPos;}
-
+	void			setCartCam(int _flag)								{m_cartCamActive=_flag;}
 	void			setCameraBox(CameraBox _cameraBox);
 	void			setRespawnPos(DVECTOR _respawn)						{m_respawnPos=_respawn;}
 	void			setRespawnPosAndRingTelephone(DVECTOR _respawn);
@@ -328,6 +328,7 @@ private:
 	int				m_animNo;
 	CActorGfx		*m_actorGfx;
 
+	int				m_cartCamActive;
 	int				m_lockCamera;
 	DVECTOR			m_cameraPos;
 	DVECTOR			m_currentCamFocusPointTarget;
diff --git a/source/player/pmcart.cpp b/source/player/pmcart.cpp
index afa02ade8..7e77224e7 100644
--- a/source/player/pmcart.cpp
+++ b/source/player/pmcart.cpp
@@ -61,6 +61,7 @@
   ---------------------------------------------------------------------- */
 void	CPlayerModeCart::enter()
 {
+	m_player->setCartCam(true);
 	setState( STATE_CART );
 }