summaryrefslogtreecommitdiffstats
path: root/src/modelinfo/PedModelInfo.cpp
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2019-06-30 13:37:52 +0200
committerGitHub <noreply@github.com>2019-06-30 13:37:52 +0200
commit9b5a7cd4bb6d106e10e4502f123814f4ece44a2f (patch)
tree3ca33433362742fad0a4342b1047f992c70602c9 /src/modelinfo/PedModelInfo.cpp
parentMerge pull request #77 from Nick007J/master (diff)
parentCleanup project a bit (diff)
downloadre3-9b5a7cd4bb6d106e10e4502f123814f4ece44a2f.tar
re3-9b5a7cd4bb6d106e10e4502f123814f4ece44a2f.tar.gz
re3-9b5a7cd4bb6d106e10e4502f123814f4ece44a2f.tar.bz2
re3-9b5a7cd4bb6d106e10e4502f123814f4ece44a2f.tar.lz
re3-9b5a7cd4bb6d106e10e4502f123814f4ece44a2f.tar.xz
re3-9b5a7cd4bb6d106e10e4502f123814f4ece44a2f.tar.zst
re3-9b5a7cd4bb6d106e10e4502f123814f4ece44a2f.zip
Diffstat (limited to 'src/modelinfo/PedModelInfo.cpp')
-rw-r--r--src/modelinfo/PedModelInfo.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/modelinfo/PedModelInfo.cpp b/src/modelinfo/PedModelInfo.cpp
index e095902e..775148c9 100644
--- a/src/modelinfo/PedModelInfo.cpp
+++ b/src/modelinfo/PedModelInfo.cpp
@@ -25,7 +25,7 @@ RwObjectNameIdAssocation CPedModelInfo::m_pPedIds[12] = {
{ "Sfootl", PED_FOOTL, 0, },
{ "Sfootr", PED_FOOTR, 0, },
{ "Slowerlegr", PED_LOWERLEGR, 0, },
- { NULL, 0, 0, },
+ { nil, 0, 0, },
};
void
@@ -36,7 +36,7 @@ CPedModelInfo::SetClump(RpClump *clump)
if(m_hitColModel == nil)
CreateHitColModel();
if(strncmp(GetName(), "player", 7) == 0)
- RpClumpForAllAtomics(m_clump, SetAtomicRendererCB, CVisibilityPlugins::RenderPlayerCB);
+ RpClumpForAllAtomics(m_clump, SetAtomicRendererCB, (void*)CVisibilityPlugins::RenderPlayerCB);
}
RpAtomic*
@@ -82,8 +82,8 @@ CPedModelInfo::SetLowDetailClump(RpClump *lodclump)
RpClumpForAllAtomics(m_clump, CountAtomicsCB, &numAtm); // actually unused
RpClumpForAllAtomics(lodclump, CountAtomicsCB, &numLodAtm);
- RpClumpForAllAtomics(m_clump, SetAtomicRendererCB, CVisibilityPlugins::RenderPedHiDetailCB);
- RpClumpForAllAtomics(lodclump, SetAtomicRendererCB, CVisibilityPlugins::RenderPedLowDetailCB);
+ RpClumpForAllAtomics(m_clump, SetAtomicRendererCB, (void*)CVisibilityPlugins::RenderPedHiDetailCB);
+ RpClumpForAllAtomics(lodclump, SetAtomicRendererCB, (void*)CVisibilityPlugins::RenderPedLowDetailCB);
pAtm = atomics;
RpClumpForAllAtomics(lodclump, GetAtomicListCB, &pAtm);
@@ -112,14 +112,14 @@ struct ColNodeInfo
// TODO: find out piece types
#define NUMPEDINFONODES 8
ColNodeInfo m_pColNodeInfos[NUMPEDINFONODES] = {
- { NULL, PED_HEAD, 6, 0.0f, 0.05f, 0.2f },
+ { 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 },
- { NULL, PED_TORSO, 1, 0.0f, -0.07f, 0.3f },
- { NULL, PED_UPPERARML, 2, 0.07f, -0.1f, 0.2f },
- { NULL, PED_UPPERARMR, 3, -0.07f, -0.1f, 0.2f },
+ { 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 },
- { NULL, PED_LOWERLEGR, 5, 0.0f, 0.07f, 0.25f },
+ { nil, PED_LOWERLEGR, 5, 0.0f, 0.07f, 0.25f },
};
RwObject*