From 6225e5072309e69e98246f59222ba82ddf6a418a Mon Sep 17 00:00:00 2001
From: aap <aap@papnet.eu>
Date: Thu, 9 Apr 2020 16:35:24 +0200
Subject: fixed questionable RW usage; changed radar mask to PS2 techinque

---
 src/modelinfo/PedModelInfo.cpp     |  2 +-
 src/modelinfo/VehicleModelInfo.cpp | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/modelinfo')

diff --git a/src/modelinfo/PedModelInfo.cpp b/src/modelinfo/PedModelInfo.cpp
index 7b087fbd..015c6949 100644
--- a/src/modelinfo/PedModelInfo.cpp
+++ b/src/modelinfo/PedModelInfo.cpp
@@ -216,7 +216,7 @@ CPedModelInfo::AnimatePedColModel(CColModel* colmodel, RwFrame* frame)
 			RwMatrixCopy(mat, RwFrameGetMatrix(f));
 
 			for (f = RwFrameGetParent(f); f; f = RwFrameGetParent(f)) {
-				RwMatrixTransform(mat, &f->modelling, rwCOMBINEPOSTCONCAT);
+				RwMatrixTransform(mat, RwFrameGetMatrix(f), rwCOMBINEPOSTCONCAT);
 				if (RwFrameGetParent(f) == frame)
 					break;
 			}
diff --git a/src/modelinfo/VehicleModelInfo.cpp b/src/modelinfo/VehicleModelInfo.cpp
index 42ad635b..432a9ea2 100644
--- a/src/modelinfo/VehicleModelInfo.cpp
+++ b/src/modelinfo/VehicleModelInfo.cpp
@@ -707,7 +707,7 @@ RpMaterial*
 CVehicleModelInfo::GetEditableMaterialListCB(RpMaterial *material, void *data)
 {
 	static RwRGBA white = { 255, 255, 255, 255 };
-	RwRGBA *col;
+	const RwRGBA *col;
 	editableMatCBData *cbdata;
 
 	cbdata = (editableMatCBData*)data;
@@ -758,8 +758,8 @@ CVehicleModelInfo::SetVehicleColour(uint8 c1, uint8 c2)
 		col = ms_vehicleColourTable[c1];
 		coltex = ms_colourTextureTable[c1];
 		for(matp = m_materials1; *matp; matp++){
-			if(RpMaterialGetTexture(*matp) && RpMaterialGetTexture(*matp)->name[0] != '@'){
-				colp = RpMaterialGetColor(*matp);
+			if(RpMaterialGetTexture(*matp) && RwTextureGetName(RpMaterialGetTexture(*matp))[0] != '@'){
+				colp = (RwRGBA*)RpMaterialGetColor(*matp);	// get rid of const
 				colp->red = col.red;
 				colp->green = col.green;
 				colp->blue = col.blue;
@@ -773,8 +773,8 @@ CVehicleModelInfo::SetVehicleColour(uint8 c1, uint8 c2)
 		col = ms_vehicleColourTable[c2];
 		coltex = ms_colourTextureTable[c2];
 		for(matp = m_materials2; *matp; matp++){
-			if(RpMaterialGetTexture(*matp) && RpMaterialGetTexture(*matp)->name[0] != '@'){
-				colp = RpMaterialGetColor(*matp);
+			if(RpMaterialGetTexture(*matp) && RwTextureGetName(RpMaterialGetTexture(*matp))[0] != '@'){
+				colp = (RwRGBA*)RpMaterialGetColor(*matp);	// get rid of const
 				colp->red = col.red;
 				colp->green = col.green;
 				colp->blue = col.blue;
@@ -861,7 +861,7 @@ CreateCarColourTexture(uint8 r, uint8 g, uint8 b)
 	RwImageDestroy(img);
 	RwFree(pixels);
 	tex = RwTextureCreate(ras);
-	tex->name[0] = '@';
+	RwTextureGetName(tex)[0] = '@';
 	return tex;
 }
 
@@ -1058,7 +1058,7 @@ CVehicleModelInfo::LoadEnvironmentMaps(void)
 	}
 	if(gpWhiteTexture == nil){
 		gpWhiteTexture = RwTextureRead("white", nil);
-		gpWhiteTexture->name[0] = '@';
+		RwTextureGetName(gpWhiteTexture)[0] = '@';
 		RwTextureSetFilterMode(gpWhiteTexture, rwFILTERLINEAR);
 	}
 	CTxdStore::PopCurrentTxd();
-- 
cgit v1.2.3


From 34349c4df2683fca35be37ec626aaa8eef2ddaee Mon Sep 17 00:00:00 2001
From: aap <aap@papnet.eu>
Date: Thu, 9 Apr 2020 20:50:24 +0200
Subject: normalized line endings to LF

---
 src/modelinfo/MloModelInfo.h       | 26 +++++++++++++-------------
 src/modelinfo/XtraCompsModelInfo.h | 22 +++++++++++-----------
 2 files changed, 24 insertions(+), 24 deletions(-)

(limited to 'src/modelinfo')

diff --git a/src/modelinfo/MloModelInfo.h b/src/modelinfo/MloModelInfo.h
index 19ae63d5..d4344706 100644
--- a/src/modelinfo/MloModelInfo.h
+++ b/src/modelinfo/MloModelInfo.h
@@ -1,14 +1,14 @@
-#pragma once
-
-#include "ClumpModelInfo.h"
-
-class CMloModelInfo : public CClumpModelInfo
-{
-public:
-	float field_34; // draw distance?
-	int firstInstance;
-	int lastInstance;
-public:
-	CMloModelInfo(void) : CClumpModelInfo(MITYPE_MLO) {}
-	void ConstructClump();
+#pragma once
+
+#include "ClumpModelInfo.h"
+
+class CMloModelInfo : public CClumpModelInfo
+{
+public:
+	float field_34; // draw distance?
+	int firstInstance;
+	int lastInstance;
+public:
+	CMloModelInfo(void) : CClumpModelInfo(MITYPE_MLO) {}
+	void ConstructClump();
 };
\ No newline at end of file
diff --git a/src/modelinfo/XtraCompsModelInfo.h b/src/modelinfo/XtraCompsModelInfo.h
index bb37ffe3..9832399c 100644
--- a/src/modelinfo/XtraCompsModelInfo.h
+++ b/src/modelinfo/XtraCompsModelInfo.h
@@ -1,12 +1,12 @@
-#pragma once
-
-#include "ClumpModelInfo.h"
-
-class CXtraCompsModelInfo : public CClumpModelInfo
-{
-	int field_34;
-public:
-	CXtraCompsModelInfo(void) : CClumpModelInfo(MITYPE_XTRACOMPS) { field_34 = 0; }
-	void SetClump(RpClump*) {};
-	void Shutdown(void) {};
+#pragma once
+
+#include "ClumpModelInfo.h"
+
+class CXtraCompsModelInfo : public CClumpModelInfo
+{
+	int field_34;
+public:
+	CXtraCompsModelInfo(void) : CClumpModelInfo(MITYPE_XTRACOMPS) { field_34 = 0; }
+	void SetClump(RpClump*) {};
+	void Shutdown(void) {};
 };
\ No newline at end of file
-- 
cgit v1.2.3