diff options
| author | shfil <filip.gawin@zoho.com> | 2020-05-13 02:03:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-13 02:03:16 +0200 |
| commit | 3eeb963df5505bfb4c32fac78b300cef705a9288 (patch) | |
| tree | 0f6b1bd18194f2ae3b44eb2e5fb2914ee76f5aec | |
| parent | Merge pull request #537 from ShFil119/linux_warns (diff) | |
| parent | Revert to memcpy (diff) | |
| download | re3-3eeb963df5505bfb4c32fac78b300cef705a9288.tar re3-3eeb963df5505bfb4c32fac78b300cef705a9288.tar.gz re3-3eeb963df5505bfb4c32fac78b300cef705a9288.tar.bz2 re3-3eeb963df5505bfb4c32fac78b300cef705a9288.tar.lz re3-3eeb963df5505bfb4c32fac78b300cef705a9288.tar.xz re3-3eeb963df5505bfb4c32fac78b300cef705a9288.tar.zst re3-3eeb963df5505bfb4c32fac78b300cef705a9288.zip | |
| -rw-r--r-- | src/core/Pools.cpp | 2 | ||||
| -rw-r--r-- | src/objects/ParticleObject.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/core/Pools.cpp b/src/core/Pools.cpp index b361c36f..58605f0a 100644 --- a/src/core/Pools.cpp +++ b/src/core/Pools.cpp @@ -90,7 +90,7 @@ CPools::MakeSureSlotInObjectPoolIsEmpty(int32 slot) // relocate to another slot?? CObject *newObject = new CObject(object->GetModelIndex(), false); CWorld::Remove(object); -#ifdef FIX_BUGS +#if 0 // todo better *newObject = *object; #else memcpy(newObject, object, ms_pObjectPool->GetMaxEntrySize()); diff --git a/src/objects/ParticleObject.cpp b/src/objects/ParticleObject.cpp index 2fbe6195..a8afaf6c 100644 --- a/src/objects/ParticleObject.cpp +++ b/src/objects/ParticleObject.cpp @@ -1127,7 +1127,7 @@ CParticleObject::SaveParticle(uint8 *buffer, uint32 *length) for ( CParticleObject *p = pCloseListHead; p != NULL; p = p->m_pNext ) { -#ifdef FIX_BUGS +#if 0 // todo better *(CParticleObject*)buffer = *p; #else memcpy(buffer, p, sizeof(CParticleObject)); @@ -1137,7 +1137,7 @@ CParticleObject::SaveParticle(uint8 *buffer, uint32 *length) for ( CParticleObject *p = pFarListHead; p != NULL; p = p->m_pNext ) { -#ifdef FIX_BUGS +#if 0 // todo better *(CParticleObject*)buffer = *p; #else memcpy(buffer, p, sizeof(CParticleObject)); |