From 2115faec3867ada3a07aa7900ea0a871529343f3 Mon Sep 17 00:00:00 2001
From: Filip Gawin <filip.gawin@zoho.com>
Date: Sun, 30 Jun 2019 12:53:39 +0200
Subject: Cleanup project a bit

---
 src/modelinfo/BaseModelInfo.cpp    |  4 ++--
 src/modelinfo/ClumpModelInfo.cpp   |  2 +-
 src/modelinfo/PedModelInfo.cpp     | 18 +++++++++---------
 src/modelinfo/VehicleModelInfo.cpp |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'src/modelinfo')

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
-- 
cgit v1.2.3