summaryrefslogtreecommitdiffstats
path: root/src/control
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2021-01-20 17:59:49 +0100
committerGitHub <noreply@github.com>2021-01-20 17:59:49 +0100
commitc54f5c4b4f9c28c99f41c505ce4df23511fc577f (patch)
treeab66c63890d2e32eae4aec8276a78fe842c4a983 /src/control
parentMerge pull request #966 from Sergeanur/matrix (diff)
parentGet rid of bitfields in CPool (diff)
downloadre3-c54f5c4b4f9c28c99f41c505ce4df23511fc577f.tar
re3-c54f5c4b4f9c28c99f41c505ce4df23511fc577f.tar.gz
re3-c54f5c4b4f9c28c99f41c505ce4df23511fc577f.tar.bz2
re3-c54f5c4b4f9c28c99f41c505ce4df23511fc577f.tar.lz
re3-c54f5c4b4f9c28c99f41c505ce4df23511fc577f.tar.xz
re3-c54f5c4b4f9c28c99f41c505ce4df23511fc577f.tar.zst
re3-c54f5c4b4f9c28c99f41c505ce4df23511fc577f.zip
Diffstat (limited to '')
-rw-r--r--src/control/Garages.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/control/Garages.cpp b/src/control/Garages.cpp
index 2b79b338..79c44dfd 100644
--- a/src/control/Garages.cpp
+++ b/src/control/Garages.cpp
@@ -1539,7 +1539,7 @@ void CGarage::RefreshDoorPointers(bool bCreate)
m_bRecreateDoorOnNextRefresh = false;
if (m_pDoor1) {
if (m_bDoor1IsDummy) {
- if (CPools::GetDummyPool()->IsFreeSlot(CPools::GetDummyPool()->GetJustIndex_NoFreeAssert((CDummy*)m_pDoor1)))
+ if (CPools::GetDummyPool()->GetIsFree(CPools::GetDummyPool()->GetJustIndex_NoFreeAssert((CDummy*)m_pDoor1)))
bNeedToFindDoorEntities = true;
else {
if (m_bDoor1PoolIndex != (CPools::GetDummyPool()->GetIndex((CDummy*)m_pDoor1) & 0x7F))
@@ -1549,7 +1549,7 @@ void CGarage::RefreshDoorPointers(bool bCreate)
}
}
else {
- if (CPools::GetObjectPool()->IsFreeSlot(CPools::GetObjectPool()->GetJustIndex_NoFreeAssert((CObject*)m_pDoor1)))
+ if (CPools::GetObjectPool()->GetIsFree(CPools::GetObjectPool()->GetJustIndex_NoFreeAssert((CObject*)m_pDoor1)))
bNeedToFindDoorEntities = true;
else {
if (m_bDoor1PoolIndex != (CPools::GetObjectPool()->GetIndex((CObject*)m_pDoor1) & 0x7F))
@@ -1561,7 +1561,7 @@ void CGarage::RefreshDoorPointers(bool bCreate)
}
if (m_pDoor2) {
if (m_bDoor2IsDummy) {
- if (CPools::GetDummyPool()->IsFreeSlot(CPools::GetDummyPool()->GetJustIndex_NoFreeAssert((CDummy*)m_pDoor2)))
+ if (CPools::GetDummyPool()->GetIsFree(CPools::GetDummyPool()->GetJustIndex_NoFreeAssert((CDummy*)m_pDoor2)))
bNeedToFindDoorEntities = true;
else {
if (m_bDoor2PoolIndex != (CPools::GetDummyPool()->GetIndex((CDummy*)m_pDoor2) & 0x7F))
@@ -1571,7 +1571,7 @@ void CGarage::RefreshDoorPointers(bool bCreate)
}
}
else {
- if (CPools::GetObjectPool()->IsFreeSlot(CPools::GetObjectPool()->GetJustIndex_NoFreeAssert((CObject*)m_pDoor2)))
+ if (CPools::GetObjectPool()->GetIsFree(CPools::GetObjectPool()->GetJustIndex_NoFreeAssert((CObject*)m_pDoor2)))
bNeedToFindDoorEntities = true;
else {
if (m_bDoor2PoolIndex != (CPools::GetObjectPool()->GetIndex((CObject*)m_pDoor2) & 0x7F))