6 files changed, 1899 insertions, 235 deletions

diff --git a/src/render/CutsceneShadow.cpp b/src/render/CutsceneShadow.cpp
new file mode 100644
index 00000000..4f9e7029
--- /dev/null
+++ b/src/render/CutsceneShadow.cpp
@@ -0,0 +1,267 @@
+#include "common.h"
+#include "main.h"
+#include "rwcore.h"
+#include "rwplcore.h"
+#include "CutsceneShadow.h"
+#include "RwHelper.h"
+
+#define DLIGHT_VALUE        0.8f /* Directional light intensity */
+
+
+CCutsceneShadow::CCutsceneShadow()
+{	
+	m_pAtomic = NULL;
+	m_nRwObjectType = -1;
+	m_pLight = NULL;
+	m_nBlurPasses = 0;
+	m_bResample = false;
+	m_bGradient = false;
+}
+
+CCutsceneShadow::~CCutsceneShadow()
+{
+	Destroy();
+}
+
+bool
+CCutsceneShadow::Create(RwObject *object, int32 rasterSize, bool resample, int32 blurPasses, bool gradient)
+{
+	RwRGBAReal color;
+	RwFrame *frame;
+
+	if (!object)
+		return false;
+
+	m_pLight = RpLightCreate(rpLIGHTDIRECTIONAL);
+	
+	if (!m_pLight)
+		return false;
+
+	color.red = color.green = color.blue = DLIGHT_VALUE;
+	color.alpha = 0.0f;
+	
+	RpLightSetColor(m_pLight, &color);
+	
+	frame = RwFrameCreate();
+	RpLightSetFrame(m_pLight, frame);
+	
+	SetLightProperties(180.0f, 90.0f, false);
+
+	m_pObject = object;
+	m_nRwObjectType = RwObjectGetType(m_pObject);
+	
+	switch ( m_nRwObjectType )
+	{
+		case rpCLUMP:
+		{
+			RpClumpGetBoundingSphere(m_pClump, &m_BoundingSphere, 1);
+			m_BaseSphere.radius = m_BoundingSphere.radius;
+			RwV3dTransformPoints(&m_BaseSphere.center, &m_BoundingSphere.center, 1, RwFrameGetMatrix(RpClumpGetFrame(m_pClump)));
+			break;
+		}
+
+		case rpATOMIC:
+		{
+			m_BoundingSphere = *RpAtomicGetBoundingSphere(m_pAtomic);
+			m_BaseSphere.radius = m_BoundingSphere.radius;
+			RwV3dTransformPoints(&m_BaseSphere.center, &m_BoundingSphere.center, 1, RwFrameGetMatrix(RpAtomicGetFrame(m_pAtomic)));
+			break;
+		}
+
+		default:
+		{
+			Destroy();
+			return false;
+			break;
+		}
+	}
+
+	if ( !m_Camera.Create(rasterSize) )
+	{
+		Destroy();
+		return false;
+	}
+  
+	m_nBlurPasses = blurPasses;
+	m_bResample = resample;
+	m_bGradient = gradient;
+
+	if ( m_bResample && !m_ResampleCamera.Create(rasterSize - 1) )
+	{
+		Destroy();
+		return false;
+	}
+  
+	if ( m_nBlurPasses != 0 )
+	{
+		if ( !m_BlurCamera.Create(resample ? rasterSize - 1 : rasterSize) )
+		{
+			Destroy();
+			return false;
+		}
+	}
+  
+	if ( m_bGradient )
+	{
+		if ( !m_GradientCamera.Create(resample ? rasterSize - 1 : rasterSize) )
+		{
+			Destroy();
+			return false;
+		}
+		
+		m_GradientCamera.MakeGradientRaster();
+	}
+  
+	m_Camera.SetLight(m_pLight);
+  
+	switch ( m_nRwObjectType )
+	{
+		case rpATOMIC:
+			m_Camera.SetFrustum(1.1f * m_BoundingSphere.radius);
+			break;
+			
+		case rpCLUMP:
+			m_Camera.SetFrustum(1.1f * m_BoundingSphere.radius);
+			break;
+	}
+  
+	m_Camera.SetCenter(&m_BaseSphere.center);
+	return true;
+}
+
+RwFrame *
+CCutsceneShadow::SetLightProperties(float angleY, float angleX, bool setLight)
+{
+	RwFrame *frame;
+	static RwV3d        Xaxis = { 1.0f, 0.0f, 0.0f };
+	static RwV3d        Yaxis = { 0.0f, 1.0f, 0.0f };
+
+	frame = RpLightGetFrame(m_pLight);
+	if ( !frame )
+		return NULL;
+	
+	RwFrameRotate(frame, &Yaxis, angleY, rwCOMBINEREPLACE);
+	RwFrameRotate(frame, &Xaxis, angleX, rwCOMBINEPOSTCONCAT);
+	
+	if ( setLight )
+		m_Camera.SetLight(m_pLight);
+		
+	return frame;
+}
+
+bool
+CCutsceneShadow::IsInitialized()
+{
+	return m_pObject != NULL;
+}
+
+void
+CCutsceneShadow::Destroy()
+{
+	m_Camera.Destroy();
+	m_ResampleCamera.Destroy();
+	m_BlurCamera.Destroy();
+	m_GradientCamera.Destroy();
+	
+	m_pAtomic = NULL;
+	
+	m_nRwObjectType = -1;
+  
+	if (m_pLight)
+	{
+		RwFrame *frame = RpLightGetFrame(m_pLight);
+		RpLightSetFrame(m_pLight, NULL);
+		RwFrameDestroy(frame);
+		RpLightDestroy(m_pLight);
+		m_pLight = NULL;
+	}
+}
+
+RwRaster *
+CCutsceneShadow::Update()
+{
+	switch ( m_nRwObjectType )
+	{
+		case rpCLUMP:
+			RwV3dTransformPoints(&m_BaseSphere.center, &m_BoundingSphere.center, 1, RwFrameGetMatrix(RpClumpGetFrame(m_pClump)));
+			break;
+
+		case rpATOMIC:
+			RwV3dTransformPoints(&m_BaseSphere.center, &m_BoundingSphere.center, 1, RwFrameGetMatrix(RpAtomicGetFrame(m_pAtomic)));
+			break;
+	}
+
+	m_Camera.SetCenter(&m_BaseSphere.center);
+
+	switch ( m_nRwObjectType )
+	{
+		case rpCLUMP:
+			m_Camera.Update(m_pClump);
+			break;
+
+		case rpATOMIC:
+			m_Camera.Update(m_pAtomic);
+			break;
+	}
+	
+	RwRaster *raster = m_Camera.GetRwRenderRaster();
+
+	if ( m_bResample )
+		return m_ResampleCamera.RasterResample(raster);
+
+	if ( m_nBlurPasses )
+		return m_BlurCamera.RasterBlur(raster, m_nBlurPasses);
+
+	if ( m_bGradient )
+		return m_GradientCamera.RasterGradient(raster);
+	
+	return raster;
+}
+
+RwTexture *
+CCutsceneShadow::UpdateForCutscene()
+{
+	Update();
+	return GetShadowRwTexture();
+}
+
+CShadowCamera *
+CCutsceneShadow::GetShadowCamera(int32 camType)
+{
+	switch ( camType )
+	{
+		case RESAMPLE:
+			return &m_ResampleCamera;
+			break;
+    
+		case BLUR:
+			return &m_BlurCamera;
+			break;
+			
+		case GRADIENT:
+			return &m_GradientCamera;
+			break;
+		
+		default:
+			return &m_Camera;
+			break;
+	}
+}
+
+RwTexture *
+CCutsceneShadow::GetShadowRwTexture()
+{
+	if ( m_bResample )
+		return m_ResampleCamera.GetRwRenderTexture();
+	else
+		return m_Camera.GetRwRenderTexture();
+}
+
+void
+CCutsceneShadow::DrawBorderAroundTexture(RwRGBA  const& color)
+{
+	if ( m_bResample )
+		m_ResampleCamera.DrawOutlineBorder(color);
+	else
+		m_Camera.DrawOutlineBorder(color);
+}
\ No newline at end of file
diff --git a/src/render/CutsceneShadow.h b/src/render/CutsceneShadow.h
new file mode 100644
index 00000000..bf4b8173
--- /dev/null
+++ b/src/render/CutsceneShadow.h
@@ -0,0 +1,54 @@
+#pragma once
+#include "ShadowCamera.h"
+
+class CCutsceneShadow
+{
+public:
+	enum
+	{
+		RASTER = 0,
+		RESAMPLE,
+		BLUR,
+		GRADIENT,
+	};
+
+	CShadowCamera m_Camera;
+	bool          m_bResample;
+	char _pad0[3];
+	CShadowCamera m_ResampleCamera;
+	int32         m_nBlurPasses;
+	CShadowCamera m_BlurCamera;
+	bool          m_bGradient;
+	char _pad1[3];
+	CShadowCamera m_GradientCamera;
+	
+	union
+	{
+		RwObject *m_pObject;
+		RpAtomic *m_pAtomic;
+		RpClump  *m_pClump;
+	};
+	
+	int      m_nRwObjectType;
+	RpLight *m_pLight;
+	RwSphere m_BoundingSphere;
+	RwSphere m_BaseSphere;
+	
+	CCutsceneShadow();
+	~CCutsceneShadow();
+	
+	RwSphere &GetBaseSphere()
+	{
+		return m_BaseSphere;
+	}
+
+	bool Create(RwObject *object, int32 rasterSize, bool resample, int32 blurPasses, bool gradient);
+	RwFrame *SetLightProperties(float angleY, float angleX, bool setLight);
+	bool IsInitialized();
+	void Destroy();
+	RwRaster *Update();
+	RwTexture *UpdateForCutscene();
+	CShadowCamera *GetShadowCamera(int32 camType = RASTER);
+	RwTexture *GetShadowRwTexture();
+	void DrawBorderAroundTexture(RwRGBA  const& color);
+};
\ No newline at end of file
diff --git a/src/render/ShadowCamera.cpp b/src/render/ShadowCamera.cpp
new file mode 100644
index 00000000..82d10a88
--- /dev/null
+++ b/src/render/ShadowCamera.cpp
@@ -0,0 +1,551 @@
+#include "common.h"
+#include "rwcore.h"
+#include "ShadowCamera.h"
+#include "RwHelper.h"
+
+#define TEXELOFFSET 0.5f
+
+RpAtomic *ShadowRenderCallBack(RpAtomic *atomic, void *data)
+{
+	RpAtomicCallBackRender savedCB = RpAtomicGetRenderCallBack(atomic);
+	RpAtomicSetRenderCallBack(atomic, AtomicDefaultRenderCallBack);
+	RpAtomicRender(atomic);
+	RpAtomicSetRenderCallBack(atomic, savedCB);	
+	return atomic;
+}
+
+CShadowCamera::CShadowCamera()
+{
+	m_pCamera  = NULL;
+	m_pTexture = NULL;
+}
+
+CShadowCamera::~CShadowCamera()
+{
+	Destroy();
+}
+
+void
+CShadowCamera::Destroy()
+{
+	if ( m_pCamera )
+	{
+		RwRaster		   *raster;
+		RwFrame			   *frame;
+	
+		frame = RwCameraGetFrame(m_pCamera);
+	
+		if ( frame )
+		{
+			RwCameraSetFrame(m_pCamera, NULL);
+			RwFrameDestroy(frame);
+		}
+	
+		raster = RwCameraGetZRaster(m_pCamera);
+		if ( raster )
+		{
+			RwCameraSetZRaster(m_pCamera, NULL);
+			RwRasterDestroy(raster);
+		}
+
+		raster = RwCameraGetRaster(m_pCamera);
+		if ( raster )
+		{
+			RwCameraSetRaster(m_pCamera, NULL);
+			RwRasterDestroy(raster);
+		}
+		
+		if ( m_pTexture )
+		{
+			RwTextureSetRaster(m_pTexture, NULL);
+			RwTextureDestroy(m_pTexture);
+			m_pTexture = NULL;
+		}
+		
+		RwCameraDestroy(m_pCamera);
+		m_pCamera = NULL;
+	}
+    return;
+}
+
+RwCamera *
+CShadowCamera::Create(int32 rasterSize)
+{
+	int32 size = 1 << rasterSize;
+	
+	m_pCamera = RwCameraCreate();
+	ASSERT(m_pCamera != NULL);
+	
+	if ( m_pCamera )
+	{
+		RwCameraSetFrame(m_pCamera, RwFrameCreate());
+
+		if( RwCameraGetFrame(m_pCamera) )
+		{
+			RwRaster *zRaster = RwRasterCreate(size, size, 0, rwRASTERTYPEZBUFFER);
+			ASSERT(zRaster != NULL);
+			
+			if ( zRaster )
+			{
+				RwCameraSetZRaster(m_pCamera, zRaster);
+
+				RwRaster *raster = RwRasterCreate(size, size, 0, rwRASTERTYPECAMERATEXTURE);
+				ASSERT(raster != NULL);
+
+				if ( raster )
+				{
+					RwCameraSetRaster(m_pCamera, raster);
+					m_pTexture = RwTextureCreate(raster);
+					ASSERT(m_pTexture != NULL);
+					
+					if ( m_pTexture )
+					{
+						RwTextureSetAddressing(m_pTexture, rwTEXTUREADDRESSCLAMP);
+						RwTextureSetFilterMode(m_pTexture, rwFILTERLINEAR);
+						RwCameraSetProjection(m_pCamera,   rwPARALLEL);
+						return (m_pCamera);
+					}
+				}
+			}
+		}
+	}
+
+	Destroy();
+
+	return (NULL);
+}
+
+RwCamera *
+CShadowCamera::SetFrustum(float objectRadius)
+{
+	ASSERT(m_pCamera != NULL);
+	
+	RwV2d vw;
+
+	RwCameraSetFarClipPlane (m_pCamera, 2.0f   * objectRadius);
+	RwCameraSetNearClipPlane(m_pCamera, 0.001f * objectRadius);
+
+	vw.x = objectRadius;
+	vw.y = objectRadius;
+	RwCameraSetViewWindow(m_pCamera, &vw);
+
+	return m_pCamera;
+}
+
+RwCamera *
+CShadowCamera::SetLight(RpLight *light)
+{
+	ASSERT(light != NULL);
+	ASSERT(m_pCamera != NULL);
+	
+	RwFrame  *camFrame = RwCameraGetFrame(m_pCamera);
+	RwMatrix *camMatrix = RwFrameGetMatrix(camFrame);
+	RwFrame  *lightFrame = RpLightGetFrame(light);
+	RwMatrix *lightMatrix = RwFrameGetMatrix(lightFrame);
+
+	*RwMatrixGetRight(camMatrix) = *RwMatrixGetRight(lightMatrix);
+	*RwMatrixGetUp(camMatrix) = *RwMatrixGetUp(lightMatrix);
+	*RwMatrixGetAt(camMatrix) = *RwMatrixGetAt(lightMatrix);
+	
+	//RwMatrixCopy(RwFrameGetMatrix(camFrame), RwFrameGetMatrix(lightFrame));
+
+	RwMatrixUpdate(RwFrameGetMatrix(camFrame));
+	RwFrameUpdateObjects(camFrame);
+
+	return m_pCamera;
+}
+
+RwCamera *
+CShadowCamera::SetCenter(RwV3d *center)
+{
+	ASSERT(center != NULL);
+	ASSERT(m_pCamera != NULL);
+	
+	RwFrame            *camFrame = RwCameraGetFrame(m_pCamera);
+    RwMatrix           *camMatrix = RwFrameGetMatrix(camFrame);
+	
+	*RwMatrixGetPos(camMatrix) = *center;
+	
+	RwV3dIncrementScaled(RwMatrixGetPos(camMatrix), RwMatrixGetAt(camMatrix), -0.5f * RwCameraGetFarClipPlane(m_pCamera));  
+
+	RwMatrixUpdate(camMatrix);
+	RwFrameUpdateObjects(camFrame);
+	RwFrameOrthoNormalize(camFrame);
+
+	return m_pCamera;
+}
+
+RwCamera *
+CShadowCamera::Update(RpClump *clump)
+{
+	ASSERT(clump != NULL);
+	ASSERT(m_pCamera != NULL);
+	
+	RwUInt32 flags;
+	RpGeometry *geometry;
+	
+	RwRGBA              bgColor = { 255, 255, 255, 0 };
+	
+	RwCameraClear(m_pCamera, &bgColor, rwCAMERACLEARZ | rwCAMERACLEARIMAGE);
+
+	if ( RwCameraBeginUpdate(m_pCamera) )
+	{
+		geometry = GetFirstAtomic(clump)->geometry;
+		ASSERT(geometry != NULL);
+		
+		flags = RpGeometryGetFlags(geometry);
+
+		RpGeometrySetFlags(geometry, flags & ~(rpGEOMETRYPRELIT|rpGEOMETRYLIGHT
+				|rpGEOMETRYTEXTURED|rpGEOMETRYTEXTURED2|rpGEOMETRYMODULATEMATERIALCOLOR));
+		
+		RpClumpForAllAtomics(clump, ShadowRenderCallBack, NULL);				
+		
+		RpGeometrySetFlags(geometry, flags);
+		
+		InvertRaster();
+		RwCameraEndUpdate(m_pCamera);
+	}
+	
+	return m_pCamera;
+}
+
+RwCamera *
+CShadowCamera::Update(RpAtomic *atomic)
+{
+	ASSERT(atomic != NULL);
+	ASSERT(m_pCamera != NULL);
+	
+	RwUInt32 flags;
+	RpGeometry *geometry;
+
+	RwRGBA              bgColor = { 255, 255, 255, 0 };
+
+	RwCameraClear(m_pCamera, &bgColor, rwCAMERACLEARZ | rwCAMERACLEARIMAGE);
+  
+	if ( RwCameraBeginUpdate(m_pCamera) )
+	{
+		geometry = RpAtomicGetGeometry(atomic);	
+		ASSERT(geometry != NULL);
+		flags = RpGeometryGetFlags(geometry);
+		
+		RpGeometrySetFlags(geometry, flags & ~(rpGEOMETRYPRELIT|rpGEOMETRYLIGHT
+				|rpGEOMETRYTEXTURED|rpGEOMETRYTEXTURED2|rpGEOMETRYMODULATEMATERIALCOLOR|rpGEOMETRYNORMALS));
+		
+		ShadowRenderCallBack(atomic, NULL);
+		
+		RpGeometrySetFlags(geometry, flags);
+
+		InvertRaster();
+		RwCameraEndUpdate(m_pCamera);
+	}
+	
+	return m_pCamera;
+}
+
+void
+CShadowCamera::InvertRaster()
+{
+	ASSERT(m_pCamera != NULL);
+	
+	RwIm2DVertex vx[4];
+	float crw, crh;
+	RwRaster *raster;
+	float recipZ;
+  
+	raster = RwCameraGetRaster(m_pCamera);
+	ASSERT(raster != NULL);
+	
+	crw = (float)RwRasterGetWidth(raster);
+	crh = (float)RwRasterGetHeight(raster);
+
+	recipZ = 1.0f / RwCameraGetNearClipPlane(m_pCamera);
+
+	RwIm2DVertexSetScreenX     (&vx[0], 0.0f);
+	RwIm2DVertexSetScreenY     (&vx[0], 0.0f);
+	RwIm2DVertexSetScreenZ     (&vx[0], RwIm2DGetNearScreenZ());
+	RwIm2DVertexSetRecipCameraZ(&vx[0], recipZ);
+	RwIm2DVertexSetIntRGBA     (&vx[0], 255, 255, 255, 255);
+
+	RwIm2DVertexSetScreenX     (&vx[1], 0.0f);
+	RwIm2DVertexSetScreenY     (&vx[1], crh);
+	RwIm2DVertexSetScreenZ     (&vx[1], RwIm2DGetNearScreenZ());
+	RwIm2DVertexSetRecipCameraZ(&vx[1], recipZ);
+	RwIm2DVertexSetIntRGBA     (&vx[1], 255, 255, 255, 255);
+
+	RwIm2DVertexSetScreenX     (&vx[2], crw);
+	RwIm2DVertexSetScreenY     (&vx[2], 0.0f);
+	RwIm2DVertexSetScreenZ     (&vx[2], RwIm2DGetNearScreenZ());
+	RwIm2DVertexSetRecipCameraZ(&vx[2], recipZ);
+	RwIm2DVertexSetIntRGBA     (&vx[2], 255, 255, 255, 255);
+
+	RwIm2DVertexSetScreenX     (&vx[3], crw);
+	RwIm2DVertexSetScreenY     (&vx[3], crh);
+	RwIm2DVertexSetScreenZ     (&vx[3], RwIm2DGetNearScreenZ());
+	RwIm2DVertexSetRecipCameraZ(&vx[3], recipZ);
+	RwIm2DVertexSetIntRGBA     (&vx[3], 255, 255, 255, 255);
+
+
+	RwRenderStateSet(rwRENDERSTATEZTESTENABLE,       (void *)FALSE);
+	RwRenderStateSet(rwRENDERSTATETEXTURERASTER,     (void *)NULL);
+	RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void *)TRUE);
+	RwRenderStateSet(rwRENDERSTATESRCBLEND,          (void *)rwBLENDINVDESTCOLOR);
+	RwRenderStateSet(rwRENDERSTATEDESTBLEND,         (void *)rwBLENDZERO);
+
+	RwIm2DRenderPrimitive(rwPRIMTYPETRISTRIP, vx, 4);
+
+	RwRenderStateSet(rwRENDERSTATEZTESTENABLE,       (void *)TRUE);
+	RwRenderStateSet(rwRENDERSTATESRCBLEND,          (void *)rwBLENDSRCALPHA);
+	RwRenderStateSet(rwRENDERSTATEDESTBLEND,         (void *)rwBLENDINVSRCALPHA);
+}
+
+RwRaster *
+CShadowCamera::MakeGradientRaster()
+{
+	ASSERT(m_pCamera != NULL);
+	
+	RwIm2DVertex vx[2];
+
+	if ( !m_pCamera )
+		return NULL;
+
+	float recipCamZ = 1.0f / RwCameraGetNearClipPlane(m_pCamera);
+
+	RwRaster *raster = RwCameraGetRaster(m_pCamera);
+	ASSERT(raster != NULL);
+	
+	float width = (float)RwRasterGetWidth(raster);
+	float height = (float)RwRasterGetHeight(raster);
+
+	if ( height < 1 )
+		return NULL;
+      
+	if ( RwCameraBeginUpdate(m_pCamera) )
+	{
+		RwRenderStateSet(rwRENDERSTATETEXTURERASTER,     (void *)rwFILTERNAFILTERMODE);
+		RwRenderStateSet(rwRENDERSTATEZTESTENABLE,       (void *)FALSE);
+		RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void *)FALSE);
+		RwRenderStateSet(rwRENDERSTATEDESTBLEND,         (void *)rwBLENDZERO);
+		RwRenderStateSet(rwRENDERSTATESRCBLEND,          (void *)rwBLENDINVDESTCOLOR);
+		RwRenderStateSet(rwRENDERSTATESHADEMODE,         (void *)rwSHADEMODEFLAT);
+
+		float color = 255.0f;
+		float step = (-191.0f / height);
+
+		for ( int32 i = 0; i < height; i++ )
+		{
+			RwIm2DVertexSetScreenX     (&vx[0], 0.0f);
+			RwIm2DVertexSetScreenY     (&vx[0], i);
+			RwIm2DVertexSetScreenZ     (&vx[0], RwIm2DGetNearScreenZ());
+			RwIm2DVertexSetRecipCameraZ(&vx[0], recipCamZ);
+			RwIm2DVertexSetIntRGBA     (&vx[0], (uint32)color, (uint32)color, (uint32)color, (uint32)color);
+			
+			RwIm2DVertexSetScreenX     (&vx[1], width - 1);
+			RwIm2DVertexSetScreenY     (&vx[1], i);
+			RwIm2DVertexSetScreenZ     (&vx[1], RwIm2DGetNearScreenZ());
+			RwIm2DVertexSetRecipCameraZ(&vx[1], recipCamZ);
+			RwIm2DVertexSetIntRGBA     (&vx[1], (uint32)color, (uint32)color, (uint32)color, (uint32)color);
+			
+			RwIm2DRenderLine(vx, 2, 0, 1);
+			
+			color += step;
+		}
+		
+		RwRenderStateSet(rwRENDERSTATEZTESTENABLE, (void *)TRUE);
+		RwRenderStateSet(rwRENDERSTATEDESTBLEND,   (void *)rwBLENDINVSRCALPHA);
+		RwRenderStateSet(rwRENDERSTATESRCBLEND,    (void *)rwBLENDSRCALPHA);
+		RwRenderStateSet(rwRENDERSTATESHADEMODE,   (void *)rwSHADEMODEGOURAUD);
+		
+		RwCameraEndUpdate(m_pCamera);
+	}
+	
+	return raster;
+}
+
+RwRaster *
+CShadowCamera::RasterResample(RwRaster *dstRaster)
+{
+	ASSERT(dstRaster != NULL);
+	ASSERT(m_pCamera != NULL);
+	
+	if ( !m_pCamera )
+		return NULL;
+
+	RwRaster *raster = RwCameraGetRaster(m_pCamera);
+	ASSERT(raster != NULL);
+	
+	float size = (float) RwRasterGetWidth(raster);
+	float uvOffset = TEXELOFFSET / size;
+	float recipCamZ = 1.0f / RwCameraGetNearClipPlane(m_pCamera);
+
+	if ( RwCameraBeginUpdate(m_pCamera) )
+	{
+		RwRenderStateSet(rwRENDERSTATESRCBLEND,      (void *)rwBLENDONE);
+		RwRenderStateSet(rwRENDERSTATEDESTBLEND,     (void *)rwBLENDZERO);
+		RwRenderStateSet(rwRENDERSTATEZTESTENABLE,   (void *)FALSE);
+		RwRenderStateSet(rwRENDERSTATETEXTUREFILTER, (void *)rwFILTERLINEAR);
+		RwRenderStateSet(rwRENDERSTATETEXTURERASTER, (void *)dstRaster);
+
+		Im2DRenderQuad(0.0f, 0.0f, size, size, RwIm2DGetNearScreenZ(), recipCamZ, uvOffset);
+    
+		RwRenderStateSet(rwRENDERSTATEZTESTENABLE,   (void *)TRUE);
+		RwRenderStateSet(rwRENDERSTATESRCBLEND,      (void *)rwBLENDSRCALPHA);
+		RwRenderStateSet(rwRENDERSTATEDESTBLEND,     (void *)rwBLENDINVSRCALPHA);
+		
+		RwCameraEndUpdate(m_pCamera);
+	}
+	
+	return raster;
+}
+
+RwRaster *
+CShadowCamera::RasterBlur(RwRaster *dstRaster, int32 numPasses)
+{
+	ASSERT(dstRaster != NULL);
+	ASSERT(m_pCamera != NULL);
+	
+	if ( !m_pCamera )
+		return NULL;
+
+	RwRaster *raster = RwCameraGetRaster(m_pCamera);
+	ASSERT(raster != NULL);
+	
+	float size = (float) RwRasterGetWidth(dstRaster);
+	float recipCamZ = 1.0f / RwCameraGetNearClipPlane(m_pCamera);
+
+	for (int i = 0; i < numPasses; i++ )
+	{
+		RwCameraSetRaster(m_pCamera, raster);
+		
+		if ( RwCameraBeginUpdate(m_pCamera) )
+		{
+			if ( i == 0 )
+			{
+				RwRenderStateSet(rwRENDERSTATESRCBLEND,      (void *)rwBLENDONE);
+				RwRenderStateSet(rwRENDERSTATEDESTBLEND,     (void *)rwBLENDZERO);
+				RwRenderStateSet(rwRENDERSTATEZTESTENABLE,   (void *)FALSE);
+				RwRenderStateSet(rwRENDERSTATETEXTUREFILTER, (void *)rwFILTERLINEAR);
+			}
+			
+			RwRenderStateSet(rwRENDERSTATETEXTURERASTER,     (void *)dstRaster);
+			Im2DRenderQuad(0.0f, 0.0f, size, size, RwIm2DGetNearScreenZ(), recipCamZ, 1.0f / size);
+			RwCameraEndUpdate(m_pCamera);
+		}
+		
+		RwCameraSetRaster(m_pCamera, dstRaster);
+      
+		if ( RwCameraBeginUpdate(m_pCamera) )
+		{
+			RwRenderStateSet(rwRENDERSTATETEXTURERASTER,      (void *)raster);
+			Im2DRenderQuad(0.0f, 0.0f, size, size, RwIm2DGetNearScreenZ(), recipCamZ, 0);
+        
+			if ( i == numPasses - 1 )
+			{
+				RwRenderStateSet(rwRENDERSTATEZTESTENABLE,    (void *)TRUE);
+				RwRenderStateSet(rwRENDERSTATESRCBLEND,       (void *)rwBLENDSRCALPHA);
+				RwRenderStateSet(rwRENDERSTATEDESTBLEND,      (void *)rwBLENDINVSRCALPHA);
+			}
+			
+			RwCameraEndUpdate(m_pCamera);
+		}
+	}
+
+	RwCameraSetRaster(m_pCamera, raster);
+
+	return dstRaster;
+}
+
+RwRaster *
+CShadowCamera::RasterGradient(RwRaster *dstRaster)
+{
+	ASSERT(dstRaster != NULL);
+	ASSERT(m_pCamera != NULL);
+	
+	RwRaster *raster = RwCameraGetRaster(m_pCamera);
+	ASSERT(raster != NULL);
+	
+	float size = (float)RwRasterGetWidth(dstRaster);
+	float recipCamZ = 1.0f / RwCameraGetNearClipPlane(m_pCamera);
+	
+	RwCameraSetRaster(m_pCamera, dstRaster);
+	
+	if ( RwCameraBeginUpdate(m_pCamera) )
+	{
+		RwRenderStateSet(rwRENDERSTATESRCBLEND,      (void *)rwBLENDZERO);
+		RwRenderStateSet(rwRENDERSTATEDESTBLEND,     (void *)rwBLENDSRCCOLOR);
+		RwRenderStateSet(rwRENDERSTATEZTESTENABLE,   (void *)FALSE);
+		RwRenderStateSet(rwRENDERSTATETEXTUREFILTER, (void *)rwFILTERLINEAR);
+		RwRenderStateSet(rwRENDERSTATETEXTURERASTER, (void *)raster);
+		
+		Im2DRenderQuad(0, 0, size, size, RwIm2DGetNearScreenZ(), recipCamZ, 0);
+		
+		RwRenderStateSet(rwRENDERSTATEZTESTENABLE,   (void *)TRUE);
+		RwRenderStateSet(rwRENDERSTATESRCBLEND,      (void *)rwBLENDSRCALPHA);
+		RwRenderStateSet(rwRENDERSTATEDESTBLEND,     (void *)rwBLENDINVSRCALPHA);
+		
+		RwCameraEndUpdate(m_pCamera);
+	}
+
+	RwCameraSetRaster(m_pCamera, raster);
+
+	return dstRaster;
+}
+
+RwRaster *CShadowCamera::DrawOutlineBorder(RwRGBA const& color)
+{
+	ASSERT(m_pCamera != NULL);
+	
+	RwIm2DVertex vx[4];
+	RwImVertexIndex ix[5];
+
+	RwRaster *raster = RwCameraGetRaster(m_pCamera);
+	ASSERT(raster != NULL);
+
+	float size = (float)RwRasterGetWidth(raster) - 1.0f;
+	float recipCamZ = 1.0f / RwCameraGetNearClipPlane(m_pCamera);
+	
+	RwIm2DVertexSetScreenX     (&vx[0], 0.0f);
+	RwIm2DVertexSetScreenY     (&vx[0], 0.0f);
+	RwIm2DVertexSetScreenZ     (&vx[0], RwIm2DGetNearScreenZ());
+	RwIm2DVertexSetIntRGBA     (&vx[0], color.red, color.green, color.blue, color.alpha);
+	RwIm2DVertexSetRecipCameraZ(&vx[0], recipCamZ);
+
+	RwIm2DVertexSetScreenX     (&vx[1], size);
+	RwIm2DVertexSetScreenY     (&vx[1], 0.0f);
+	RwIm2DVertexSetScreenZ     (&vx[1], RwIm2DGetNearScreenZ());
+	RwIm2DVertexSetIntRGBA     (&vx[1], color.red, color.green, color.blue, color.alpha);
+	RwIm2DVertexSetRecipCameraZ(&vx[1], recipCamZ);
+
+	RwIm2DVertexSetScreenX     (&vx[2], size);
+	RwIm2DVertexSetScreenY     (&vx[2], size);
+	RwIm2DVertexSetScreenZ     (&vx[2], RwIm2DGetNearScreenZ());
+	RwIm2DVertexSetIntRGBA     (&vx[2], color.red, color.green, color.blue, color.alpha);
+	RwIm2DVertexSetRecipCameraZ(&vx[2], recipCamZ);
+
+	RwIm2DVertexSetScreenX     (&vx[3], 0.0f);
+	RwIm2DVertexSetScreenY     (&vx[3], size);
+	RwIm2DVertexSetScreenZ     (&vx[3], RwIm2DGetNearScreenZ());
+	RwIm2DVertexSetIntRGBA     (&vx[3], color.red, color.green, color.blue, color.alpha);
+	RwIm2DVertexSetRecipCameraZ(&vx[3], recipCamZ);
+
+	ix[0] = 0;
+	ix[4] = 0;
+	ix[1] = 1;
+	ix[2] = 2;
+	ix[3] = 3;
+
+	if ( RwCameraBeginUpdate(m_pCamera) )
+	{
+		RwRenderStateSet(rwRENDERSTATEZTESTENABLE,       (void *)FALSE);
+		RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void *)FALSE);
+		RwRenderStateSet(rwRENDERSTATETEXTURERASTER,     (void *)NULL);
+		
+		RwIm2DRenderIndexedPrimitive(rwPRIMTYPEPOLYLINE, vx, 4, ix, 5);
+		
+		RwRenderStateSet(rwRENDERSTATEZTESTENABLE,       (void *)TRUE);
+		RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void *)TRUE);
+		
+		RwCameraEndUpdate(m_pCamera);
+	}
+
+	return raster;
+}
\ No newline at end of file
diff --git a/src/render/ShadowCamera.h b/src/render/ShadowCamera.h
new file mode 100644
index 00000000..a2149db7
--- /dev/null
+++ b/src/render/ShadowCamera.h
@@ -0,0 +1,54 @@
+#pragma once
+
+
+class CShadowCamera
+{
+public:
+	RwCamera *m_pCamera;
+	RwTexture *m_pTexture;
+	
+	CShadowCamera();
+	~CShadowCamera();
+
+	RwCamera *Create(int32 rasterSize);
+	void Destroy();
+	
+	RwCamera *SetFrustum(float objectRadius);
+	RwCamera *SetLight(RpLight *light);
+	RwCamera *SetCenter(RwV3d *center);
+	
+	RwCamera *Update(RpClump *clump);
+	RwCamera *Update(RpAtomic *atomic);
+	
+	void InvertRaster();
+	
+	RwRaster* GetRwRenderRaster()
+	{
+		return RwCameraGetRaster(m_pCamera);
+	}
+	
+	// ShadowRasterRender(RwV2d *)
+	// ApplyAlphaMapToRaster(void)
+	
+	RwRaster *MakeGradientRaster();
+	
+	RwTexture *GetRwRenderTexture()
+	{
+		return m_pTexture;
+	}
+	
+	RwRaster* GetRwZRaster()
+	{
+		return RwCameraGetZRaster(m_pCamera);
+	}
+	
+	RwRaster *RasterResample(RwRaster *dstRaster);
+	RwRaster *RasterBlur(RwRaster *dstRaster, int32 numPasses);
+	RwRaster *RasterGradient(RwRaster *dstRaster);
+	RwRaster *DrawOutlineBorder(RwRGBA const& color);
+
+	RwCamera *GetRwCamera()
+	{
+		return m_pCamera;
+	}
+};
\ No newline at end of file
diff --git a/src/render/Shadows.cpp b/src/render/Shadows.cpp
index fac35aeb..57e7123e 100644
--- a/src/render/Shadows.cpp
+++ b/src/render/Shadows.cpp
@@ -7,6 +7,7 @@
 #include "Timecycle.h"
 #include "CutsceneMgr.h"
 #include "Automobile.h"
