diff options
| author | eray orçunus <erayorcunus@gmail.com> | 2019-07-18 05:26:46 +0300 |
|---|---|---|
| committer | eray orçunus <erayorcunus@gmail.com> | 2019-07-18 05:27:29 +0300 |
| commit | 59671fab03703570eeb4837b713108619d762a01 (patch) | |
| tree | e94e57a02e09540ba97e078486485d7558be0592 /src/modelinfo | |
| parent | 06ed308bb1a2383125cf04fd712b1753c4ba1d55 (diff) | |
The Peds, mainly dying/injuring
There is also some reorganization
Diffstat (limited to 'src/modelinfo')
| -rw-r--r-- | src/modelinfo/PedModelInfo.cpp | 20 | ||||
| -rw-r--r-- | src/modelinfo/PedModelInfo.h | 4 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/modelinfo/PedModelInfo.cpp b/src/modelinfo/PedModelInfo.cpp index 747cbc99..0ad218f3 100644 --- a/src/modelinfo/PedModelInfo.cpp +++ b/src/modelinfo/PedModelInfo.cpp @@ -1,5 +1,6 @@ #include "common.h" #include "patcher.h" +#include "Ped.h" #include "NodeName.h" #include "VisibilityPlugins.h" #include "ModelInfo.h" @@ -14,7 +15,7 @@ CPedModelInfo::DeleteRwObject(void) } RwObjectNameIdAssocation CPedModelInfo::m_pPedIds[12] = { - { "Smid", PED_TORSO, 0, }, // that is strange... + { "Smid", PED_MID, 0, }, // that is strange... { "Shead", PED_HEAD, 0, }, { "Supperarml", PED_UPPERARML, 0, }, { "Supperarmr", PED_UPPERARMR, 0, }, @@ -109,17 +110,16 @@ struct ColNodeInfo float radius; }; -// TODO: find out piece types #define NUMPEDINFONODES 8 ColNodeInfo m_pColNodeInfos[NUMPEDINFONODES] = { - { nil, PED_HEAD, 6, 0.0f, 0.05f, 0.2f }, - { "Storso", 0, 0, 0.0f, 0.15f, 0.2f }, - { "Storso", 0, 0, 0.0f, -0.05f, 0.3f }, - { nil, PED_TORSO, 1, 0.0f, -0.07f, 0.3f }, - { nil, PED_UPPERARML, 2, 0.07f, -0.1f, 0.2f }, - { nil, PED_UPPERARMR, 3, -0.07f, -0.1f, 0.2f }, - { "Slowerlegl", 0, 4, 0.0f, 0.07f, 0.25f }, - { nil, PED_LOWERLEGR, 5, 0.0f, 0.07f, 0.25f }, + { nil, PED_HEAD, PEDPIECE_HEAD, 0.0f, 0.05f, 0.2f }, + { "Storso", PED_TORSO, PEDPIECE_NONE, 0.0f, 0.15f, 0.2f }, + { "Storso", PED_TORSO, PEDPIECE_NONE, 0.0f, -0.05f, 0.3f }, + { nil, PED_MID, PEDPIECE_BODY, 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 }, }; RwObject* diff --git a/src/modelinfo/PedModelInfo.h b/src/modelinfo/PedModelInfo.h index bec46b4e..483d13f8 100644 --- a/src/modelinfo/PedModelInfo.h +++ b/src/modelinfo/PedModelInfo.h @@ -3,8 +3,8 @@ #include "ClumpModelInfo.h" enum PedNode { - PED_WAIST, - PED_TORSO, // Smid on PS2/PC, Storso on mobile/xbox + PED_TORSO, + PED_MID, // Smid on PS2/PC, Storso on mobile/xbox PED_HEAD, PED_UPPERARML, PED_UPPERARMR, |