Substitute/Re3
Substitute/Re3
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

fix head/hand atomics

Browse Source
This commit is contained in:
aap 2020-05-17 15:16:12 +02:00
parent ad0b99231e
commit 964acba083
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/modelinfo/PedModelInfo.cpp
View File

@ -21,16 +21,19 @@ CPedModelInfo::DeleteRwObject(void)
frame = RpAtomicGetFrame(m_head); frame = RpAtomicGetFrame(m_head);
RpAtomicDestroy(m_head); RpAtomicDestroy(m_head);
RwFrameDestroy(frame); RwFrameDestroy(frame);
m_head = nil;
} }
if(m_lhand){ if(m_lhand){
frame = RpAtomicGetFrame(m_lhand); frame = RpAtomicGetFrame(m_lhand);
RpAtomicDestroy(m_lhand); RpAtomicDestroy(m_lhand);
RwFrameDestroy(frame); RwFrameDestroy(frame);
m_lhand = nil;
} }
if(m_rhand){ if(m_rhand){
frame = RpAtomicGetFrame(m_rhand); frame = RpAtomicGetFrame(m_rhand);
RpAtomicDestroy(m_rhand); RpAtomicDestroy(m_rhand);
RwFrameDestroy(frame); RwFrameDestroy(frame);
m_rhand = nil;
} }
#endif #endif
CClumpModelInfo::DeleteRwObject(); // PC calls this first CClumpModelInfo::DeleteRwObject(); // PC calls this first

9
src/modelinfo/PedModelInfo.h
View File

@ -36,7 +36,14 @@ public:
static RwObjectNameIdAssocation m_pPedIds[PED_NODE_MAX]; static RwObjectNameIdAssocation m_pPedIds[PED_NODE_MAX];
CPedModelInfo(void) : CClumpModelInfo(MITYPE_PED) { m_hitColModel = nil; } CPedModelInfo(void) : CClumpModelInfo(MITYPE_PED) {
m_hitColModel = nil;
#ifdef PED_SKIN
m_head = nil;
m_lhand = nil;
m_rhand = nil;
#endif
}
~CPedModelInfo(void) { delete m_hitColModel; } ~CPedModelInfo(void) { delete m_hitColModel; }
void DeleteRwObject(void); void DeleteRwObject(void);
void SetClump(RpClump *); void SetClump(RpClump *);