diff options
| author | aap <aap@papnet.eu> | 2020-05-10 13:08:02 +0200 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2020-05-10 13:08:02 +0200 |
| commit | f7300c7a27c3f2633419fe73ec2643fc9d4951cf (patch) | |
| tree | 6483fb404f227882bdaf0979e919adb29887c03d /src/modelinfo/PedModelInfo.h | |
| parent | Merge pull request #530 from Nick007J/miami (diff) | |
| download | re3-f7300c7a27c3f2633419fe73ec2643fc9d4951cf.tar re3-f7300c7a27c3f2633419fe73ec2643fc9d4951cf.tar.gz re3-f7300c7a27c3f2633419fe73ec2643fc9d4951cf.tar.bz2 re3-f7300c7a27c3f2633419fe73ec2643fc9d4951cf.tar.lz re3-f7300c7a27c3f2633419fe73ec2643fc9d4951cf.tar.xz re3-f7300c7a27c3f2633419fe73ec2643fc9d4951cf.tar.zst re3-f7300c7a27c3f2633419fe73ec2643fc9d4951cf.zip | |
Diffstat (limited to 'src/modelinfo/PedModelInfo.h')
| -rw-r--r-- | src/modelinfo/PedModelInfo.h | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/src/modelinfo/PedModelInfo.h b/src/modelinfo/PedModelInfo.h index 912c5a22..e878a59b 100644 --- a/src/modelinfo/PedModelInfo.h +++ b/src/modelinfo/PedModelInfo.h @@ -36,32 +36,17 @@ public: ePedStats m_pedStatType; uint32 m_carsCanDrive; CColModel *m_hitColModel; -#ifdef PED_SKIN - RpAtomic *m_head; - RpAtomic *m_lhand; - RpAtomic *m_rhand; -#endif + int8 radio1, radio2; static RwObjectNameIdAssocation m_pPedIds[PED_NODE_MAX]; - CPedModelInfo(void) : CClumpModelInfo(MITYPE_PED) { } + CPedModelInfo(void) : CClumpModelInfo(MITYPE_PED) { m_hitColModel = nil; } + ~CPedModelInfo(void) { delete m_hitColModel; } void DeleteRwObject(void); void SetClump(RpClump *); - 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 + CColModel *AnimatePedColModelSkinnedWorld(RpClump *clump); }; -#ifndef PED_SKIN -static_assert(sizeof(CPedModelInfo) == 0x48, "CPedModelInfo: error"); -#endif
\ No newline at end of file |