+#include "Bike.h"
 #include "Ped.h"
 #include "PlayerPed.h"
 #include "World.h"
@@ -19,7 +20,11 @@
 #include "PointLights.h"
 #include "SpecialFX.h"
 #include "Script.h"
+#include "TimeStep.h"
 #include "Shadows.h"
+#include "CutsceneObject.h"
+#include "CutsceneShadow.h"
+#include "Clock.h"
 
 #ifdef DEBUGMENU
 SETTWEAKPATH("Shadows");
@@ -31,6 +36,8 @@ RwImVertexIndex ShadowIndexList[24];
 RwTexture *gpShadowCarTex;
 RwTexture *gpShadowPedTex;
 RwTexture *gpShadowHeliTex;
+RwTexture *gpShadowBikeTex;
+RwTexture *gpShadowBaronTex;
 RwTexture *gpShadowExplosionTex;
 RwTexture *gpShadowHeadLightsTex;
 RwTexture *gpOutline1Tex;
@@ -38,7 +45,6 @@ RwTexture *gpOutline2Tex;
 RwTexture *gpOutline3Tex;
 RwTexture *gpBloodPoolTex;
 RwTexture *gpReflectionTex;
-RwTexture *gpGoalMarkerTex;
 RwTexture *gpWalkDontTex;
 RwTexture *gpCrackedGlassTex;
 RwTexture *gpPostShadowTex;
