diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2020-05-12 23:55:52 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2020-05-12 23:55:52 +0200 |
| commit | 7c2b9478d52e5122eff2e11298f31bfc1b896f94 (patch) | |
| tree | 53ad6828eb1366a5dd00d9977eec330bd3d7b52f /src/core/Pools.cpp | |
| parent | Merge remote-tracking branch 'origin/master' into miami (diff) | |
| parent | Merge pull request #537 from ShFil119/linux_warns (diff) | |
| download | re3-7c2b9478d52e5122eff2e11298f31bfc1b896f94.tar re3-7c2b9478d52e5122eff2e11298f31bfc1b896f94.tar.gz re3-7c2b9478d52e5122eff2e11298f31bfc1b896f94.tar.bz2 re3-7c2b9478d52e5122eff2e11298f31bfc1b896f94.tar.lz re3-7c2b9478d52e5122eff2e11298f31bfc1b896f94.tar.xz re3-7c2b9478d52e5122eff2e11298f31bfc1b896f94.tar.zst re3-7c2b9478d52e5122eff2e11298f31bfc1b896f94.zip | |
Diffstat (limited to 'src/core/Pools.cpp')
| -rw-r--r-- | src/core/Pools.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/core/Pools.cpp b/src/core/Pools.cpp index bc65f6b6..b361c36f 100644 --- a/src/core/Pools.cpp +++ b/src/core/Pools.cpp @@ -90,7 +90,11 @@ CPools::MakeSureSlotInObjectPoolIsEmpty(int32 slot) // relocate to another slot?? CObject *newObject = new CObject(object->GetModelIndex(), false); CWorld::Remove(object); +#ifdef FIX_BUGS + *newObject = *object; +#else memcpy(newObject, object, ms_pObjectPool->GetMaxEntrySize()); +#endif CWorld::Add(newObject); object->m_rwObject = nil; delete object; |