a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-23 20:10:00 +00:00
Code Issues Projects Releases Wiki Activity

fix garages

Browse source
This commit is contained in:
Nikolay Korolev 2020-05-12 16:21:00 +03:00
parent 4b566c26a3
commit ca6ed7f00f
1 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/control/Garages.cpp
View file

@ -1461,7 +1461,7 @@ static bool DoINeedToRefreshPointer(CEntity * pDoor, bool bIsDummy, int8 nIndex)
if (bIsDummy) { if (bIsDummy) {
if (CPools::GetDummyPool()->IsFreeSlot(CPools::GetDummyPool()->GetJustIndex((CDummy*)pDoor))) if (CPools::GetDummyPool()->IsFreeSlot(CPools::GetDummyPool()->GetJustIndex((CDummy*)pDoor)))
return true; return true;
if (nIndex != CPools::GetDummyPool()->GetIndex((CDummy*)pDoor)) if (nIndex != (CPools::GetDummyPool()->GetIndex((CDummy*)pDoor) & 0x7F))
bNeedToFindDoorEntities = true; bNeedToFindDoorEntities = true;
if (!CGarages::IsModelIndexADoor(pDoor->GetModelIndex())) if (!CGarages::IsModelIndexADoor(pDoor->GetModelIndex()))
return true; return true;
@ -1469,7 +1469,7 @@ static bool DoINeedToRefreshPointer(CEntity * pDoor, bool bIsDummy, int8 nIndex)
else { else {
if (CPools::GetObjectPool()->IsFreeSlot(CPools::GetObjectPool()->GetJustIndex((CObject*)pDoor))) if (CPools::GetObjectPool()->IsFreeSlot(CPools::GetObjectPool()->GetJustIndex((CObject*)pDoor)))
return true; return true;
if (nIndex != CPools::GetObjectPool()->GetIndex((CObject*)pDoor)) if (nIndex != (CPools::GetObjectPool()->GetIndex((CObject*)pDoor) & 0x7F))
bNeedToFindDoorEntities = true; bNeedToFindDoorEntities = true;
if (!CGarages::IsModelIndexADoor(pDoor->GetModelIndex())) if (!CGarages::IsModelIndexADoor(pDoor->GetModelIndex()))
return true; return true;
@ -1672,20 +1672,22 @@ void CGarage::FindDoorsEntities()
FindDoorsEntitiesSectorList(s->m_lists[ENTITYLIST_DUMMIES_OVERLAP], true); FindDoorsEntitiesSectorList(s->m_lists[ENTITYLIST_DUMMIES_OVERLAP], true);
} }
} }
if (!m_pDoor1 || !m_pDoor2) if (m_pDoor1 && m_pDoor2) {
return; CVector2D vecDoor1ToGarage(m_pDoor1->GetPosition().x - GetGarageCenterX(), m_pDoor1->GetPosition().y - GetGarageCenterY());
if (m_pDoor1->GetModelIndex() == MI_CRUSHERBODY || m_pDoor1->GetModelIndex() == MI_CRUSHERLID) CVector2D vecDoor2ToGarage(m_pDoor2->GetPosition().x - GetGarageCenterX(), m_pDoor2->GetPosition().y - GetGarageCenterY());
return; if (DotProduct2D(vecDoor1ToGarage, vecDoor2ToGarage) > 0.0f) {
CVector2D vecDoor1ToGarage(m_pDoor1->GetPosition().x - GetGarageCenterX(), m_pDoor1->GetPosition().y - GetGarageCenterY()); if (vecDoor1ToGarage.MagnitudeSqr() >= vecDoor2ToGarage.MagnitudeSqr()) {
CVector2D vecDoor2ToGarage(m_pDoor2->GetPosition().x - GetGarageCenterX(), m_pDoor2->GetPosition().y - GetGarageCenterY()); m_pDoor1 = m_pDoor2;
if (DotProduct2D(vecDoor1ToGarage, vecDoor2ToGarage) > 0.0f) { m_bDoor1IsDummy = m_bDoor2IsDummy;
if (vecDoor1ToGarage.MagnitudeSqr() >= vecDoor2ToGarage.MagnitudeSqr()) { }
m_pDoor1 = m_pDoor2; m_pDoor2 = nil;
m_bDoor1IsDummy = m_bDoor2IsDummy; m_bDoor2IsDummy = false;
} }
m_pDoor2 = nil;
m_bDoor2IsDummy = false;
} }
if (m_pDoor1)
m_pDoor1->bUsesCollision = true;
if (m_pDoor2)
m_pDoor2->bUsesCollision = true;
} }
void CGarage::FindDoorsEntitiesSectorList(CPtrList& list, bool dummy) void CGarage::FindDoorsEntitiesSectorList(CPtrList& list, bool dummy)
@ -1734,7 +1736,7 @@ void CGarages::SetGarageDoorToRotate(int16 garage)
aGarages[garage].m_bRotatedDoor = true; aGarages[garage].m_bRotatedDoor = true;
aGarages[garage].m_fDoorHeight /= 2.0f; aGarages[garage].m_fDoorHeight /= 2.0f;
aGarages[garage].m_fDoorHeight -= 0.1f; aGarages[garage].m_fDoorHeight -= 0.1f;
aGarages[garage].m_fDoorPos = Max(aGarages[garage].m_fDoorHeight, aGarages[garage].m_fDoorPos); aGarages[garage].m_fDoorPos = Min(aGarages[garage].m_fDoorHeight, aGarages[garage].m_fDoorPos);
aGarages[garage].UpdateDoorsHeight(); aGarages[garage].UpdateDoorsHeight();
} }