From a0b3117ee4c39ef546257746996411433476e8b5 Mon Sep 17 00:00:00 2001 From: Filip Gawin Date: Wed, 13 May 2020 02:01:42 +0200 Subject: [PATCH] Revert to memcpy --- src/core/Pools.cpp | 2 +- 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));