Merge branch 'miami' into lcs

# Conflicts:
#	src/core/World.cpp

1 files changed, 2 insertions, 2 deletions

diff --git a/src/core/World.cpp b/src/core/World.cpp
index 1bf3611b..9ea999dc 100644
--- a/src/core/World.cpp
+++ b/src/core/World.cpp
@@ -1486,7 +1486,7 @@ CWorld::CallOffChaseForAreaSectorListVehicles(CPtrList &list, float x1, float y1
 				CColModel *pColModel = pVehicle->GetColModel();
 				bool bInsideSphere = false;
 				for(int32 i = 0; i < pColModel->numSpheres; i++) {
-					CVector pos = pVehicle->m_matrix * pColModel->spheres[i].center;
+					CVector pos = pVehicle->GetMatrix() * pColModel->spheres[i].center;
 					float fRadius = pColModel->spheres[i].radius;
 					if(pos.x + fRadius > x1 && pos.x - fRadius < x2 && pos.y + fRadius > y1 &&
 					   pos.y - fRadius < y2)
@@ -1801,7 +1801,7 @@ CWorld::RepositionOneObject(CEntity *pEntity)
 		position.z = FindGroundZFor3DCoord(position.x, position.y,
 		                                           position.z + OBJECT_REPOSITION_OFFSET_Z, nil) -
 		             fBoundingBoxMinZ;
-		pEntity->m_matrix.UpdateRW();
+		pEntity->GetMatrix().UpdateRW();
 		pEntity->UpdateRwFrame();
 	} else if(modelId == MI_BUOY) {
 		float fWaterLevel = 0.0f;