From 8c2b43d7c35f015d0f238e22c3a71f76b1fe8a88 Mon Sep 17 00:00:00 2001
From: Paul <paul@localhost>
Date: Tue, 15 May 2001 21:41:39 +0000
Subject: [PATCH]

---
 source/player/player.cpp | 11 +++++++----
 source/player/pmdead.cpp |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/source/player/player.cpp b/source/player/player.cpp
index 23d53c23a..2bef0545b 100644
--- a/source/player/player.cpp
+++ b/source/player/player.cpp
@@ -763,10 +763,13 @@ if(newmode!=-1)
 		}
 
 		// Stop the player vanishing off the edge of the telly..
-		if(Pos.vx<m_playerPosLimitBox.x1)		Pos.vx=m_playerPosLimitBox.x1;
-		else if(Pos.vx>m_playerPosLimitBox.x2)	Pos.vx=m_playerPosLimitBox.x2;
-		if(Pos.vy<m_playerPosLimitBox.y1)		Pos.vy=m_playerPosLimitBox.y1;
-		else if(Pos.vy>m_playerPosLimitBox.y2)	Pos.vy=m_playerPosLimitBox.y2;
+		if(!m_lockCamera)
+		{
+			if(Pos.vx<m_playerPosLimitBox.x1)		Pos.vx=m_playerPosLimitBox.x1;
+			else if(Pos.vx>m_playerPosLimitBox.x2)	Pos.vx=m_playerPosLimitBox.x2;
+			if(Pos.vy<m_playerPosLimitBox.y1)		Pos.vy=m_playerPosLimitBox.y1;
+			else if(Pos.vy>m_playerPosLimitBox.y2)	Pos.vy=m_playerPosLimitBox.y2;
+		}
 
 		// Look around
 		int	pad=getPadInputHeld();
diff --git a/source/player/pmdead.cpp b/source/player/pmdead.cpp
index 66318848b..2cb9aa91e 100644
--- a/source/player/pmdead.cpp
+++ b/source/player/pmdead.cpp
@@ -75,7 +75,7 @@ void	CPlayerModeDead::think()
 		m_player->setAnimFrame(m_deadTime);
 	}
 
-m_player->moveVertical(5);
+	m_player->moveVertical(5);
 
 	if((m_deadTime>DEATH_DELAY&&m_player->getPadInputDown()&PI_FIRE)||
 	   m_deadTime>DEATH_TIMEOUT)