diff options
| author | erorcun <erorcunerorcun@hotmail.com.tr> | 2020-12-09 04:34:04 +0100 |
|---|---|---|
| committer | erorcun <erorcunerorcun@hotmail.com.tr> | 2020-12-09 04:34:04 +0100 |
| commit | ba0c9e8b295cc988077df68a71573d3ebcff2b60 (patch) | |
| tree | 0532f46e3335ca84ff32caa4884a145ba06e0e10 /src/control/Script5.cpp | |
| parent | Frontend cleanup, .INI, CFO, scrollable pages (diff) | |
| parent | Merge pull request #872 from withmorten/sized-enums-miami (diff) | |
| download | re3-ba0c9e8b295cc988077df68a71573d3ebcff2b60.tar re3-ba0c9e8b295cc988077df68a71573d3ebcff2b60.tar.gz re3-ba0c9e8b295cc988077df68a71573d3ebcff2b60.tar.bz2 re3-ba0c9e8b295cc988077df68a71573d3ebcff2b60.tar.lz re3-ba0c9e8b295cc988077df68a71573d3ebcff2b60.tar.xz re3-ba0c9e8b295cc988077df68a71573d3ebcff2b60.tar.zst re3-ba0c9e8b295cc988077df68a71573d3ebcff2b60.zip | |
Diffstat (limited to 'src/control/Script5.cpp')
| -rw-r--r-- | src/control/Script5.cpp | 12 |
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; } } |