summaryrefslogtreecommitdiffstats
path: root/src/control/Script5.cpp
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-12-08 06:52:03 +0100
committerSergeanur <s.anureev@yandex.ua>2020-12-08 06:52:03 +0100
commitf3e9c82432a260fa88ed8bc1d4a7432fd4a4fdba (patch)
tree5f59716adfd44cb5e8e7f03d5503d8d8e01b015d /src/control/Script5.cpp
parentFix bike's fInAirXRes (diff)
downloadre3-f3e9c82432a260fa88ed8bc1d4a7432fd4a4fdba.tar
re3-f3e9c82432a260fa88ed8bc1d4a7432fd4a4fdba.tar.gz
re3-f3e9c82432a260fa88ed8bc1d4a7432fd4a4fdba.tar.bz2
re3-f3e9c82432a260fa88ed8bc1d4a7432fd4a4fdba.tar.lz
re3-f3e9c82432a260fa88ed8bc1d4a7432fd4a4fdba.tar.xz
re3-f3e9c82432a260fa88ed8bc1d4a7432fd4a4fdba.tar.zst
re3-f3e9c82432a260fa88ed8bc1d4a7432fd4a4fdba.zip
Diffstat (limited to 'src/control/Script5.cpp')
-rw-r--r--src/control/Script5.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/control/Script5.cpp b/src/control/Script5.cpp
index 7efebb73..1f47c9b9 100644
--- a/src/control/Script5.cpp
+++ b/src/control/Script5.cpp
@@ -1784,10 +1784,10 @@ INITSAVEBUF
handle = 0;
} else if (pBuilding->GetIsATreadable()) {
type = 1;
- handle = CPools::GetTreadablePool()->GetJustIndex((CTreadable*)pBuilding) + 1;
+ handle = CPools::GetTreadablePool()->GetJustIndex_NoFreeAssert((CTreadable*)pBuilding) + 1;
} else {
type = 2;
- handle = CPools::GetBuildingPool()->GetJustIndex(pBuilding) + 1;
+ handle = CPools::GetBuildingPool()->GetJustIndex_NoFreeAssert(pBuilding) + 1;
}
WriteSaveBuf(buf, type);
WriteSaveBuf(buf, handle);
@@ -1805,19 +1805,19 @@ INITSAVEBUF
case ENTITY_TYPE_BUILDING:
if (((CBuilding*)pEntity)->GetIsATreadable()) {
type = 1;
- handle = CPools::GetTreadablePool()->GetJustIndex((CTreadable*)pEntity) + 1;
+ handle = CPools::GetTreadablePool()->GetJustIndex_NoFreeAssert((CTreadable*)pEntity) + 1;
} else {
type = 2;
- handle = CPools::GetBuildingPool()->GetJustIndex((CBuilding*)pEntity) + 1;
+ handle = CPools::GetBuildingPool()->GetJustIndex_NoFreeAssert((CBuilding*)pEntity) + 1;
}
break;
case ENTITY_TYPE_OBJECT:
type = 3;
- handle = CPools::GetObjectPool()->GetJustIndex((CObject*)pEntity) + 1;
+ handle = CPools::GetObjectPool()->GetJustIndex_NoFreeAssert((CObject*)pEntity) + 1;
break;
case ENTITY_TYPE_DUMMY:
type = 4;
- handle = CPools::GetDummyPool()->GetJustIndex((CDummy*)pEntity) + 1;
+ handle = CPools::GetDummyPool()->GetJustIndex_NoFreeAssert((CDummy*)pEntity) + 1;
default: break;
}
}