archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-07-24 14:19:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into miami

Browse Source 
# Conflicts:
#	src/modelinfo/ClumpModelInfo.cpp
This commit is contained in:
Sergeanur
2020-05-14 17:05:42 +03:00
parent 41e9754338 2fb4305a73
commit 24875f34d0
18 changed files with 211 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/objects/ParticleObject.cpp
View File

@ -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));