more bletcherous stuff

This commit is contained in:
aap 2021-01-25 10:45:38 +01:00
parent fef87b9219
commit a4c5b87b90

View file

@ -50,7 +50,7 @@ RwObject*
CSimpleModelInfo::CreateInstance(void) CSimpleModelInfo::CreateInstance(void)
{ {
RpAtomic *atomic; RpAtomic *atomic;
if(m_atomics && m_atomics[0] == nil) if(m_atomics == nil || m_atomics[0] == nil)
return nil; return nil;
atomic = RpAtomicClone(m_atomics[0]); atomic = RpAtomicClone(m_atomics[0]);
RpAtomicSetFrame(atomic, RwFrameCreate()); RpAtomicSetFrame(atomic, RwFrameCreate());
@ -64,7 +64,7 @@ CSimpleModelInfo::CreateInstance(RwMatrix *matrix)
RpAtomic *atomic; RpAtomic *atomic;
RwFrame *frame; RwFrame *frame;
if(m_atomics && m_atomics[0] == nil) if(m_atomics == nil || m_atomics[0] == nil)
return nil; return nil;
atomic = RpAtomicClone(m_atomics[0]); atomic = RpAtomicClone(m_atomics[0]);
frame = RwFrameCreate(); frame = RwFrameCreate();
@ -205,6 +205,8 @@ CSimpleModelInfo::GetAtomicFromDistance(float dist)
{ {
int i; int i;
i = 0; i = 0;
// HACk until we figure out what's going on
if(m_atomics == nil) return nil;
if(m_isDamaged) if(m_isDamaged)
i = m_firstDamaged; i = m_firstDamaged;
for(; i < m_numAtomics; i++) for(; i < m_numAtomics; i++)