5 files changed, 25 insertions, 7 deletions

diff --git a/src/modelinfo/BaseModelInfo.h b/src/modelinfo/BaseModelInfo.h
index 2505967b..4c274aaf 100644
--- a/src/modelinfo/BaseModelInfo.h
+++ b/src/modelinfo/BaseModelInfo.h
@@ -63,9 +63,9 @@ public:
 	bool DoesOwnColModel(void) { return m_bOwnsColModel; }
 	void DeleteCollisionModel(void);
 	void ClearTexDictionary(void) { m_txdSlot = -1; }
-	short GetObjectID(void) { return m_objectId; }
+	int16 GetObjectID(void) { return m_objectId; }
 	void SetObjectID(int16 id) { m_objectId = id; }
-	short GetTxdSlot(void) { return m_txdSlot; }
+	int16 GetTxdSlot(void) { return m_txdSlot; }
 	void AddRef(void);
 	void RemoveRef(void);
 	void SetTexDictionary(const char *name);
diff --git a/src/modelinfo/ModelIndices.cpp b/src/modelinfo/ModelIndices.cpp
index 056c3733..98c7fb38 100644
--- a/src/modelinfo/ModelIndices.cpp
+++ b/src/modelinfo/ModelIndices.cpp
@@ -3,7 +3,7 @@
 #include "General.h"
 #include "ModelIndices.h"
 
-#define X(name, var) int16 var;
+#define X(name, var) int16 var = -1;
 	MODELINDICES
 #undef X
 
diff --git a/src/modelinfo/PedModelInfo.h b/src/modelinfo/PedModelInfo.h
index d73d3646..f467fe8a 100644
--- a/src/modelinfo/PedModelInfo.h
+++ b/src/modelinfo/PedModelInfo.h
@@ -2,7 +2,6 @@
 
 #include "ClumpModelInfo.h"
 #include "PedType.h"
-#include "PedStats.h"
 
 enum PedNode {
 	PED_TORSO,
diff --git a/src/modelinfo/SimpleModelInfo.h b/src/modelinfo/SimpleModelInfo.h
index ee63f24b..94e55a2f 100644
--- a/src/modelinfo/SimpleModelInfo.h
+++ b/src/modelinfo/SimpleModelInfo.h
@@ -11,6 +11,18 @@ public:
 	float  m_lodDistances[3];
 	uint8  m_numAtomics;
 	uint8  m_alpha;
+	/* // For reference, PS2 has:
+	uint8  m_firstDamaged;
+	uint8  m_normalCull    : 1;
+	uint8  m_isDamaged     : 1;
+	uint8  m_isBigBuilding : 1;
+	uint8  m_noFade        : 1;
+	uint8  m_drawLast      : 1;
+	uint8  m_additive      : 1;
+	uint8  m_isSubway      : 1;
+	uint8  m_ignoreLight   : 1; 
+	// m_noZwrite is missing because not needed
+	*/
 	uint16 m_firstDamaged   : 2; // 0: no damage model
 	                         // 1: 1 and 2 are damage models
 	                         // 2: 2 is damage model
diff --git a/src/modelinfo/VehicleModelInfo.cpp b/src/modelinfo/VehicleModelInfo.cpp
index a024bb40..17754211 100644
--- a/src/modelinfo/VehicleModelInfo.cpp
+++ b/src/modelinfo/VehicleModelInfo.cpp
@@ -536,7 +536,7 @@ CVehicleModelInfo::SetVehicleComponentFlags(RwFrame *frame, uint32 flags)
 {
 	tHandlingData *handling;
 
-	handling = mod_HandlingManager.GetHandlingData((eHandlingId)m_handlingId);
+	handling = mod_HandlingManager.GetHandlingData((tVehicleType)m_handlingId);
 
 #define SETFLAGS(f) RwFrameForAllObjects(frame, SetAtomicFlagCB, (void*)(f))
 
@@ -962,7 +962,7 @@ CVehicleModelInfo::DeleteVehicleColourTextures(void)
 	for(i = 0; i < 256; i++){
 		if(ms_colourTextureTable[i]){
 			RwTextureDestroy(ms_colourTextureTable[i]);
-#ifdef GTA3_1_1_PATCH
+#if GTA_VERSION >= GTA3_PC_11
 			ms_colourTextureTable[i] = nil;
 #endif
 		}
@@ -998,6 +998,8 @@ CVehicleModelInfo::SetEnvironmentMapCB(RpMaterial *material, void *data)
 	return material;
 }
 
+bool initialised;
+
 RpAtomic*
 CVehicleModelInfo::SetEnvironmentMapCB(RpAtomic *atomic, void *data)
 {
@@ -1011,7 +1013,12 @@ CVehicleModelInfo::SetEnvironmentMapCB(RpAtomic *atomic, void *data)
 		RpGeometryForAllMaterials(geo, SetEnvironmentMapCB, data);
 		RpGeometrySetFlags(geo, RpGeometryGetFlags(geo) | rpGEOMETRYMODULATEMATERIALCOLOR);
 		RpMatFXAtomicEnableEffects(atomic);
-		// PS2 sets of PS2Manager lighting CB here
+#ifdef GTA_PS2
+		if(!initialised){
+			SetupPS2ManagerLightingCallback(RpAtomicGetInstancePipeline(atomic));
+			initialised = true;
+		}
+#endif
 	}
 	return atomic;
 }