diff options
| author | aap <aap@papnet.eu> | 2020-04-23 22:25:18 +0200 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2020-04-24 11:42:38 +0200 |
| commit | f03b4eec4c37eab75a5bd639279cfcc615105b01 (patch) | |
| tree | c4be4fa57b16c61d45e8156a51dd07b11e049bba /src/modelinfo/PedModelInfo.h | |
| parent | Merge branch 'master' of github.com:gtamodding/re3 (diff) | |
| download | re3-f03b4eec4c37eab75a5bd639279cfcc615105b01.tar re3-f03b4eec4c37eab75a5bd639279cfcc615105b01.tar.gz re3-f03b4eec4c37eab75a5bd639279cfcc615105b01.tar.bz2 re3-f03b4eec4c37eab75a5bd639279cfcc615105b01.tar.lz re3-f03b4eec4c37eab75a5bd639279cfcc615105b01.tar.xz re3-f03b4eec4c37eab75a5bd639279cfcc615105b01.tar.zst re3-f03b4eec4c37eab75a5bd639279cfcc615105b01.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/modelinfo/PedModelInfo.h | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/src/modelinfo/PedModelInfo.h b/src/modelinfo/PedModelInfo.h index 0336fa9b..a2bfd122 100644 --- a/src/modelinfo/PedModelInfo.h +++ b/src/modelinfo/PedModelInfo.h @@ -28,11 +28,13 @@ public: ePedStats m_pedStatType; uint32 m_carsCanDrive; CColModel *m_hitColModel; +#ifdef PED_SKIN RpAtomic *m_head; RpAtomic *m_lhand; RpAtomic *m_rhand; +#endif - static RwObjectNameIdAssocation m_pPedIds[12]; + static RwObjectNameIdAssocation m_pPedIds[PED_NODE_MAX]; CPedModelInfo(void) : CClumpModelInfo(MITYPE_PED) { } void DeleteRwObject(void); @@ -40,7 +42,18 @@ public: void SetLowDetailClump(RpClump*); void CreateHitColModel(void); + void CreateHitColModelSkinned(RpClump *clump); CColModel *GetHitColModel(void) { return m_hitColModel; } static CColModel *AnimatePedColModel(CColModel* colmodel, RwFrame* frame); + CColModel *AnimatePedColModelSkinned(RpClump *clump); + +#ifdef PED_SKIN + static RpAtomic *findLimbsCb(RpAtomic *atomic, void *data); + RpAtomic *getHead(void) { return m_head; } + RpAtomic *getLeftHand(void) { return m_lhand; } + RpAtomic *getRightHand(void) { return m_rhand; } +#endif }; -static_assert(sizeof(CPedModelInfo) == 0x54, "CPedModelInfo: error"); +#ifndef PED_SKIN +static_assert(sizeof(CPedModelInfo) == 0x48, "CPedModelInfo: error"); +#endif
\ No newline at end of file |