Merge remote-tracking branch 'origin/master' into miami

# Conflicts:
#	src/control/RoadBlocks.cpp
#	src/core/Collision.h
#	src/core/Pad.cpp
#	src/core/SurfaceTable.h
#	src/core/main.cpp
#	src/core/re3.cpp
#	src/peds/Population.cpp
#	src/render/Fluff.cpp
#	src/render/Shadows.cpp
#	src/render/Shadows.h
#	src/render/Sprite2d.cpp
#	src/weapons/BulletInfo.cpp

1 files changed, 3 insertions, 1 deletions

diff --git a/src/render/Shadows.cpp b/src/render/Shadows.cpp
index c22afa76..9b864d27 100644
--- a/src/render/Shadows.cpp
+++ b/src/render/Shadows.cpp
@@ -1585,7 +1585,9 @@ CShadows::CastShadowEntityXY(CEntity *pEntity,  float fStartX, float fStartY, fl
 		CColTrianglePlane *pColTriPlanes = pCol->trianglePlanes;
 		ASSERT(pColTriPlanes != nil);
 
-		if ( Abs(pColTriPlanes[i].normal.z) > 0.1f )
+		CVector normal;
+		pColTriPlanes[i].GetNormal(normal);
+		if ( Abs(normal.z) > 0.1f )
 		{
 			CColTriangle *pColTri = pCol->triangles;
 			ASSERT(pColTri != nil);