1 files changed, 12 insertions, 12 deletions

diff --git a/src/control/Pickups.cpp b/src/control/Pickups.cpp
index d5db4ad8..6b56cd8f 100644
--- a/src/control/Pickups.cpp
+++ b/src/control/Pickups.cpp
@@ -84,7 +84,7 @@ CPickup::GiveUsAPickUpObject(int32 handle)
 
 	if (object == nil) return nil;
 	object->ObjectCreatedBy = MISSION_OBJECT;
-	object->GetPosition() = m_vecPos;
+	object->SetPosition(m_vecPos);
 	object->SetOrientation(0.0f, 0.0f, -HALFPI);
 	object->GetMatrix().UpdateRW();
 	object->UpdateRwFrame();
@@ -229,7 +229,7 @@ CPickup::Update(CPlayerPed *player, CVehicle *vehicle, int playerId)
 				if (m_eType == PICKUP_ON_STREET) {
 					m_nTimer = CTimer::GetTimeInMilliseconds() + 30000;
 				} else if (m_eType == PICKUP_ON_STREET_SLOW) {
-					if (MI_PICKUP_BRIBE == m_pObject->m_modelIndex)
+					if (MI_PICKUP_BRIBE == m_pObject->GetModelIndex())
 						m_nTimer = CTimer::GetTimeInMilliseconds() + 300000;
 					else
 						m_nTimer = CTimer::GetTimeInMilliseconds() + 720000;
@@ -288,7 +288,7 @@ CPickup::Update(CPlayerPed *player, CVehicle *vehicle, int playerId)
 		case PICKUP_NAUTICAL_MINE_INACTIVE:
 		{
 			if (CWaterLevel::GetWaterLevel(m_pObject->GetPosition().x, m_pObject->GetPosition().y, m_pObject->GetPosition().z + 5.0f, &waterLevel, false))
-				m_pObject->GetPosition().z = waterLevel + 0.6f;
+				m_pObject->GetMatrix().GetPosition().z = waterLevel + 0.6f;
 
 			m_pObject->GetMatrix().UpdateRW();
 			m_pObject->UpdateRwFrame();
@@ -310,7 +310,7 @@ CPickup::Update(CPlayerPed *player, CVehicle *vehicle, int playerId)
 		}
 		case PICKUP_NAUTICAL_MINE_ARMED:
 			if (CWaterLevel::GetWaterLevel(m_pObject->GetPosition().x, m_pObject->GetPosition().y, m_pObject->GetPosition().z + 5.0f, &waterLevel, false))
-				m_pObject->GetPosition().z = waterLevel + 0.6f;
+				m_pObject->GetMatrix().GetPosition().z = waterLevel + 0.6f;
 
 			m_pObject->GetMatrix().UpdateRW();
 			m_pObject->UpdateRwFrame();
@@ -337,7 +337,7 @@ CPickup::Update(CPlayerPed *player, CVehicle *vehicle, int playerId)
 		}
 		case PICKUP_FLOATINGPACKAGE:
 			m_pObject->m_vecMoveSpeed.z -= 0.01f * CTimer::GetTimeStep();
-			m_pObject->GetPosition() += m_pObject->GetMoveSpeed() * CTimer::GetTimeStep();
+			m_pObject->GetMatrix().GetPosition() += m_pObject->GetMoveSpeed() * CTimer::GetTimeStep();
 
 			m_pObject->GetMatrix().UpdateRW();
 			m_pObject->UpdateRwFrame();
@@ -346,7 +346,7 @@ CPickup::Update(CPlayerPed *player, CVehicle *vehicle, int playerId)
 			break;
 		case PICKUP_FLOATINGPACKAGE_FLOATING:
 			if (CWaterLevel::GetWaterLevel(m_pObject->GetPosition().x, m_pObject->GetPosition().y, m_pObject->GetPosition().z + 5.0f, &waterLevel, 0))
-				m_pObject->GetPosition().z = waterLevel;
+				m_pObject->GetMatrix().GetPosition().z = waterLevel;
 
 			m_pObject->GetMatrix().UpdateRW();
 			m_pObject->UpdateRwFrame();
@@ -695,7 +695,7 @@ CPickups::DoPickUpEffects(CEntity *entity)
 
 		assert(colorId >= 0);
 
-		CVector &pos = entity->GetPosition();
+		const CVector &pos = entity->GetPosition();
 
 		float colorModifier = ((CGeneral::GetRandomNumber() & 0x1F) * 0.015f + 1.0f) * modifiedSin * 0.15f;
 		CShadows::StoreStaticShadow(
@@ -749,7 +749,7 @@ CPickups::DoPickUpEffects(CEntity *entity)
 void
 CPickups::DoMineEffects(CEntity *entity)
 {
-	CVector &pos = entity->GetPosition();
+	const CVector &pos = entity->GetPosition();
 	float dist = (TheCamera.GetPosition() - pos).Magnitude();
 	const float MAXDIST = 20.0f;
 
@@ -771,7 +771,7 @@ CPickups::DoMineEffects(CEntity *entity)
 void
 CPickups::DoMoneyEffects(CEntity *entity)
 {
-	CVector &pos = entity->GetPosition();
+	const CVector &pos = entity->GetPosition();
 	float dist = (TheCamera.GetPosition() - pos).Magnitude();
 	const float MAXDIST = 20.0f;
 
@@ -793,7 +793,7 @@ CPickups::DoMoneyEffects(CEntity *entity)
 void
 CPickups::DoCollectableEffects(CEntity *entity)
 {
-	CVector &pos = entity->GetPosition();
+	const CVector &pos = entity->GetPosition();
 	float dist = (TheCamera.GetPosition() - pos).Magnitude();
 	const float MAXDIST = 14.0f;
 
@@ -1145,7 +1145,7 @@ CPacManPickups::GeneratePMPickUps(CVector pos, float scrambleMult, int16 count,
 				CObject *obj = new CObject(MI_BULLION, true);
 				if (obj != nil) {
 					obj->ObjectCreatedBy = MISSION_OBJECT;
-					obj->GetPosition() = aPMPickUps[i].m_vecPosn;
+					obj->SetPosition(aPMPickUps[i].m_vecPosn);
 					obj->SetOrientation(0.0f, 0.0f, -HALFPI);
 					obj->GetMatrix().UpdateRW();
 					obj->UpdateRwFrame();
@@ -1296,7 +1296,7 @@ CPacManPickups::GeneratePMPickUpsForRace(int32 race)
 			if (obj != nil) {
 				obj->ObjectCreatedBy = MISSION_OBJECT;
 
-				obj->GetPosition() = aPMPickUps[i].m_vecPosn;
+				obj->SetPosition(aPMPickUps[i].m_vecPosn);
 				obj->SetOrientation(0.0f, 0.0f, -HALFPI);
 				obj->GetMatrix().UpdateRW();
 				obj->UpdateRwFrame();