@@ -63,6 +69,8 @@ CShadows::Init(void)
 	gpShadowCarTex        = RwTextureRead("shad_car",     NULL);
 	gpShadowPedTex        = RwTextureRead("shad_ped",     NULL);
 	gpShadowHeliTex       = RwTextureRead("shad_heli",    NULL);
+	gpShadowBikeTex       = RwTextureRead("shad_bike",    NULL);
+	gpShadowBaronTex      = RwTextureRead("shad_rcbaron", NULL);
 	gpShadowExplosionTex  = RwTextureRead("shad_exp",     NULL);
 	gpShadowHeadLightsTex = RwTextureRead("headlight",    NULL);
 	gpOutline1Tex         = RwTextureRead("outline_64",   NULL);
@@ -70,7 +78,6 @@ CShadows::Init(void)
 	gpOutline3Tex         = RwTextureRead("outline3_64",  NULL);
 	gpBloodPoolTex        = RwTextureRead("bloodpool_64", NULL);
 	gpReflectionTex       = RwTextureRead("reflection01", NULL);
-	gpGoalMarkerTex       = RwTextureRead("goal",         NULL);
 	gpWalkDontTex         = RwTextureRead("walk_dont",    NULL);
 	gpCrackedGlassTex     = RwTextureRead("wincrack_32",  NULL);
 	gpPostShadowTex       = RwTextureRead("lamp_shad_64", NULL);
@@ -80,6 +87,8 @@ CShadows::Init(void)
 	ASSERT(gpShadowCarTex != NULL);
 	ASSERT(gpShadowPedTex != NULL);
 	ASSERT(gpShadowHeliTex != NULL);
+	ASSERT(gpShadowBikeTex != NULL);
+	ASSERT(gpShadowBaronTex != NULL);
 	ASSERT(gpShadowExplosionTex != NULL);
 	ASSERT(gpShadowHeadLightsTex != NULL);
 	ASSERT(gpOutline1Tex != NULL);
@@ -87,7 +96,6 @@ CShadows::Init(void)
 	ASSERT(gpOutline3Tex != NULL);
 	ASSERT(gpBloodPoolTex != NULL);
 	ASSERT(gpReflectionTex != NULL);
-	ASSERT(gpGoalMarkerTex != NULL);
 	ASSERT(gpWalkDontTex != NULL);
 	ASSERT(gpCrackedGlassTex != NULL);
 	ASSERT(gpPostShadowTex != NULL);
@@ -154,6 +162,8 @@ CShadows::Shutdown(void)
 	ASSERT(gpShadowCarTex != NULL);
 	ASSERT(gpShadowPedTex != NULL);
 	ASSERT(gpShadowHeliTex != NULL);
+	ASSERT(gpShadowBikeTex != NULL);
+	ASSERT(gpShadowBaronTex != NULL);
 	ASSERT(gpShadowExplosionTex != NULL);
 	ASSERT(gpShadowHeadLightsTex != NULL);
 	ASSERT(gpOutline1Tex != NULL);
@@ -161,7 +171,6 @@ CShadows::Shutdown(void)
 	ASSERT(gpOutline3Tex != NULL);
 	ASSERT(gpBloodPoolTex != NULL);
 	ASSERT(gpReflectionTex != NULL);
-	ASSERT(gpGoalMarkerTex != NULL);
 	ASSERT(gpWalkDontTex != NULL);
 	ASSERT(gpCrackedGlassTex != NULL);
 	ASSERT(gpPostShadowTex != NULL);
@@ -169,6 +178,8 @@ CShadows::Shutdown(void)
 	RwTextureDestroy(gpShadowCarTex);
 	RwTextureDestroy(gpShadowPedTex);
 	RwTextureDestroy(gpShadowHeliTex);
+	RwTextureDestroy(gpShadowBikeTex);
+	RwTextureDestroy(gpShadowBaronTex);
 	RwTextureDestroy(gpShadowExplosionTex);
 	RwTextureDestroy(gpShadowHeadLightsTex);
 	RwTextureDestroy(gpOutline1Tex);
@@ -176,7 +187,6 @@ CShadows::Shutdown(void)
 	RwTextureDestroy(gpOutline3Tex);
 	RwTextureDestroy(gpBloodPoolTex);
 	RwTextureDestroy(gpReflectionTex);
-	RwTextureDestroy(gpGoalMarkerTex);
 	RwTextureDestroy(gpWalkDontTex);
 	RwTextureDestroy(gpCrackedGlassTex);
 	RwTextureDestroy(gpPostShadowTex);
@@ -216,7 +226,7 @@ CShadows::AddPermanentShadow(uint8 ShadowType, RwTexture *pTexture, CVector *pPo
 	}
 }
 
-void
+bool
 CShadows::StoreStaticShadow(uint32 nID, uint8 ShadowType, RwTexture *pTexture, Const CVector *pPosn,
 							float fFrontX, float fFrontY, float fSideX, float fSideY,
 							int16 nIntensity, uint8 nRed, uint8 nGreen, uint8 nBlue,
@@ -226,20 +236,23 @@ CShadows::StoreStaticShadow(uint32 nID, uint8 ShadowType, RwTexture *pTexture, C
 
 	float fDistToCamSqr = (*pPosn - TheCamera.GetPosition()).MagnitudeSqr2D();
 
-	if ( SQR(fDrawDistance) > fDistToCamSqr)
+	if ( SQR(fDrawDistance) > fDistToCamSqr || fDistToCamSqr == 0.0f )
 	{
-		float fDistToCam = Sqrt(fDistToCamSqr);
-
-		if ( fDistToCam >= (fDrawDistance*(1.0f-(1.0f/4.0f))) )
+		if ( fDistToCamSqr != 0.0f )
 		{
-			//fDistToCam == 0             -> 4
-			//fDistToCam == fDrawDistance -> 0
-			float fMult = 1.0f - (4.0f / fDrawDistance) * (fDistToCam - (fDrawDistance*(1.0f-(1.0f/4.0f))));
+			float fDistToCam = Sqrt(fDistToCamSqr);
 
-			nIntensity = (int32)(nIntensity * fMult);
-			nRed       = (int32)(nRed       * fMult);
-			nGreen     = (int32)(nGreen     * fMult);
-			nBlue      = (int32)(nBlue      * fMult);
+			if ( fDistToCam >= (fDrawDistance*(1.0f-(1.0f/4.0f))) )
+			{
+				//fDistToCam == 0             -> 4
+				//fDistToCam == fDrawDistance -> 0
+				float fMult = 1.0f - (4.0f / fDrawDistance) * (fDistToCam - (fDrawDistance*(1.0f-(1.0f/4.0f))));
+
+				nIntensity = (int32)(nIntensity * fMult);
+				nRed       = (int32)(nRed       * fMult);
+				nGreen     = (int32)(nGreen     * fMult);
+				nBlue      = (int32)(nBlue      * fMult);
+			}
 		}
 
 		int32 nSlot;
@@ -285,6 +298,8 @@ CShadows::StoreStaticShadow(uint32 nID, uint8 ShadowType, RwTexture *pTexture, C
 				aStaticShadows[nSlot].m_fScale           = fScale;
 				aStaticShadows[nSlot].m_bTemp            = bTempShadow;
 				aStaticShadows[nSlot].m_nTimeCreated     = CTimer::GetTimeInMilliseconds();
+				
+				return false;
 			}
 			else
 			{
@@ -309,6 +324,8 @@ CShadows::StoreStaticShadow(uint32 nID, uint8 ShadowType, RwTexture *pTexture, C
 				aStaticShadows[nSlot].m_nTimeCreated     = CTimer::GetTimeInMilliseconds();
 
 				GeneratePolysForStaticShadow(nSlot);
+				
+				return aStaticShadows[nSlot].m_pPolyBunch != NULL;
 			}
 		}
 		else
@@ -338,9 +355,13 @@ CShadows::StoreStaticShadow(uint32 nID, uint8 ShadowType, RwTexture *pTexture, C
 				aStaticShadows[nSlot].m_nTimeCreated     = CTimer::GetTimeInMilliseconds();
 
 				GeneratePolysForStaticShadow(nSlot);
+				
+				return aStaticShadows[nSlot].m_pPolyBunch != NULL;
 			}
 		}
 	}
+	
+	return true;
 }
 
 void
