From 964acba08382cd0748cd46f4676a7b4e9025957a Mon Sep 17 00:00:00 2001
From: aap <aap@papnet.eu>
Date: Sun, 17 May 2020 15:16:12 +0200
Subject: [PATCH] fix head/hand atomics

---
 src/modelinfo/PedModelInfo.cpp | 3 +++
 src/modelinfo/PedModelInfo.h   | 9 ++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/modelinfo/PedModelInfo.cpp b/src/modelinfo/PedModelInfo.cpp
index 0cb0fc36..473e8b63 100644
--- a/src/modelinfo/PedModelInfo.cpp
+++ b/src/modelinfo/PedModelInfo.cpp
@@ -21,16 +21,19 @@ CPedModelInfo::DeleteRwObject(void)
 		frame = RpAtomicGetFrame(m_head);
 		RpAtomicDestroy(m_head);
 		RwFrameDestroy(frame);
+		m_head = nil;
 	}
 	if(m_lhand){
 		frame = RpAtomicGetFrame(m_lhand);
 		RpAtomicDestroy(m_lhand);
 		RwFrameDestroy(frame);
+		m_lhand = nil;
 	}
 	if(m_rhand){
 		frame = RpAtomicGetFrame(m_rhand);
 		RpAtomicDestroy(m_rhand);
 		RwFrameDestroy(frame);
+		m_rhand = nil;
 	}
 #endif
 	CClumpModelInfo::DeleteRwObject();	// PC calls this first
diff --git a/src/modelinfo/PedModelInfo.h b/src/modelinfo/PedModelInfo.h
index 52f75894..d73d3646 100644
--- a/src/modelinfo/PedModelInfo.h
+++ b/src/modelinfo/PedModelInfo.h
@@ -36,7 +36,14 @@ public:
 
 	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; }
 	void DeleteRwObject(void);
 	void SetClump(RpClump *);