From 97d5698e0c669fd98911991b2ce3042fce376f06 Mon Sep 17 00:00:00 2001
From: aap <aap@papnet.eu>
Date: Sat, 9 May 2020 17:05:26 +0200
Subject: peds starting to work

---
 src/modelinfo/ModelIndices.h   |  9 +++++++++
 src/modelinfo/PedModelInfo.cpp | 20 +++++++++++---------
 src/modelinfo/PedModelInfo.h   | 14 +++++++++++---
 3 files changed, 31 insertions(+), 12 deletions(-)

(limited to 'src/modelinfo')

diff --git a/src/modelinfo/ModelIndices.h b/src/modelinfo/ModelIndices.h
index 938eda37..d3d568b2 100644
--- a/src/modelinfo/ModelIndices.h
+++ b/src/modelinfo/ModelIndices.h
@@ -176,6 +176,14 @@ enum
 	MI_MEDIC,
 	MI_FIREMAN,
 	MI_MALE01,
+
+	MI_TAXI_D = 28,	// HMOCA
+	MI_GANG01 = 83,	// CBa
+	MI_VICE1 = 97,
+	MI_WFYG2 = 106,	// last regular ped
+	MI_SPECIAL01 = 109,
+	MI_SPECIAL21 = 129,
+/*
 	MI_TAXI_D,
 	MI_PIMP,
 	MI_GANG01,
@@ -256,6 +264,7 @@ enum
 	MI_BUSKER3,
 	MI_BUSKER4,
 	// three more peds possible
+*/
 
 	MI_FIRST_VEHICLE = 130,
 	MI_LANDSTAL = MI_FIRST_VEHICLE,
diff --git a/src/modelinfo/PedModelInfo.cpp b/src/modelinfo/PedModelInfo.cpp
index 7dfadf06..7b467c64 100644
--- a/src/modelinfo/PedModelInfo.cpp
+++ b/src/modelinfo/PedModelInfo.cpp
@@ -187,16 +187,18 @@ struct ColNodeInfo
 	float radius;
 };
 
-#define NUMPEDINFONODES 8
+#define NUMPEDINFONODES 10
 ColNodeInfo m_pColNodeInfos[NUMPEDINFONODES] = {
-	{ nil,          PED_HEAD,		PEDPIECE_HEAD,  0.0f,   0.05f, 0.2f },
-	{ "Storso",     0,				PEDPIECE_TORSO,  0.0f,   0.15f, 0.2f },
-	{ "Storso",     0,				PEDPIECE_TORSO,  0.0f,  -0.05f, 0.3f },
-	{ nil,          PED_MID,		PEDPIECE_MID,  0.0f,  -0.07f, 0.3f },
-	{ nil,          PED_UPPERARML,	PEDPIECE_LEFTARM,  0.07f, -0.1f,  0.2f },
-	{ nil,          PED_UPPERARMR,	PEDPIECE_RIGHTARM, -0.07f, -0.1f,  0.2f },
-	{ "Slowerlegl", 0,				PEDPIECE_LEFTLEG,  0.0f,   0.07f, 0.25f },
-	{ nil,          PED_LOWERLEGR,	PEDPIECE_RIGHTLEG,  0.0f,   0.07f, 0.25f },
+	{ nil, PED_HEAD,	PEDPIECE_HEAD,	0.0f,   0.05f, 0.15f },
+	{ nil, PED_MID,		PEDPIECE_TORSO,	0.0f,   0.15f, 0.2f },
+	{ nil, PED_MID,		PEDPIECE_TORSO,	0.0f,  -0.05f, 0.25f },
+	{ nil, PED_MID,		PEDPIECE_MID,	0.0f,  -0.25f, 0.25f },
+	{ nil, PED_UPPERARML,	PEDPIECE_LEFTARM,	0.03f, -0.05f,  0.16f },
+	{ nil, PED_UPPERARMR,	PEDPIECE_RIGHTARM,	-0.03f, -0.05f,  0.16f },
+	{ nil, PED_LOWERLEGL,	PEDPIECE_LEFTLEG,	0.0f,   0.15f, 0.2f },
+	{ nil, PED_LOWERLEGR,	PEDPIECE_RIGHTLEG,	0.0f,   0.15f, 0.2f },
+	{ nil, PED_FOOTL,	PEDPIECE_LEFTLEG,	0.0f,   0.15f, 0.15f },
+	{ nil, PED_FOOTR,	PEDPIECE_RIGHTLEG,	0.0f,   0.15f, 0.15f },
 };
 
 RwObject*
diff --git a/src/modelinfo/PedModelInfo.h b/src/modelinfo/PedModelInfo.h
index a2bfd122..912c5a22 100644
--- a/src/modelinfo/PedModelInfo.h
+++ b/src/modelinfo/PedModelInfo.h
@@ -5,8 +5,8 @@
 #include "PedStats.h"
 
 enum PedNode {
-	PED_TORSO,
-	PED_MID,	// Smid on PS2/PC, Storso on mobile/xbox
+	PED_TORSO = 0,	// has no bone!
+	PED_MID,
 	PED_HEAD,
 	PED_UPPERARML,
 	PED_UPPERARMR,
@@ -17,7 +17,15 @@ enum PedNode {
 	PED_FOOTL,
 	PED_FOOTR,
 	PED_LOWERLEGR,
-	PED_NODE_MAX// Not valid: PED_LOWERLEGL
+	PED_LOWERLEGL,
+
+	PED_FOREARML,
+	PED_FOREARMR,
+	PED_CLAVICLEL,
+	PED_CLAVICLER,
+	PED_NECK,
+
+	PED_NODE_MAX
 };
 
 class CPedModelInfo : public CClumpModelInfo
-- 
cgit v1.2.3