diff options
| author | shfil <filip.gawin@zoho.com> | 2020-05-12 23:42:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-12 23:42:52 +0200 |
| commit | bd8a0e73056ae11f113c6859fecc3fbe3376dc0b (patch) | |
| tree | cf51d6ab8430cd186e02f0e8105004f8e5476728 /src/objects | |
| parent | fix shotgun (diff) | |
| parent | Fix linux warnings (diff) | |
| download | re3-bd8a0e73056ae11f113c6859fecc3fbe3376dc0b.tar re3-bd8a0e73056ae11f113c6859fecc3fbe3376dc0b.tar.gz re3-bd8a0e73056ae11f113c6859fecc3fbe3376dc0b.tar.bz2 re3-bd8a0e73056ae11f113c6859fecc3fbe3376dc0b.tar.lz re3-bd8a0e73056ae11f113c6859fecc3fbe3376dc0b.tar.xz re3-bd8a0e73056ae11f113c6859fecc3fbe3376dc0b.tar.zst re3-bd8a0e73056ae11f113c6859fecc3fbe3376dc0b.zip | |
Diffstat (limited to 'src/objects')
| -rw-r--r-- | src/objects/ParticleObject.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/objects/ParticleObject.cpp b/src/objects/ParticleObject.cpp index 3dd80546..2fbe6195 100644 --- a/src/objects/ParticleObject.cpp +++ b/src/objects/ParticleObject.cpp @@ -61,7 +61,7 @@ CParticleObject::CParticleObject() : m_nState(POBJECTSTATE_INITIALISED), m_pNext(NULL), m_pPrev(NULL), - m_nRemoveTimer(NULL) + m_nRemoveTimer(0) { ; @@ -1127,13 +1127,21 @@ CParticleObject::SaveParticle(uint8 *buffer, uint32 *length) for ( CParticleObject *p = pCloseListHead; p != NULL; p = p->m_pNext ) { +#ifdef FIX_BUGS + *(CParticleObject*)buffer = *p; +#else memcpy(buffer, p, sizeof(CParticleObject)); +#endif buffer += sizeof(CParticleObject); } for ( CParticleObject *p = pFarListHead; p != NULL; p = p->m_pNext ) { +#ifdef FIX_BUGS + *(CParticleObject*)buffer = *p; +#else memcpy(buffer, p, sizeof(CParticleObject)); +#endif buffer += sizeof(CParticleObject); } |