@@ -362,7 +383,7 @@ CShadows::StoreShadowToBeRendered(uint8 ShadowTexture, CVector *pPosn,
 			StoreShadowToBeRendered(SHADOWTYPE_DARK, gpShadowCarTex, pPosn,
 					fFrontX, fFrontY, fSideX, fSideY,
 					nIntensity, nRed, nGreen, nBlue,
-					15.0f, false, 1.0f);
+					15.0f, false, 1.0f, NULL, false);
 
 			break;
 		}
@@ -372,7 +393,7 @@ CShadows::StoreShadowToBeRendered(uint8 ShadowTexture, CVector *pPosn,
 			StoreShadowToBeRendered(SHADOWTYPE_DARK, gpShadowPedTex, pPosn,
 					fFrontX, fFrontY, fSideX, fSideY,
 					nIntensity, nRed, nGreen, nBlue,
-					15.0f, false, 1.0f);
+					15.0f, false, 1.0f, NULL, false);
 
 			break;
 		}
@@ -382,7 +403,7 @@ CShadows::StoreShadowToBeRendered(uint8 ShadowTexture, CVector *pPosn,
 			StoreShadowToBeRendered(SHADOWTYPE_ADDITIVE, gpShadowExplosionTex, pPosn,
 					fFrontX, fFrontY, fSideX, fSideY,
 					nIntensity, nRed, nGreen, nBlue,
-					15.0f, false, 1.0f);
+					15.0f, false, 1.0f, NULL, false);
 
 			break;
 		}
@@ -392,7 +413,7 @@ CShadows::StoreShadowToBeRendered(uint8 ShadowTexture, CVector *pPosn,
 			StoreShadowToBeRendered(SHADOWTYPE_DARK, gpShadowHeliTex, pPosn,
 					fFrontX, fFrontY, fSideX, fSideY,
 					nIntensity, nRed, nGreen, nBlue,
-					15.0f, false, 1.0f);
+					15.0f, false, 1.0f, NULL, false);
 
 			break;
 		}
@@ -402,7 +423,7 @@ CShadows::StoreShadowToBeRendered(uint8 ShadowTexture, CVector *pPosn,
 			StoreShadowToBeRendered(SHADOWTYPE_ADDITIVE, gpShadowHeadLightsTex, pPosn,
 					fFrontX, fFrontY, fSideX, fSideY,
 					nIntensity, nRed, nGreen, nBlue,
-					15.0f, false, 1.0f);
+					15.0f, false, 1.0f, NULL, false);
 
 			break;
 		}
@@ -411,8 +432,8 @@ CShadows::StoreShadowToBeRendered(uint8 ShadowTexture, CVector *pPosn,
 		{
 			StoreShadowToBeRendered(SHADOWTYPE_DARK, gpBloodPoolTex, pPosn,
 					fFrontX, fFrontY, fSideX, fSideY,
-					nIntensity, nRed, nGreen, nBlue,
-					15.0f, false, 1.0f);
+					nIntensity, nRed, 150, 0,
+					15.0f, false, 1.0f, NULL, false);
 
 			break;
 		}
@@ -425,46 +446,64 @@ void
 CShadows::StoreShadowToBeRendered(uint8 ShadowType, RwTexture *pTexture, CVector *pPosn,
 								float fFrontX, float fFrontY, float fSideX, float fSideY,
 								int16 nIntensity, uint8 nRed, uint8 nGreen, uint8 nBlue,
-								float fZDistance, bool bDrawOnWater, float fScale)
+								float fZDistance, bool bDrawOnWater, float fScale, CCutsceneShadow *pShadow, bool bDrawOnBuildings)
 {
 	ASSERT(pTexture != NULL);
 	ASSERT(pPosn != NULL);
 
 	if ( ShadowsStoredToBeRendered < MAX_STOREDSHADOWS )
 	{
-		asShadowsStored[ShadowsStoredToBeRendered].m_ShadowType          = ShadowType;
-		asShadowsStored[ShadowsStoredToBeRendered].m_pTexture            = pTexture;
-		asShadowsStored[ShadowsStoredToBeRendered].m_vecPos              = *pPosn;
-		asShadowsStored[ShadowsStoredToBeRendered].m_vecFront.x          = fFrontX;
-		asShadowsStored[ShadowsStoredToBeRendered].m_vecFront.y          = fFrontY;
-		asShadowsStored[ShadowsStoredToBeRendered].m_vecSide.x           = fSideX;
-		asShadowsStored[ShadowsStoredToBeRendered].m_vecSide.y           = fSideY;
-		asShadowsStored[ShadowsStoredToBeRendered].m_nIntensity          = nIntensity;
-		asShadowsStored[ShadowsStoredToBeRendered].m_nRed                = nRed;
-		asShadowsStored[ShadowsStoredToBeRendered].m_nGreen              = nGreen;
-		asShadowsStored[ShadowsStoredToBeRendered].m_nBlue               = nBlue;
-		asShadowsStored[ShadowsStoredToBeRendered].m_fZDistance          = fZDistance;
-		asShadowsStored[ShadowsStoredToBeRendered].m_nFlags.bDrawOnWater = bDrawOnWater;
-		asShadowsStored[ShadowsStoredToBeRendered].m_fScale              = fScale;
+		asShadowsStored[ShadowsStoredToBeRendered].m_ShadowType              = ShadowType;
+		asShadowsStored[ShadowsStoredToBeRendered].m_pTexture                = pTexture;
+		asShadowsStored[ShadowsStoredToBeRendered].m_vecPos                  = *pPosn;
+		asShadowsStored[ShadowsStoredToBeRendered].m_vecFront.x              = fFrontX;
+		asShadowsStored[ShadowsStoredToBeRendered].m_vecFront.y              = fFrontY;
+		asShadowsStored[ShadowsStoredToBeRendered].m_vecSide.x               = fSideX;
+		asShadowsStored[ShadowsStoredToBeRendered].m_vecSide.y               = fSideY;
+		asShadowsStored[ShadowsStoredToBeRendered].m_nIntensity              = nIntensity;
+		asShadowsStored[ShadowsStoredToBeRendered].m_nRed                    = nRed;
+		asShadowsStored[ShadowsStoredToBeRendered].m_nGreen                  = nGreen;
+		asShadowsStored[ShadowsStoredToBeRendered].m_nBlue                   = nBlue;
+		asShadowsStored[ShadowsStoredToBeRendered].m_fZDistance              = fZDistance;
+		asShadowsStored[ShadowsStoredToBeRendered].m_nFlags.bDrawOnWater     = bDrawOnWater;
+		asShadowsStored[ShadowsStoredToBeRendered].m_nFlags.bDrawOnBuildings = bDrawOnBuildings;
+		asShadowsStored[ShadowsStoredToBeRendered].m_fScale                  = fScale;
+		asShadowsStored[ShadowsStoredToBeRendered].m_pCutsceneShadow         = pShadow;
 
 		ShadowsStoredToBeRendered++;
 	}
 }
 
+
 void
-CShadows::StoreShadowForCar(CAutomobile *pCar)
+CShadows::StoreShadowForVehicle(CVehicle *pCar, VEH_SHD_TYPE type)
 {
 	ASSERT(pCar != NULL);
 
 	if ( CTimeCycle::GetShadowStrength() != 0 )
 	{
 		CVector CarPos = pCar->GetPosition();
-		float fDistToCamSqr = (CarPos - TheCamera.GetPosition()).MagnitudeSqr();
+		float fDistToCamSqr = (CarPos - TheCamera.GetPosition()).MagnitudeSqr2D();
 
 		if ( CCutsceneMgr::IsRunning() )
 			fDistToCamSqr /= SQR(TheCamera.LODDistMultiplier) * 4.0f;
 
-		float fDrawDistance = 18.0f;
+		float fDrawDistance;
+		switch ( type )
+		{
+			case VEH_SHD_TYPE_SEAPLANE:
+			case VEH_SHD_TYPE_RCPLANE:
+				fDrawDistance = 144.0f;
+				break;
+				
+			case VEH_SHD_TYPE_HELI:
+				fDrawDistance = 144.0f;
+				break;
+				
+			default:
+				fDrawDistance = 18.0f;
+				break;
+		}
 
 		if ( fDistToCamSqr < SQR(fDrawDistance) )
 		{
@@ -472,46 +511,202 @@ CShadows::StoreShadowForCar(CAutomobile *pCar)
 			
 			//fDistToCam == 0             -> 4
 			//fDistToCam == fDrawDistance -> 0
-			float fMult = 1.0f - (4.0f / fDrawDistance) * (fDistToCam - (fDrawDistance*(1.0f-(1.0f/4.0f))) );
+			float fMult = 1.0f - (fDistToCam - (fDrawDistance*(1.0f-(1.0f/4.0f)))) / (fDrawDistance*(1.0f/4.0f));
 
 			int32 nColorStrength;
 
 			if ( fDistToCam >= (fDrawDistance*(1.0f-(1.0f/4.0f))) )
-				nColorStrength = (int32)(CTimeCycle::GetShadowStrength() * fMult);
+				nColorStrength = (int32)(fMult * CTimeCycle::GetShadowStrength());
 			else
 				nColorStrength = CTimeCycle::GetShadowStrength();
-
+			
+			
 			float fVehicleHeight  = pCar->GetColModel()->boundingBox.GetSize().y;
 			float fVehicleWidth   = pCar->GetColModel()->boundingBox.GetSize().x;
-
-			if ( pCar->GetModelIndex() == MI_DODO )
+			
+			float size = 1.0f;
+			
+			if ( pCar->GetModelIndex() == MI_HUNTER )
+			{
+				fVehicleWidth  *= 3.0f;
+				fVehicleHeight *= 1.4f;
+				size *= 0.5f;
+			}
+			else if ( pCar->GetModelIndex() == MI_ANGEL )
+			{
+				fVehicleHeight = fVehicleHeight * 1.5;
+				size = 0.03f;
+			}
+			else if ( pCar->GetModelIndex() == MI_SEASPAR )
+			{
+				fVehicleWidth  *= 3.0f;
+				fVehicleHeight *= 1.4f;
+				size *= 0.5f;
+			}
+			else if ( pCar->GetModelIndex() == MI_PIZZABOY || pCar->GetModelIndex() == MI_PCJ600 || pCar->GetModelIndex() == MI_FAGGIO )
+			{
+				fVehicleHeight *= 1.2f;
+				size = 0.05f;
+			}
+			else if ( pCar->GetModelIndex() == MI_FREEWAY )
+			{
+				fVehicleHeight *= 1.5f;
+				size = 0.03f;
+			}
+			else if ( pCar->GetModelIndex() == MI_RCRAIDER )
+			{
+				fVehicleHeight *= 1.5f;
+				fVehicleWidth  *= 2.0f;
+				size = 0.2f;
+			}
+			else if ( pCar->GetModelIndex() == MI_SANCHEZ )
+			{
+				fVehicleHeight *= 1.5f;
+				size = 0.03f;
+			}
+			else if ( pCar->GetModelIndex() == MI_SPARROW || pCar->GetModelIndex() == MI_MAVERICK || pCar->GetModelIndex() == MI_VCNMAV || pCar->GetModelIndex() == MI_POLMAV )
+			{
+				fVehicleWidth  *= 3.0f;
+				fVehicleHeight *= 1.4f;
+				size *= 0.5f;
+			}
+			else if ( pCar->GetModelIndex() == MI_RCGOBLIN )
+			{
+				fVehicleHeight *= 1.5f;
+				fVehicleWidth  *= 2.0f;
+				size = 0.2f;
+			}
+			else if ( pCar->GetModelIndex() == MI_DODO )
 			{
 				fVehicleHeight *= 0.9f;
 				fVehicleWidth  *= 0.4f;
 			}
+			
+			CarPos.x -= pCar->GetForward().x * (((fVehicleHeight/2) - pCar->GetColModel()->boundingBox.max.y)*size);
+			CarPos.y -= pCar->GetForward().y * (((fVehicleHeight/2) - pCar->GetColModel()->boundingBox.max.y)*size);
+			
+			RwTexture *tex;
+			switch ( type )
+			{
+				case VEH_SHD_TYPE_BIKE:
+				{
+					float wheelZ = Abs(((CBike*)pCar)->m_fLeanLRAngle);
+					float mul = 5.092958f * wheelZ + 1.0f;
+					if (pCar->GetStatus() == STATUS_PHYSICS)
+					{
+						float z = pCar->GetRight().z;
+						if (z > 0.6f)
+							mul += 4.0f * z;
+					}
+					fVehicleWidth *= mul;
+					tex = gpShadowBikeTex;
+					break;
+				}
+				
+				case VEH_SHD_TYPE_HELI:
+					tex = gpShadowHeliTex;
+					break;
+				
+				case VEH_SHD_TYPE_SEAPLANE:
+					nColorStrength = CTimeCycle::GetShadowStrength();
+					tex = gpShadowBaronTex;
+					break;
+				
+				case VEH_SHD_TYPE_RCPLANE:
+					tex = gpShadowBaronTex;
+					fVehicleHeight *= 1.5f;
+					fVehicleWidth  *= 2.2f;
+					break;
+				
+				case VEH_SHD_TYPE_CAR:
+					tex = gpShadowCarTex;
+					break;
+			}
+			
+			float frontx = pCar->GetForward().x;
+			float fronty = pCar->GetForward().y;
+			float sidex = pCar->GetRight().x;
+			float sidey = pCar->GetRight().y;
+			
+			switch ( type )
+			{
+				case VEH_SHD_TYPE_BIKE:
+					if ( Abs(pCar->GetRight().z) > 0.6f )
+					{
+						sidex = pCar->GetUp().x;
+						sidey = pCar->GetUp().y;
+					}
+					break;
+					
+				case VEH_SHD_TYPE_HELI:
+					if ( Abs(pCar->GetRight().z) > 0.57f )
+					{
+						sidex = pCar->GetUp().x;
+						sidey = pCar->GetUp().y;
+					}
+					if ( Abs(pCar->GetForward().z) > 0.57f )
+					{
+						frontx = pCar->GetUp().x;
+						fronty = pCar->GetUp().y;
+					}
+					break;
+			}
 
-			CarPos.x -= pCar->GetForward().x * ((fVehicleHeight / 2) - pCar->GetColModel()->boundingBox.max.y);
-			CarPos.y -= pCar->GetForward().y * ((fVehicleHeight / 2) - pCar->GetColModel()->boundingBox.max.y);
-
-			if ( pCar->GetUp().z > 0.0f )
+			bool bDrawOnBuildings = false;
+			if (   pCar->GetModelIndex() == MI_RCBANDIT
+				|| pCar->GetModelIndex() == MI_RCBARON
+				|| pCar->GetModelIndex() == MI_RCRAIDER
+				|| pCar->GetModelIndex() == MI_RCGOBLIN
+				|| pCar == FindPlayerVehicle() )
 			{
-				StoreShadowToBeRendered(SHADOWTYPE_DARK, gpShadowCarTex, &CarPos,
-					pCar->GetForward().x * (fVehicleHeight / 2),
-					pCar->GetForward().y * (fVehicleHeight / 2),
-					pCar->GetRight().x   * (fVehicleWidth  / 2),
-					pCar->GetRight().y   * (fVehicleWidth  / 2),
-					nColorStrength, nColorStrength, nColorStrength, nColorStrength,
-					4.5f, false, 1.0f);
+				bDrawOnBuildings = true;
+			}
+			
+			if ( pCar->m_vecMoveSpeed.Magnitude() * CTimeStep::ms_fTimeStep > 0.1f || bDrawOnBuildings )
+			{
+				if ( pCar->GetUp().z > 0.0f )
+				{
+					StoreShadowToBeRendered(SHADOWTYPE_DARK, tex, &CarPos,
+						frontx * (fVehicleHeight / 2),
+						fronty * (fVehicleHeight / 2),
+						sidex  * (fVehicleWidth  / 2),
+						sidey  * (fVehicleWidth  / 2),
+						nColorStrength, nColorStrength, nColorStrength, nColorStrength,
+						4.5f, false, 1.0f, NULL, bDrawOnBuildings);
+				}
+				else
+				{
+					StoreShadowToBeRendered(SHADOWTYPE_DARK, tex, &CarPos,
+						frontx * (fVehicleHeight / 2),
+						fronty * (fVehicleHeight / 2),
+						-sidex * (fVehicleWidth  / 2),
+						-sidey * (fVehicleWidth  / 2),
+						nColorStrength, nColorStrength, nColorStrength, nColorStrength,
+						4.5f, false, 1.0f, NULL, bDrawOnBuildings);
+				}
 			}
 			else
 			{
-				StoreShadowToBeRendered(SHADOWTYPE_DARK, gpShadowCarTex, &CarPos,
-					pCar->GetForward().x * (fVehicleHeight / 2),
-					pCar->GetForward().y * (fVehicleHeight / 2),
-					-pCar->GetRight().x  * (fVehicleWidth  / 2),
-					-pCar->GetRight().y  * (fVehicleWidth  / 2),
-					nColorStrength, nColorStrength, nColorStrength, nColorStrength,
-					4.5f, false, 1.0f);
+				if ( pCar->GetUp().z > 0.0f )
+				{
+					StoreStaticShadow((uintptr)pCar + 1, SHADOWTYPE_DARK, tex, &CarPos,
+						frontx * (fVehicleHeight / 2),
+						fronty * (fVehicleHeight / 2),
+						sidex  * (fVehicleWidth  / 2),
+						sidey  * (fVehicleWidth  / 2),
+						nColorStrength, nColorStrength, nColorStrength, nColorStrength,
+						4.5f, 1.0f, 0.0f, false, 0.1f);
+				}
+				else
+				{
+					StoreStaticShadow((uintptr)pCar + 1, SHADOWTYPE_DARK, tex, &CarPos,
+						frontx * (fVehicleHeight / 2),
+						fronty * (fVehicleHeight / 2),
+						-sidex * (fVehicleWidth  / 2),
+						-sidey * (fVehicleWidth  / 2),
+						nColorStrength, nColorStrength, nColorStrength, nColorStrength,
+						4.5f, 1.0f, 0.0f, false, 0.1f);
+				}
 			}
 		}
 	}
@@ -551,12 +746,24 @@ CShadows::StoreCarLightShadow(CAutomobile *pCar, int32 nID, RwTexture *pTexture,
 				nBlue  = (int32)(nBlue  * fMult);
 			}
 
-			StoreShadowToBeRendered(SHADOWTYPE_ADDITIVE, pTexture, pPosn,
-					fFrontX, fFrontY,
-					fSideX, fSideY,
-					128, nRed, nGreen, nBlue,
-					6.0f, false, 1.0f);
-
+			if ( pCar->m_vecMoveSpeed.Magnitude() * CTimeStep::ms_fTimeStep > 0.4f || pCar == FindPlayerVehicle() )
+			{
+				StoreShadowToBeRendered(SHADOWTYPE_ADDITIVE, pTexture, pPosn,
+						fFrontX, fFrontY,
+						fSideX, fSideY,
+						128, nRed, nGreen, nBlue,
+						6.0f, false, 1.0f,
+						NULL, pCar == FindPlayerVehicle());
+			}
+			else
+			{
+				StoreStaticShadow((uintptr)pCar + nID, SHADOWTYPE_ADDITIVE, pTexture, pPosn,
+						fFrontX, fFrontY,
+						fSideX, fSideY,
+						128, nRed, nGreen, nBlue,
+						6.0f, 1.0f, 27.0f,
+						false, 0.4f);
+			}
 		}
 	}
 }
