summaryrefslogtreecommitdiffstats
path: root/src/modelinfo
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2019-06-30 15:21:58 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2019-06-30 15:21:58 +0200
commit7c6b291860fd415f79067fc7058f11ffa58fdf10 (patch)
tree15ccabed4c8c5d7c5c2f7a636035876cbd183e4d /src/modelinfo
parentReactivated Store(Restore)StuffIn(From)Mem, fixed bugs (diff)
parentMerge pull request #78 from ShFil119/cleanup (diff)
downloadre3-7c6b291860fd415f79067fc7058f11ffa58fdf10.tar
re3-7c6b291860fd415f79067fc7058f11ffa58fdf10.tar.gz
re3-7c6b291860fd415f79067fc7058f11ffa58fdf10.tar.bz2
re3-7c6b291860fd415f79067fc7058f11ffa58fdf10.tar.lz
re3-7c6b291860fd415f79067fc7058f11ffa58fdf10.tar.xz
re3-7c6b291860fd415f79067fc7058f11ffa58fdf10.tar.zst
re3-7c6b291860fd415f79067fc7058f11ffa58fdf10.zip
Diffstat (limited to 'src/modelinfo')
-rw-r--r--src/modelinfo/BaseModelInfo.cpp4
-rw-r--r--src/modelinfo/ClumpModelInfo.cpp2
-rw-r--r--src/modelinfo/PedModelInfo.cpp18
-rw-r--r--src/modelinfo/VehicleModelInfo.cpp2
4 files changed, 13 insertions, 13 deletions
diff --git a/src/modelinfo/BaseModelInfo.cpp b/src/modelinfo/BaseModelInfo.cpp
index f44c86b6..37f94c93 100644
--- a/src/modelinfo/BaseModelInfo.cpp
+++ b/src/modelinfo/BaseModelInfo.cpp
@@ -9,7 +9,7 @@
CBaseModelInfo::CBaseModelInfo(ModeInfoType type)
{
m_colModel = nil;
- m_twodEffects = 0;
+ m_twodEffects = nil;
m_objectId = -1;
m_refCount = 0;
m_txdSlot = -1;
@@ -23,7 +23,7 @@ CBaseModelInfo::Shutdown(void)
{
DeleteCollisionModel();
DeleteRwObject();
- m_twodEffects = 0;
+ m_twodEffects = nil;
m_num2dEffects = 0;
m_txdSlot = -1;
}
diff --git a/src/modelinfo/ClumpModelInfo.cpp b/src/modelinfo/ClumpModelInfo.cpp
index 4a19f1df..24deed38 100644
--- a/src/modelinfo/ClumpModelInfo.cpp
+++ b/src/modelinfo/ClumpModelInfo.cpp
@@ -48,7 +48,7 @@ CClumpModelInfo::SetClump(RpClump *clump)
AddTexDictionaryRef();
RpClumpForAllAtomics(clump, SetAtomicRendererCB, nil);
if(strncmp(GetName(), "playerh", 8) == 0)
- RpClumpForAllAtomics(clump, SetAtomicRendererCB, CVisibilityPlugins::RenderPlayerCB);
+ RpClumpForAllAtomics(clump, SetAtomicRendererCB, (void*)CVisibilityPlugins::RenderPlayerCB);
}
void
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*
diff --git a/src/modelinfo/VehicleModelInfo.cpp b/src/modelinfo/VehicleModelInfo.cpp
index 2f1d2027..78eee96c 100644
--- a/src/modelinfo/VehicleModelInfo.cpp
+++ b/src/modelinfo/VehicleModelInfo.cpp
@@ -1003,7 +1003,7 @@ CVehicleModelInfo::SetEnvironmentMapCB(RpMaterial *material, void *data)
if(spec <= 0.0f)
RpMatFXMaterialSetEffects(material, rpMATFXEFFECTNULL);
else{
- if(RpMaterialGetTexture(material) == 0)
+ if(RpMaterialGetTexture(material) == nil)
RpMaterialSetTexture(material, gpWhiteTexture);
RpMatFXMaterialSetEffects(material, rpMATFXEFFECTENVMAP);
#ifndef PS2_MATFX