From d704a0fd923bfa05b2a734f63a271628c4cf59f8 Mon Sep 17 00:00:00 2001
From: Paul <paul@localhost>
Date: Fri, 10 Aug 2001 22:32:15 +0000
Subject: [PATCH]

---
 source/player/player.cpp | 53 +++++++++++++++++++++++++---------------
 1 file changed, 33 insertions(+), 20 deletions(-)

diff --git a/source/player/player.cpp b/source/player/player.cpp
index 51be961ed..09f9800ff 100644
--- a/source/player/player.cpp
+++ b/source/player/player.cpp
@@ -2823,7 +2823,6 @@ int		CPlayer::moveVertical(int _moveDistance)
 	Params:
 	Returns:
   ---------------------------------------------------------------------- */
-int checkside=+1;
 int		CPlayer::moveHorizontal(int _moveDistance)
 {
 	int	hitWall;
@@ -2890,29 +2889,43 @@ int		CPlayer::moveHorizontal(int _moveDistance)
 			{
 				// SB touching ground on at least one edge
 				colHeight=getHeightFromGround(x,pos.vy,16);
-				if(colHeight>=-2&&colHeight<=2)
-				{
-					// Move along the ground
-					pos.vx+=dirToMove;
-					pos.vy+=colHeight;
 
-					// Heh - these 4 lines stop SB going down a slope on the 'wrong edge' :)
-					colHeight=getHeightFromGround(x2,pos.vy,16);
-					if(colHeight<0)
+				// Head collision ( a bit of a hack )
+				int oktomove=false;
+				switch ( CGameScene::getCollision()->getCollisionBlock( x, pos.vy-HEIGHT_FOR_HEAD_COLLISION ) & COLLISION_TYPE_MASK )
+				{
+					case COLLISION_TYPE_NORMAL:
+						oktomove=true;
+						break;
+
+					default:
+						break;
+				}
+				if(oktomove)
+				{
+					if(colHeight>=-2&&colHeight<=2)
 					{
+						// Move along the ground
+						pos.vx+=dirToMove;
 						pos.vy+=colHeight;
-					}
-				}
-				else if(colHeight<0)
-				{
-					// Hit wall
-					hitWall=true;
-				}
-				else
-				{
-					// Moved off edge of ledge
-					pos.vx+=dirToMove;
 
+						// Heh - these 4 lines stop SB going down a slope on the 'wrong edge' :)
+						colHeight=getHeightFromGround(x2,pos.vy,16);
+						if(colHeight<0)
+						{
+							pos.vy+=colHeight;
+						}
+					}
+					else if(colHeight<0)
+					{
+						// Hit wall
+						hitWall=true;
+					}
+					else
+					{
+						// Moved off edge of ledge
+						pos.vx+=dirToMove;
+					}
 				}
 			}
 			else