@@ -580,10 +787,94 @@ CShadows::StoreShadowForPed(CPed *pPed, float fDisplacementX, float fDisplacemen
 	}
 }
 
+#if 1
+void
+StoreShadowForCutscenePedObject(CPed *pObject, float fDisplacementX, float fDisplacementY,
+								float fFrontX, float fFrontY, float fSideX, float fSideY)
+{
+	ASSERT(pObject != NULL);
+	
+	CCutsceneShadow *shadow = pObject->m_pRTShadow;
+	
+	if ( shadow == NULL )
+		return;
+	
+	if ( !shadow->IsInitialized() )
+		return;
+	
+	CVector pos = pObject->GetPosition();
+	
+	float fDistToCamSqr = (pos - TheCamera.GetPosition()).MagnitudeSqr2D();
+	
+	float fDrawDistance = 100.0f;
+	
+	if ( fDistToCamSqr < SQR(fDrawDistance*0.5f) )
+	{
+		if ( (CEntity*)pObject == FindPlayerPed() || TheCamera.IsSphereVisible(pos, 2.0f) )
+		{
+			float fDistToCam = Sqrt(fDistToCamSqr);
+			
+			float fMult = 1.0f - (4.0f / fDrawDistance) * (fDistToCam - (fDrawDistance*(1.0f/4.0f)));
+			int32 nColorStrength;
+
+			if ( fDistToCam >= (fDrawDistance*(1.0f/4.0f)) )
+				nColorStrength = (int32)(CTimeCycle::GetShadowStrength() * fMult);
+			else
+				nColorStrength = CTimeCycle::GetShadowStrength();
+
+			int32 color = int32(nColorStrength * 0.8f);
+			
+			pos.x += fDisplacementX;
+			pos.y += fDisplacementY;
+			
+			RwTexture *texture = shadow->GetShadowRwTexture();
+			ASSERT(texture);
+			RwRGBA bordercolor = {0, 0, 0, 0};
+			shadow->DrawBorderAroundTexture(bordercolor);
+			
+			pos.x -= fDisplacementX;
+			pos.y -= fDisplacementY;
+			
+			float angleY = 360.0f - RADTODEG((CClock::ms_nGameClockMinutes+60*
+					CClock::ms_nGameClockHours+CClock::ms_nGameClockSeconds/60)*(HALFPI/360.0f));
+			 
+			RwFrame *frame = shadow->SetLightProperties(angleY, -85.0f, true);
+			ASSERT(frame);
+			CVector at(RwFrameGetMatrix(frame)->at);
+			at.Normalise();
+			
+			CShadows::CalcPedShadowValues(at, &fFrontX, &fFrontY, &fSideX, &fSideY, &fDisplacementX, &fDisplacementY);
+			
+			pos.x -= 2.5f * fDisplacementX;
+			pos.y -= 2.5f * fDisplacementY;
+			
+			CShadows::StoreShadowToBeRendered(SHADOWTYPE_INVCOLOR, texture, &pos,
+				fFrontX * 1.5f, fFrontY * 1.5f,
+				fSideX  * 1.5f, fSideY  * 1.5f,
+				color, color, color, color,
+				4.0f, false, 1.0f, shadow, false);
+		}
+	}
+}
+#endif
+
 void
 CShadows::StoreShadowForPedObject(CEntity *pPedObject, float fDisplacementX, float fDisplacementY,
 								float fFrontX, float fFrontY, float fSideX, float fSideY)
 {
+#if 1
+	CPed *ped = (CPed*)pPedObject;
+	CCutsceneShadow *pShadow = ped->m_pRTShadow;
+
+	if (pShadow)
+	{
+		if (pShadow->IsInitialized())
+			pShadow->UpdateForCutscene();
+		::StoreShadowForCutscenePedObject(ped, fDisplacementX, fDisplacementY, fFrontX, fFrontY, fSideX, fSideY);
+		return;
+	}
+#endif
+	
 	ASSERT(pPedObject != NULL);
 
 	CVector PedPos = pPedObject->GetPosition();
@@ -592,7 +883,7 @@ CShadows::StoreShadowForPedObject(CEntity *pPedObject, float fDisplacementX, flo
 
 	float fDrawDistance = 26.0f;
 
-	if ( fDistToCamSqr < SQR(fDrawDistance*0.5f)/*?*/ )
+	if ( fDistToCamSqr < SQR(fDrawDistance*0.5f) )
 	{
 		if ( pPedObject == FindPlayerPed() || TheCamera.IsSphereVisible(PedPos, 2.0f) != false )
 		{
@@ -615,7 +906,77 @@ CShadows::StoreShadowForPedObject(CEntity *pPedObject, float fDisplacementX, flo
 					fFrontX, fFrontY,
 					fSideX, fSideY,
 					nColorStrength, nColorStrength, nColorStrength, nColorStrength,
-					4.0f, false, 1.0f);
+					4.0f, false, 1.0f, NULL, pPedObject == FindPlayerPed());
+		}
+	}
+}
+
+
+void
+CShadows::StoreShadowForCutscenePedObject(CCutsceneObject *pObject, float fDisplacementX, float fDisplacementY,
+								float fFrontX, float fFrontY, float fSideX, float fSideY)
+{
+	ASSERT(pObject != NULL);
+	
+	CCutsceneShadow *shadow = pObject->m_pShadow;
+	
+	if ( shadow == NULL )
+		return;
+	
+	if ( !shadow->IsInitialized() )
+		return;
+	
+	CVector pos = pObject->GetPosition();
+	
+	float fDistToCamSqr = (pos - TheCamera.GetPosition()).MagnitudeSqr2D();
+	
+	float fDrawDistance = 100.0f;
+	
+	if ( fDistToCamSqr < SQR(fDrawDistance*0.5f) )
+	{
+		if ( (CEntity*)pObject == FindPlayerPed() || TheCamera.IsSphereVisible(pos, 2.0f) )
+		{
+			float fDistToCam = Sqrt(fDistToCamSqr);
+			
+			float fMult = 1.0f - (4.0f / fDrawDistance) * (fDistToCam - (fDrawDistance*(1.0f/4.0f)));
+			int32 nColorStrength;
+
+			if ( fDistToCam >= (fDrawDistance*(1.0f/4.0f)) )
+				nColorStrength = (int32)(CTimeCycle::GetShadowStrength() * fMult);
+			else
+				nColorStrength = CTimeCycle::GetShadowStrength();
+
+			int32 color = int32(nColorStrength * 0.8f);
+			
+			pos.x += fDisplacementX;
+			pos.y += fDisplacementY;
+			
+			RwTexture *texture = shadow->GetShadowRwTexture();
+			ASSERT(texture);
+			RwRGBA bordercolor = {0, 0, 0, 0};
+			shadow->DrawBorderAroundTexture(bordercolor);
+			
+			pos.x -= fDisplacementX;
+			pos.y -= fDisplacementY;
+			
+			float angleY = 360.0f - RADTODEG((CClock::ms_nGameClockMinutes+60*
+					CClock::ms_nGameClockHours+CClock::ms_nGameClockSeconds/60)*(HALFPI/360.0f));
+			 
+			RwFrame *frame = shadow->SetLightProperties(angleY, -85.0f, true);
+			ASSERT(frame);
+			CVector at(RwFrameGetMatrix(frame)->at);
+			at.Normalise();
+			
+			CalcPedShadowValues(at, &fFrontX, &fFrontY, &fSideX, &fSideY, &fDisplacementX, &fDisplacementY);
+			
+			pos.x -= 2.5f * fDisplacementX;
+			pos.y -= 2.5f * fDisplacementY;
+			
+			StoreShadowToBeRendered(SHADOWTYPE_INVCOLOR, texture, &pos,
+				fFrontX * 1.5f, fFrontY * 1.5f,
+				fSideX  * 1.5f, fSideY  * 1.5f,
+				color, color, color, color,
+				4.0f, false, 1.0f, shadow, false);
 		}
 	}
 }
@@ -626,6 +987,7 @@ CShadows::StoreShadowForTree(CEntity *pTree)
 	ASSERT(pTree != NULL);
 }
 
+
 void
 CShadows::StoreShadowForPole(CEntity *pPole, float fOffsetX, float fOffsetY, float fOffsetZ,
 								float fPoleHeight, float fPoleWidth, uint32 nID)
@@ -685,6 +1047,7 @@ CShadows::SetRenderModeForShadowType(uint8 ShadowType)
 	}
 }
 
+
 void
 CShadows::RenderStoredShadows(void)
 {
@@ -693,10 +1056,13 @@ CShadows::RenderStoredShadows(void)
 	RwRenderStateSet(rwRENDERSTATEZWRITEENABLE,      (void *)FALSE);
 	RwRenderStateSet(rwRENDERSTATEZTESTENABLE,       (void *)TRUE);
 	RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void *)TRUE);
+	RwRenderStateSet(rwRENDERSTATETEXTUREADDRESS,    (void *)rwTEXTUREADDRESSCLAMP);
+
 
 	for ( int32 i = 0; i < ShadowsStoredToBeRendered; i++ )
 		asShadowsStored[i].m_nFlags.bRendered = false;
 
+
 	for ( int32 i = 0; i < ShadowsStoredToBeRendered; i++ )
 	{
 		if ( !asShadowsStored[i].m_nFlags.bRendered )
@@ -736,38 +1102,111 @@ CShadows::RenderStoredShadows(void)
 							CSector *pCurSector = CWorld::GetSector(x, y);
 
 							ASSERT(pCurSector != NULL);
-
-							CastShadowSectorList(pCurSector->m_lists[ENTITYLIST_BUILDINGS],
-									fStartX, fStartY,
-									fEndX, fEndY,
-									&shadowPos,
-									asShadowsStored[j].m_vecFront.x,
-									asShadowsStored[j].m_vecFront.y,
-									asShadowsStored[j].m_vecSide.x,
-									asShadowsStored[j].m_vecSide.y,
-									asShadowsStored[j].m_nIntensity,
-									asShadowsStored[j].m_nRed,
-									asShadowsStored[j].m_nGreen,
-									asShadowsStored[j].m_nBlue,
-									asShadowsStored[j].m_fZDistance,
-									asShadowsStored[j].m_fScale,
-									NULL);
-
-							CastShadowSectorList(pCurSector->m_lists[ENTITYLIST_BUILDINGS_OVERLAP],
-									fStartX, fStartY,
-									fEndX, fEndY,
-									&shadowPos,
-									asShadowsStored[j].m_vecFront.x,
-									asShadowsStored[j].m_vecFront.y,
-									asShadowsStored[j].m_vecSide.x,
-									asShadowsStored[j].m_vecSide.y,
-									asShadowsStored[j].m_nIntensity,
-									asShadowsStored[j].m_nRed,
-									asShadowsStored[j].m_nGreen,
-									asShadowsStored[j].m_nBlue,
-									asShadowsStored[j].m_fZDistance,
-									asShadowsStored[j].m_fScale,
-									NULL);
+							
+							if ( asShadowsStored[j].m_pCutsceneShadow )
+							{
+								CastCutsceneShadowSectorList(pCurSector->m_lists[ENTITYLIST_BUILDINGS],
+										fStartX, fStartY,
+										fEndX, fEndY,
+										&shadowPos,
+										asShadowsStored[j].m_vecFront.x,
+										asShadowsStored[j].m_vecFront.y,
+										asShadowsStored[j].m_vecSide.x,
+										asShadowsStored[j].m_vecSide.y,
+										asShadowsStored[j].m_nIntensity,
+										asShadowsStored[j].m_nRed,
+										asShadowsStored[j].m_nGreen,
+										asShadowsStored[j].m_nBlue,
+										asShadowsStored[j].m_fZDistance,
+										asShadowsStored[j].m_fScale,
+										NULL,
+										asShadowsStored[j].m_pCutsceneShadow);
+	
+								CastCutsceneShadowSectorList(pCurSector->m_lists[ENTITYLIST_BUILDINGS_OVERLAP],
+										fStartX, fStartY,
+										fEndX, fEndY,
+										&shadowPos,
+										asShadowsStored[j].m_vecFront.x,
+										asShadowsStored[j].m_vecFront.y,
+										asShadowsStored[j].m_vecSide.x,
+										asShadowsStored[j].m_vecSide.y,
+										asShadowsStored[j].m_nIntensity,
+										asShadowsStored[j].m_nRed,
+										asShadowsStored[j].m_nGreen,
+										asShadowsStored[j].m_nBlue,
+										asShadowsStored[j].m_fZDistance,
+										asShadowsStored[j].m_fScale,
+										NULL,
+										asShadowsStored[j].m_pCutsceneShadow);
+							}
+							else if ( asShadowsStored[j].m_nFlags.bDrawOnBuildings )
+							{
+								CastPlayerShadowSectorList(pCurSector->m_lists[ENTITYLIST_BUILDINGS],
+										fStartX, fStartY,
+										fEndX, fEndY,
+										&shadowPos,
+										asShadowsStored[j].m_vecFront.x,
+										asShadowsStored[j].m_vecFront.y,
+										asShadowsStored[j].m_vecSide.x,
+										asShadowsStored[j].m_vecSide.y,
+										asShadowsStored[j].m_nIntensity,
+										asShadowsStored[j].m_nRed,
+										asShadowsStored[j].m_nGreen,
+										asShadowsStored[j].m_nBlue,
+										asShadowsStored[j].m_fZDistance,
+										asShadowsStored[j].m_fScale,
+										NULL);
+	
+								CastPlayerShadowSectorList(pCurSector->m_lists[ENTITYLIST_BUILDINGS_OVERLAP],
+										fStartX, fStartY,
+										fEndX, fEndY,
+										&shadowPos,
+										asShadowsStored[j].m_vecFront.x,
+										asShadowsStored[j].m_vecFront.y,
+										asShadowsStored[j].m_vecSide.x,
+										asShadowsStored[j].m_vecSide.y,
+										asShadowsStored[j].m_nIntensity,
+										asShadowsStored[j].m_nRed,
+										asShadowsStored[j].m_nGreen,
+										asShadowsStored[j].m_nBlue,
+										asShadowsStored[j].m_fZDistance,
+										asShadowsStored[j].m_fScale,
+										NULL);
+							}
+							else
+							{
+								CastShadowSectorList(pCurSector->m_lists[ENTITYLIST_BUILDINGS],
+										fStartX, fStartY,
+										fEndX, fEndY,
+										&shadowPos,
+										asShadowsStored[j].m_vecFront.x,
+										asShadowsStored[j].m_vecFront.y,
+										asShadowsStored[j].m_vecSide.x,
+										asShadowsStored[j].m_vecSide.y,
+										asShadowsStored[j].m_nIntensity,
+										asShadowsStored[j].m_nRed,
+										asShadowsStored[j].m_nGreen,
+										asShadowsStored[j].m_nBlue,
+										asShadowsStored[j].m_fZDistance,
+										asShadowsStored[j].m_fScale,
+										NULL);
+	
+								CastShadowSectorList(pCurSector->m_lists[ENTITYLIST_BUILDINGS_OVERLAP],
+										fStartX, fStartY,
+										fEndX, fEndY,
+										&shadowPos,
+										asShadowsStored[j].m_vecFront.x,
+										asShadowsStored[j].m_vecFront.y,
+										asShadowsStored[j].m_vecSide.x,
+										asShadowsStored[j].m_vecSide.y,
+										asShadowsStored[j].m_nIntensity,
+										asShadowsStored[j].m_nRed,
+										asShadowsStored[j].m_nGreen,
+										asShadowsStored[j].m_nBlue,
+										asShadowsStored[j].m_fZDistance,
+										asShadowsStored[j].m_fScale,
+										NULL);
+							}
 						}
 					}
 
@@ -777,16 +1216,17 @@ CShadows::RenderStoredShadows(void)
 
 			RenderBuffer::RenderStuffInBuffer();
 		}
-
 	}
 
 	RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void *)FALSE);
 	RwRenderStateSet(rwRENDERSTATEZWRITEENABLE,      (void *)TRUE);
 	RwRenderStateSet(rwRENDERSTATEZTESTENABLE,       (void *)TRUE);
+	RwRenderStateSet(rwRENDERSTATETEXTUREADDRESS,    (void *)rwTEXTUREADDRESSWRAP);
 
 	ShadowsStoredToBeRendered = 0;
 }
 
+
 void
 CShadows::RenderStaticShadows(void)
 {
@@ -855,6 +1295,7 @@ CShadows::RenderStaticShadows(void)
 	RwRenderStateSet(rwRENDERSTATEZWRITEENABLE,      (void *)TRUE);
 }
 
+
 void
 CShadows::GeneratePolysForStaticShadow(int16 nStaticShadowID)
 {
@@ -912,6 +1353,7 @@ CShadows::GeneratePolysForStaticShadow(int16 nStaticShadowID)
 	}
 }
 
+
 void
 CShadows::CastShadowSectorList(CPtrList &PtrList, float fStartX, float fStartY, float fEndX, float fEndY, CVector *pPosn,
 								float fFrontX, float fFrontY, float fSideX, float fSideY,
@@ -934,28 +1376,86 @@ CShadows::CastShadowSectorList(CPtrList &PtrList, float fStartX, float fStartY,
 
 		if ( nScanCode != CWorld::GetCurrentScanCode() )
 		{
-			if ( pEntity->bUsesCollision && pEntity->IsBuilding() )
+			pEntity->m_scanCode = CWorld::GetCurrentScanCode();
+			
+			if ( pEntity->bUsesCollision && !pEntity->m_flagE2 )
 			{
-				pEntity->m_scanCode = CWorld::GetCurrentScanCode();
+				if ( IsAreaVisible(pEntity->m_area) )
+				{
+					Bound = pEntity->GetBoundRect();
+	
+					if ( fStartX < Bound.right
+						&& fEndX > Bound.left
+						&& fStartY < Bound.bottom
+						&& fEndY > Bound.top )
+					{
+						if ( pPosn->z - fZDistance < pEntity->GetPosition().z + pEntity->GetColModel()->boundingBox.max.z
+							&& pEntity->GetPosition().z + pEntity->GetColModel()->boundingBox.min.z < pPosn->z )
+						{
+							CastShadowEntityXY(pEntity,
+								fStartX, fStartY,
+								fEndX, fEndY,
+								pPosn,
+								fFrontX, fFrontY,
+								fSideX, fSideY,
+								nIntensity, nRed, nGreen, nBlue,
+								fZDistance, fScale, ppPolyBunch);
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
 
-				Bound = pEntity->GetBoundRect();
+void
+CShadows::CastPlayerShadowSectorList(CPtrList &PtrList, float fStartX, float fStartY, float fEndX, float fEndY, CVector *pPosn,
+								float fFrontX, float fFrontY, float fSideX, float fSideY,
+								int16 nIntensity, uint8 nRed, uint8 nGreen, uint8 nBlue,
+								float fZDistance, float fScale, CPolyBunch **ppPolyBunch)
+{
+	ASSERT(pPosn != NULL);
+
+	CPtrNode *pNode = PtrList.first;
+
+	CRect Bound;
+
+	while ( pNode != NULL )
+	{
+		CEntity *pEntity = (CEntity *)pNode->item;
+		uint16 nScanCode = pEntity->m_scanCode;
+		pNode = pNode->next;
+
+		ASSERT( pEntity != NULL );
 
-				if ( fStartX < Bound.right
-					&& fEndX > Bound.left
-					&& fStartY < Bound.bottom
-					&& fEndY > Bound.top )
+		if ( nScanCode != CWorld::GetCurrentScanCode() )
+		{
+			pEntity->m_scanCode = CWorld::GetCurrentScanCode();
+			
+			if ( pEntity->bUsesCollision )
+			{
+				if ( IsAreaVisible(pEntity->m_area) )
 				{
-					if ( pPosn->z - fZDistance < pEntity->GetPosition().z + pEntity->GetColModel()->boundingBox.max.z
-						&& pEntity->GetPosition().z + pEntity->GetColModel()->boundingBox.min.z < pPosn->z )
+					Bound = pEntity->GetBoundRect();
+	
+					if ( fStartX < Bound.right
+						&& fEndX > Bound.left
+						&& fStartY < Bound.bottom
+						&& fEndY > Bound.top )
 					{
-						CastShadowEntity(pEntity,
-							fStartX, fStartY,
-							fEndX, fEndY,
-							pPosn,
-							fFrontX, fFrontY,
-							fSideX, fSideY,
-							nIntensity, nRed, nGreen, nBlue,
-							fZDistance, fScale, ppPolyBunch);
+						if ( pPosn->z - fZDistance < pEntity->GetPosition().z + pEntity->GetColModel()->boundingBox.max.z
+							&& pEntity->GetPosition().z + pEntity->GetColModel()->boundingBox.min.z < pPosn->z )
+						{
+							CastShadowEntityXY(pEntity,
+								fStartX, fStartY,
+								fEndX, fEndY,
+								pPosn,
+								fFrontX, fFrontY,
+								fSideX, fSideY,
+								nIntensity, nRed, nGreen, nBlue,
+								fZDistance, fScale, ppPolyBunch);
+						}
 					}
 				}
 			}
@@ -963,12 +1463,65 @@ CShadows::CastShadowSectorList(CPtrList &PtrList, float fStartX, float fStartY,
 	}
 }
 
+
 void
-CShadows::CastShadowEntity(CEntity *pEntity,  float fStartX, float fStartY, float fEndX, float fEndY, CVector *pPosn,
+CShadows::CastCutsceneShadowSectorList(CPtrList &PtrList, float fStartX, float fStartY, float fEndX, float fEndY, CVector *pPosn,
+								float fFrontX, float fFrontY, float fSideX, float fSideY,
+								int16 nIntensity, uint8 nRed, uint8 nGreen, uint8 nBlue,
+								float fZDistance, float fScale, CPolyBunch **ppPolyBunch, CCutsceneShadow *pShadow)
+{
+	ASSERT(pPosn != NULL);
+	ASSERT(pShadow != NULL);
+	
+	CPtrNode *pNode = PtrList.first;
+
+	CRect Bound;
+
+	while ( pNode != NULL )
+	{
+		CEntity *pEntity = (CEntity *)pNode->item;
+		uint16 nScanCode = pEntity->m_scanCode;
+		pNode = pNode->next;
+
+		ASSERT( pEntity != NULL );
+
+		if ( nScanCode != CWorld::GetCurrentScanCode() )
+		{
+			pEntity->m_scanCode = CWorld::GetCurrentScanCode();
+			
+			if ( pEntity->bUsesCollision )
+			{
+				if ( IsAreaVisible(pEntity->m_area) )
+				{
+					Bound = pEntity->GetBoundRect();
+	
+					if ( fStartX < Bound.right
+						&& fEndX > Bound.left
+						&& fStartY < Bound.bottom
+						&& fEndY > Bound.top )
+					{
+						if ( pPosn->z - fZDistance < pEntity->GetPosition().z + pEntity->GetColModel()->boundingBox.max.z
+							&& pEntity->GetPosition().z + pEntity->GetColModel()->boundingBox.min.z < pPosn->z )
+						{
+							CastShadowEntityXYZ(pEntity, pPosn,
+								fFrontX, fFrontY,
+								fSideX, fSideY,
+								nIntensity, nRed, nGreen, nBlue,
+								fZDistance, fScale, ppPolyBunch, pShadow);
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
+void
+CShadows::CastShadowEntityXY(CEntity *pEntity,  float fStartX, float fStartY, float fEndX, float fEndY, CVector *pPosn,
 							float fFrontX, float fFrontY, float fSideX, float fSideY,
 							int16 nIntensity, uint8 nRed, uint8 nGreen, uint8 nBlue,
 							float fZDistance, float fScale, CPolyBunch **ppPolyBunch)
-{	
+{
 	ASSERT(pEntity != NULL);
 	ASSERT(pPosn != NULL);
 
@@ -1483,6 +2036,216 @@ CShadows::CastShadowEntity(CEntity *pEntity,  float fStartX, float fStartY, floa
 	}
 }
 
+
+typedef struct _ProjectionParam
+{
+	RwV3d               at;     /* Camera at vector */
+	RwMatrix            invMatrix; /* Transforms to shadow camera space */
+	RwUInt8             shadowValue; /* Shadow opacity value */
+	RwBool              fade;   /* Shadow fades with distance */
+	RwUInt32            numIm3DBatch; /* Number of buffer flushes */
+	RwMatrix            entityMatrix;
+}
+ProjectionParam;
+
+RwV3d *ShadowRenderTriangleCB(RwV3d *points, RwV3d *normal, ProjectionParam *param)
+{
+	RwV3d vIn[3];
+	RwV3d vShad[3];
+	
+	RwV3dTransformPoints(&vIn[0], points, 3, &param->entityMatrix);
+	
+	/*
+	 *  Reject backfacing triangles
+	 *  This reject the triangles parallel to the light as well 
+	 */
+	if (RwV3dDotProduct(normal, &param->at) > 0.0f)
+	{
+		return points;
+	}
+	
+	RwV3dTransformPoints(&vShad[0], &vIn[0], 3, &param->invMatrix);
+	
+	/*
+	 *  Reject triangles behind the camera (z test). Note that any world 
+	 *  triangles lying in front of the camera but before the object may 
+	 *  have a shadow applied. To minimize such artefacts, this test could 
+	 *  be modified to use a specific value rather than 0.0f, perhaps
+	 *  to reject triangles behind the center plane of the object.
+	 *
+	 *  Reject triangles that lie entirely outside the shadow texture range
+	 *  (x,y test).
+	 */
+	if (((vShad[0].z < 0.0f) && (vShad[1].z < 0.0f)
+		&& (vShad[2].z < 0.0f)) || ((vShad[0].x < 0.0f)
+									&& (vShad[1].x < 0.0f)
+									&& (vShad[2].x < 0.0f))
+		|| ((vShad[0].x > 1.0f) && (vShad[1].x > 1.0f)
+			&& (vShad[2].x > 1.0f)) || ((vShad[0].y < 0.0f)
+										&& (vShad[1].y < 0.0f)
+										&& (vShad[2].y < 0.0f))
+		|| ((vShad[0].y > 1.0f) && (vShad[1].y > 1.0f)
+			&& (vShad[2].y > 1.0f)))
+	{
+		return points;
+	}
+	
+	RwIm3DVertex *imv = NULL;
+	RwImVertexIndex *imi = NULL;
+	
+	RenderBuffer::StartStoring(3, 3, &imi, &imv);
+	
+	/*
+	 *  Set the immediate mode vertices for this triangle
+	 */
+	
+	RwIm3DVertexSetPos(imv, vIn[0].x, vIn[0].y, vIn[0].z);
+	RwIm3DVertexSetPos(imv + 1, vIn[1].x, vIn[1].y, vIn[1].z);
+	RwIm3DVertexSetPos(imv + 2, vIn[2].x, vIn[2].y, vIn[2].z);
+	
+	RwIm3DVertexSetU(imv, vShad[0].x);
+	RwIm3DVertexSetU(imv + 1, vShad[1].x);
+	RwIm3DVertexSetU(imv + 2, vShad[2].x);
+	
+	RwIm3DVertexSetV(imv, vShad[0].y);
+	RwIm3DVertexSetV(imv + 1, vShad[1].y);
+	RwIm3DVertexSetV(imv + 2, vShad[2].y);
+	
+	/*
+	 *  Do we fade out the shadow with distance?
+	 */
+	if (param->fade)
+	{
+		RwReal              fadeVal;
+		RwUInt8             val;
+		
+		fadeVal = 1.0f - vShad[0].z * vShad[0].z;
+		val =
+			(fadeVal <
+			0.0f) ? 0 : (RwUInt8) (fadeVal * param->shadowValue);
+		RwIm3DVertexSetRGBA(imv, val, val, val, val);
+		
+		fadeVal = 1.0f - vShad[1].z * vShad[1].z;
+		val =
+			(fadeVal <
+			0.0f) ? 0 : (RwUInt8) (fadeVal * param->shadowValue);
+		RwIm3DVertexSetRGBA(imv + 1, val, val, val, val);
+		
+		fadeVal = 1.0f - vShad[2].z * vShad[2].z;
+		val =
+			(fadeVal <
+			0.0f) ? 0 : (RwUInt8) (fadeVal * param->shadowValue);
+		RwIm3DVertexSetRGBA(imv + 2, val, val, val, val);
+	}
+	else
+	{
+		RwUInt8             val = param->shadowValue;
+		
+		RwIm3DVertexSetRGBA(imv, val, val, val, val);
+		RwIm3DVertexSetRGBA(imv + 1, val, val, val, val);
+		RwIm3DVertexSetRGBA(imv + 2, val, val, val, val);
+	}
+
+	/*
+	 *  Update buffer position 
+	 */
+	imi[0] = 0;
+	imi[1] = 1;
+	imi[2] = 2;
+	
+	RenderBuffer::StopStoring();
+	
+	return points;
+}
+
+void
+CShadows::CastShadowEntityXYZ(CEntity *pEntity, CVector *pPosn,
+								float fFrontX, float fFrontY, float fSideX, float fSideY,
+								int16 nIntensity, uint8 nRed, uint8 nGreen, uint8 nBlue,
+								float fZDistance, float fScale, CPolyBunch **ppPolyBunch, CCutsceneShadow *pShadow)
+{
+	ASSERT(pEntity != NULL);
+	ASSERT(pPosn != NULL);
+	
+	if ( pShadow )
+	{
+		ProjectionParam proj;
+		RwV3d scl;
+		RwV3d tr;
+		
+		CShadowCamera *shadow = pShadow->GetShadowCamera();
+		CColModel *collision  = pEntity->GetColModel();
+		
+		CCollision::CalculateTrianglePlanes(collision);
+		
+		RwMatrix mat;
+		mat = *RwFrameGetMatrix(RwCameraGetFrame(shadow->GetRwCamera()));
+		
+		RwV3d        Xaxis = { 1.0f, 0.0f, 0.0f };
+
+		RwMatrixRotate(&mat, &Xaxis, -45.0f, rwCOMBINEPRECONCAT);
+		
+		proj.at = mat.at;
+		pEntity->GetMatrix().CopyToRwMatrix(&proj.entityMatrix);
+
+		RwMatrixInvert(&proj.invMatrix, &mat);		
+		RwReal radius = RwCameraGetViewWindow(shadow->GetRwCamera())->x;
+		
+		scl.x = scl.y = -0.5f / (radius*0.9f);
+		scl.z = 1.0f / (radius*0.8f);
+		RwMatrixScale(&proj.invMatrix, &scl, rwCOMBINEPOSTCONCAT);
+		
+		tr.x = tr.y = 0.5f;
+		tr.z = 0.0f;
+		RwMatrixTranslate(&proj.invMatrix, &tr, rwCOMBINEPOSTCONCAT);
+		
+		proj.shadowValue = nIntensity;
+		proj.numIm3DBatch = 0;
+		
+		RwMatrix matrix;
+		pEntity->GetMatrix().CopyToRwMatrix(&matrix);
+		RwMatrix invMatrix;
+		RwMatrixInvert(&invMatrix, &matrix);
+		
+
+		CVector center(pShadow->GetBaseSphere().center);
+		center += CVector(-fFrontX * 1.1f, -fFrontY * 1.1f, -0.5f);
+		
+		CSphere sphere;
+		sphere.Set(2.0f, center);
+
+		RwV3d point;
+		RwV3dTransformPoints(&point, center, 1, &invMatrix);
+		
+		CColSphere colSphere;
+		colSphere.Set(2.0f, CVector(point), 0, 0);
+		
+		int i = 0;
+		while ( i < collision->numTriangles )
+        {
+			CVector p[3];
+
+			collision->GetTrianglePoint(p[0], collision->triangles[i].a);
+			collision->GetTrianglePoint(p[1], collision->triangles[i].b);
+			collision->GetTrianglePoint(p[2], collision->triangles[i].c);
+			
+			if ( CCollision::TestSphereTriangle(colSphere, collision->vertices, collision->triangles[i], collision->trianglePlanes[i]) )
+			{
+				CVector n(collision->trianglePlanes[i].GetNormalX(), collision->trianglePlanes[i].GetNormalY(), collision->trianglePlanes[i].GetNormalZ());
+				CVector offset = n * 0.028f;
+				
+				p[0] += offset;
+				p[1] += offset;
+				p[2] += offset;
+
+				if ( !ShadowRenderTriangleCB((RwV3d *)p, n, &proj) )
+					break;
+			}
+			i++;
+		}
+	}
+}
+
 void
 CShadows::UpdateStaticShadows(void)
 {
@@ -1511,13 +2274,14 @@ CShadows::UpdatePermanentShadows(void)
 				aPermanentShadows[i].m_nType = SHADOWTYPE_NONE;
 			else
 			{
+				bool bOk;
 				if ( timePassed >= (aPermanentShadows[i].m_nLifeTime * 3 / 4) )
 				{
 					// timePassed == 0                                -> 4
 					// timePassed == aPermanentShadows[i].m_nLifeTime -> 0
 					float fMult = 1.0f - float(timePassed - (aPermanentShadows[i].m_nLifeTime * 3 / 4)) / (aPermanentShadows[i].m_nLifeTime / 4);
 
-					StoreStaticShadow((uintptr)&aPermanentShadows[i],
+					bOk = StoreStaticShadow((uintptr)&aPermanentShadows[i],
 						aPermanentShadows[i].m_nType,
 						aPermanentShadows[i].m_pTexture,
 						&aPermanentShadows[i].m_vecPos,
@@ -1534,7 +2298,7 @@ CShadows::UpdatePermanentShadows(void)
 				}
 				else
 				{
-					StoreStaticShadow((uintptr)&aPermanentShadows[i],
+					bOk = StoreStaticShadow((uintptr)&aPermanentShadows[i],
 						aPermanentShadows[i].m_nType,
 						aPermanentShadows[i].m_pTexture,
 						&aPermanentShadows[i].m_vecPos,
@@ -1549,6 +2313,9 @@ CShadows::UpdatePermanentShadows(void)
 						aPermanentShadows[i].m_fZDistance,
 						1.0f, 40.0f, false, 0.0f);
 				}
+				
+				if ( !bOk )
+					aPermanentShadows[i].m_nType = SHADOWTYPE_NONE;
 			}
 		}
 	}
@@ -1612,6 +2379,7 @@ CShadows::CalcPedShadowValues(CVector vecLightDir,
 	*pfSideY /= 2;
 }
 
+
 void
 CShadows::RenderExtraPlayerShadows(void)
 {
@@ -1622,64 +2390,13 @@ CShadows::RenderExtraPlayerShadows(void)
 	if ( CTimeCycle::GetLightShadowStrength() != 0 )
 	{
 		CVehicle *pCar = FindPlayerVehicle();
-
 		if ( pCar == NULL )
-		{
-			for ( int32 i = 0; i < CPointLights::NumLights; i++ )
-			{
-				if (   0.0f != CPointLights::aLights[i].red
-					|| 0.0f != CPointLights::aLights[i].green
-					|| 0.0f != CPointLights::aLights[i].blue )
-				{
-					if ( CPointLights::aLights[i].castExtraShadows )
-					{
-						CVector vecLight = CPointLights::aLights[i].coors - FindPlayerCoors();
-						float fLightDist = vecLight.Magnitude();
-						float fRadius = CPointLights::aLights[i].radius;
-
-						if ( fLightDist < fRadius )
-						{
-							// fLightDist == fRadius -> 2.0f
-							// fLightDist == 0       -> 0.0f
-							float fMult = (1.0f - (2.0f * fLightDist - fRadius) / fRadius);
-
-							int32 nColorStrength;
-							if ( fLightDist < fRadius*0.5f )
-								nColorStrength = (5*CTimeCycle::GetLightShadowStrength()/8);
-							else
-								nColorStrength = int32((5*CTimeCycle::GetLightShadowStrength()/8) * fMult);
-
-							float fInv = 1.0f / fLightDist;
-							vecLight.x *= fInv;
-							vecLight.y *= fInv;
-							vecLight.z *= fInv;
-
-							float fDisplacementX, fDisplacementY, fFrontX, fFrontY, fSideX, fSideY;
-
-							CalcPedShadowValues(vecLight,
-														&fDisplacementX, &fDisplacementY,
-														&fFrontX, &fFrontY,
-														&fSideX, &fSideY);
-
-							CVector shadowPos = FindPlayerCoors();
-
-							shadowPos.x += fSideX;
-							shadowPos.y += fSideY;
-
-
-							StoreShadowToBeRendered(SHADOWTYPE_DARK, gpShadowPedTex, &shadowPos,
-									fDisplacementX, fDisplacementY,
-									fFrontX, fFrontY,
-									nColorStrength, 0, 0, 0,
-									4.0f, false, 1.0f);
-						}
-					}
-				}
-			}
-		}
+			; // R* cut it out for playerped
 		else
 		{
-			if ( pCar->GetModelIndex() != MI_RCBANDIT )
+			if ( pCar->GetModelIndex() != MI_RCBANDIT 
+				&& pCar->GetVehicleAppearance() != VEHICLE_APPEARANCE_BIKE
+				&& !pCar->IsBike() && !pCar->IsPlane() && !pCar->IsBoat() )
 			{
 				for ( int32 i = 0; i < CPointLights::NumLights; i++ )
 				{
@@ -1732,7 +2449,7 @@ CShadows::RenderExtraPlayerShadows(void)
 									pCar->GetRight().x   * (fVehicleWidth/3),
 									pCar->GetRight().y   * (fVehicleWidth/3),
 									nColorStrength, 0, 0, 0,
-									4.5f, false, 1.0f);
+									4.5f, false, 1.0f, NULL, false);
 							}
 							else
 							{
@@ -1742,7 +2459,7 @@ CShadows::RenderExtraPlayerShadows(void)
 									-pCar->GetRight().x  * (fVehicleWidth/2),
 									-pCar->GetRight().y  * (fVehicleWidth/2),
 									nColorStrength, 0, 0, 0,
-									4.5f, false, 1.0f);
+									4.5f, false, 1.0f, NULL, false);
 							}
 						}
 					}
@@ -1766,7 +2483,7 @@ CShadows::RenderIndicatorShadow(uint32 nID, uint8 ShadowType, RwTexture *pTextur
 {
 	ASSERT(pPosn != NULL);
 
-	C3dMarkers::PlaceMarkerSet(nID, _TODOCONST(4), *pPosn, Max(fFrontX, -fSideY),
+	C3dMarkers::PlaceMarkerSet(nID, MARKERTYPE_CYLINDER, *pPosn, Max(fFrontX, -fSideY),
 		SPHERE_MARKER_R, SPHERE_MARKER_G, SPHERE_MARKER_B,
 		SPHERE_MARKER_A, SPHERE_MARKER_PULSE_PERIOD, 0.2f, 0);
 }
diff --git a/src/render/Shadows.h b/src/render/Shadows.h
index 63aaaaf2..adc27ed0 100644
--- a/src/render/Shadows.h
+++ b/src/render/Shadows.h
@@ -1,12 +1,19 @@
 #pragma once
 
 #define MAX_STOREDSHADOWS    48
-#define MAX_POLYBUNCHES      300
-#define MAX_STATICSHADOWS    64
+#define MAX_POLYBUNCHES      380
+#define MAX_STATICSHADOWS    48
 #define MAX_PERMAMENTSHADOWS 48
 
 
+
 class CEntity;
+class CPtrList;
+class CAutomobile;
+class CVehicle;
+class CPed;
+class CCutsceneShadow;
+class CCutsceneObject;
 
 enum eShadowType
 {
@@ -27,6 +34,16 @@ enum eShadowTextureType
     SHADOWTEX_BLOOD
 };
 
+enum VEH_SHD_TYPE
+{
+	VEH_SHD_TYPE_CAR = 0,
+	VEH_SHD_TYPE_BIKE,
+	VEH_SHD_TYPE_HELI,
+	VEH_SHD_TYPE_SEAPLANE,
+	VEH_SHD_TYPE_RCPLANE,
+};
+
+
 class CStoredShadow
 {
 public:
@@ -35,6 +52,8 @@ public:
 	CVector2D m_vecSide;
 	float m_fZDistance;
 	float m_fScale;
+	RwTexture *m_pTexture;
+	CCutsceneShadow *m_pCutsceneShadow;
 	int16 m_nIntensity;
 	uint8 m_ShadowType;
 	uint8 m_nRed;
@@ -44,9 +63,9 @@ public:
 	{
 		uint8 bDrawOnWater      : 1;
 		uint8 bRendered         : 1;
-		//uint8 bDrawOnBuildings  : 1;
+		uint8 bDrawOnBuildings  : 1;
 	} m_nFlags;
-	RwTexture *m_pTexture;
+	
 
     CStoredShadow()
 	{  }
@@ -57,11 +76,11 @@ VALIDATE_SIZE(CStoredShadow, 0x30);
 class CPolyBunch
 {
 public:
-	int16 m_nNumVerts;
 	CVector m_aVerts[7];
+	CPolyBunch *m_pNext;
+	int16 m_nNumVerts;
 	uint8 m_aU[7];
 	uint8 m_aV[7];
-	CPolyBunch *m_pNext;
 
     CPolyBunch()
 	{  }
@@ -80,15 +99,16 @@ public:
 	CVector2D m_vecSide;
 	float m_fZDistance;
 	float m_fScale;
-	uint8 m_nType;
+	RwTexture *m_pTexture;
 	int16 m_nIntensity; // unsigned ?
+	uint8 m_nType;
 	uint8 m_nRed;
 	uint8 m_nGreen;
 	uint8 m_nBlue;
 	bool m_bJustCreated;
 	bool m_bRendered;
 	bool m_bTemp;
-	RwTexture *m_pTexture;
+	
 
 	CStaticShadow()
 	{  }
@@ -106,14 +126,14 @@ public:
 	CVector2D m_vecSide;
 	float m_fZDistance;
 	float m_fScale;
+	uint32 m_nTimeCreated;
+	uint32 m_nLifeTime;
+	RwTexture *m_pTexture;
 	int16 m_nIntensity;
 	uint8 m_nType;	// eShadowType
 	uint8 m_nRed;
 	uint8 m_nGreen;
 	uint8 m_nBlue;
-	uint32 m_nTimeCreated;
-	uint32 m_nLifeTime;
-	RwTexture *m_pTexture;
 
 	CPermanentShadow()
 	{  }
@@ -121,60 +141,62 @@ public:
 
 VALIDATE_SIZE(CPermanentShadow, 0x38);
 
-class CPtrList;
-class CAutomobile;
-class CPed;
-
 class CShadows
 {
 public:
-#if 1
 	static int16            ShadowsStoredToBeRendered;
 	static CStoredShadow    asShadowsStored  [MAX_STOREDSHADOWS];
 	static CPolyBunch       aPolyBunches     [MAX_POLYBUNCHES];
 	static CStaticShadow    aStaticShadows   [MAX_STATICSHADOWS];
 	static CPolyBunch      *pEmptyBunchList;
 	static CPermanentShadow aPermanentShadows[MAX_PERMAMENTSHADOWS];
-#else
-	static int16            &ShadowsStoredToBeRendered;
-	static CStoredShadow    (&asShadowsStored)  [MAX_STOREDSHADOWS];
-	static CPolyBunch       (&aPolyBunches)     [MAX_POLYBUNCHES];
-	static CStaticShadow    (&aStaticShadows)   [MAX_STATICSHADOWS];
-	static CPolyBunch      *&pEmptyBunchList;
-	static CPermanentShadow (&aPermanentShadows)[MAX_PERMAMENTSHADOWS];
-#endif
-
-	static void Init                         (void);
-	static void Shutdown                     (void);
-	static void AddPermanentShadow           (            uint8 ShadowType, RwTexture *pTexture, CVector *pPosn, float fFrontX, float fFrontY, float fSideX, float fSideY, int16 nIntensity, uint8 nRed, uint8 nGreen, uint8 nBlue, float fZDistance, uint32 nTime, float fScale);
-	static void StoreStaticShadow            (uint32 nID, uint8 ShadowType, RwTexture *pTexture, Const CVector *pPosn, float fFrontX, float fFrontY, float fSideX, float fSideY, int16 nIntensity, uint8 nRed, uint8 nGreen, uint8 nBlue, float fZDistance,               float fScale, float fDrawDistance, bool bTempShadow, float fUpDistance);
-	static void StoreShadowToBeRendered      (            uint8 ShadowType,                      CVector *pPosn, float fFrontX, float fFrontY, float fSideX, float fSideY, int16 nIntensity, uint8 nRed, uint8 nGreen, uint8 nBlue);
-	static void StoreShadowToBeRendered      (            uint8 ShadowType, RwTexture *pTexture, CVector *pPosn, float fFrontX, float fFrontY, float fSideX, float fSideY, int16 nIntensity, uint8 nRed, uint8 nGreen, uint8 nBlue, float fZDistance, bool bDrawOnWater, float fScale);
-	static void StoreShadowForCar            (CAutomobile *pCar);
-	static void StoreCarLightShadow          (CAutomobile *pCar, int32 nID, RwTexture *pTexture, CVector *pPosn, float fFrontX, float fFrontY, float fSideX, float fSideY,                   uint8 nRed, uint8 nGreen, uint8 nBlue, float fMaxViewAngle);
-	static void StoreShadowForPed            (CPed        *pPed,     float fDisplacementX, float fDisplacementY, float fFrontX, float fFrontY, float fSideX, float fSideY);
-	static void StoreShadowForPedObject      (CEntity *pPedObject,   float fDisplacementX, float fDisplacementY, float fFrontX, float fFrontY, float fSideX, float fSideY);
-	static void StoreShadowForTree           (CEntity *pTree);
-	static void StoreShadowForPole           (CEntity *pPole, float fOffsetX, float fOffsetY, float fOffsetZ, float fPoleHeight, float fPoleWidth, uint32 nID);
-	static void SetRenderModeForShadowType   (uint8 ShadowType);
-	static void RenderStoredShadows          (void);
-	static void RenderStaticShadows          (void);
-	static void GeneratePolysForStaticShadow (int16 nStaticShadowID);
-	static void CastShadowSectorList         (CPtrList &PtrList, float fStartX, float fStartY, float fEndX, float fEndY,
+
+	static void Init                           (void);
+	static void Shutdown                       (void);
+	static void AddPermanentShadow             (            uint8 ShadowType, RwTexture *pTexture, CVector *pPosn, float fFrontX, float fFrontY, float fSideX, float fSideY, int16 nIntensity, uint8 nRed, uint8 nGreen, uint8 nBlue, float fZDistance, uint32 nTime, float fScale);
+											   
+	static bool StoreStaticShadow              (uint32 nID, uint8 ShadowType, RwTexture *pTexture, Const CVector *pPosn, float fFrontX, float fFrontY, float fSideX, float fSideY, int16 nIntensity, uint8 nRed, uint8 nGreen, uint8 nBlue, float fZDistance,               float fScale, float fDrawDistance, bool bTempShadow, float fUpDistance);
+	static void StoreShadowToBeRendered        (            uint8 ShadowType,                      CVector *pPosn, float fFrontX, float fFrontY, float fSideX, float fSideY, int16 nIntensity, uint8 nRed, uint8 nGreen, uint8 nBlue);
+	static void StoreShadowToBeRendered        (            uint8 ShadowType, RwTexture *pTexture, CVector *pPosn, float fFrontX, float fFrontY, float fSideX, float fSideY, int16 nIntensity, uint8 nRed, uint8 nGreen, uint8 nBlue, float fZDistance, bool bDrawOnWater, float fScale, CCutsceneShadow *pShadow, bool bDrawOnBuildings);
+	static void StoreShadowForVehicle          (CVehicle *pCar, VEH_SHD_TYPE type);
+	static void StoreCarLightShadow            (CAutomobile *pCar, int32 nID, RwTexture *pTexture, CVector *pPosn, float fFrontX, float fFrontY, float fSideX, float fSideY,                   uint8 nRed, uint8 nGreen, uint8 nBlue, float fMaxViewAngle);
+	static void StoreShadowForPed              (CPed        *pPed,     float fDisplacementX, float fDisplacementY, float fFrontX, float fFrontY, float fSideX, float fSideY);
+	static void StoreShadowForPedObject        (CEntity *pPedObject,   float fDisplacementX, float fDisplacementY, float fFrontX, float fFrontY, float fSideX, float fSideY);
+	static void StoreShadowForCutscenePedObject(CCutsceneObject *pObject, float fDisplacementX, float fDisplacementY, float fFrontX, float fFrontY, float fSideX, float fSideY);
+	static void StoreShadowForTree             (CEntity *pTree);
+	static void StoreShadowForPole             (CEntity *pPole, float fOffsetX, float fOffsetY, float fOffsetZ, float fPoleHeight, float fPoleWidth, uint32 nID);
+	static void SetRenderModeForShadowType     (uint8 ShadowType);
+	static void RenderStoredShadows            (void);
+	static void RenderStaticShadows            (void);
+	
+	static void GeneratePolysForStaticShadow   (int16 nStaticShadowID);
+	static void CastShadowSectorList           (CPtrList &PtrList, float fStartX, float fStartY, float fEndX, float fEndY,
 																							     CVector *pPosn, float fFrontX, float fFrontY, float fSideX, float fSideY, int16 nIntensity, uint8 nRed, uint8 nGreen, uint8 nBlue, float fZDistance,               float fScale, CPolyBunch **ppPolyBunch);
-	static void CastShadowEntity             (CEntity *pEntity,  float fStartX, float fStartY, float fEndX, float fEndY,
+	
+	static void CastPlayerShadowSectorList     (CPtrList &PtrList, float fStartX, float fStartY, float fEndX, float fEndY,
+																								 CVector *pPosn, float fFrontX, float fFrontY, float fSideX, float fSideY, int16 nIntensity, uint8 nRed, uint8 nGreen, uint8 nBlue, float fZDistance,               float fScale, CPolyBunch **ppPolyBunch);
+
+	static void CastCutsceneShadowSectorList   (CPtrList &PtrList, float fStartX, float fStartY, float fEndX, float fEndY,
+																								 CVector *pPosn, float fFrontX, float fFrontY, float fSideX, float fSideY, int16 nIntensity, uint8 nRed, uint8 nGreen, uint8 nBlue, float fZDistance,               float fScale, CPolyBunch **ppPolyBunch, CCutsceneShadow *pShadow);
+								
+	static void CastShadowEntityXY             (CEntity *pEntity,  float fStartX, float fStartY, float fEndX, float fEndY,
 																							     CVector *pPosn, float fFrontX, float fFrontY, float fSideX, float fSideY, int16 nIntensity, uint8 nRed, uint8 nGreen, uint8 nBlue, float fZDistance,               float fScale, CPolyBunch **ppPolyBunch);
-	static void UpdateStaticShadows          (void);
-	static void UpdatePermanentShadows       (void);
-	static void CalcPedShadowValues          (CVector vecLightDir, float *pfDisplacementX, float *pfDisplacementY, float *pfFrontX, float *pfFrontY, float *pfSideX, float *pfSideY);
-	static void RenderExtraPlayerShadows     (void);
-	static void TidyUpShadows                (void);
-	static void RenderIndicatorShadow        (uint32 nID, uint8 ShadowType, RwTexture *pTexture,  CVector *pPosn, float fFrontX, float fFrontY, float fSideX, float fSideY, int16 nIntensity);
+																								 
+	static void CastShadowEntityXYZ            (CEntity *pEntity, CVector *pPosn,                                float fFrontX, float fFrontY, float fSideX, float fSideY, int16 nIntensity, uint8 nRed, uint8 nGreen, uint8 nBlue, float fZDistance,               float fScale, CPolyBunch **ppPolyBunch, CCutsceneShadow *pShadow);
+								
+	static void UpdateStaticShadows            (void);
+	static void UpdatePermanentShadows         (void);
+	static void CalcPedShadowValues            (CVector vecLightDir, float *pfDisplacementX, float *pfDisplacementY, float *pfFrontX, float *pfFrontY, float *pfSideX, float *pfSideY);
+	static void RenderExtraPlayerShadows       (void);
+	static void TidyUpShadows                  (void);
+	static void RenderIndicatorShadow          (uint32 nID, uint8 ShadowType, RwTexture *pTexture,  CVector *pPosn, float fFrontX, float fFrontY, float fSideX, float fSideY, int16 nIntensity);
 };
 
 extern RwTexture *gpShadowCarTex;
 extern RwTexture *gpShadowPedTex;
 extern RwTexture *gpShadowHeliTex;
+extern RwTexture *gpShadowBikeTex;
+extern RwTexture *gpShadowBaronTex;
 extern RwTexture *gpShadowExplosionTex;
 extern RwTexture *gpShadowHeadLightsTex;
 extern RwTexture *gpOutline1Tex;
@@ -182,7 +204,6 @@ extern RwTexture *gpOutline2Tex;
 extern RwTexture *gpOutline3Tex;
 extern RwTexture *gpBloodPoolTex;
 extern RwTexture *gpReflectionTex;
-extern RwTexture *gpGoalMarkerTex;
 extern RwTexture *gpWalkDontTex;
 extern RwTexture *gpCrackedGlassTex;
 extern RwTexture *gpPostShadowTex;