From 6ff921c160e802c12ad40b06f17a93f72eea6bdf Mon Sep 17 00:00:00 2001
From: aap <aap@papnet.eu>
Date: Sun, 28 Jul 2019 13:14:08 +0200
Subject: CAutomobile::PreRender; whole class finished

---
 src/render/Coronas.cpp   | 2 +-
 src/render/Coronas.h     | 2 +-
 src/render/Renderer.cpp  | 4 ++--
 src/render/Shadows.h     | 1 +
 src/render/Skidmarks.cpp | 1 +
 src/render/Skidmarks.h   | 1 +
 src/render/SpecialFX.cpp | 1 +
 src/render/SpecialFX.h   | 9 ++++++++-
 8 files changed, 16 insertions(+), 5 deletions(-)

(limited to 'src/render')

diff --git a/src/render/Coronas.cpp b/src/render/Coronas.cpp
index 5ac9b149..1a6cfea3 100644
--- a/src/render/Coronas.cpp
+++ b/src/render/Coronas.cpp
@@ -203,7 +203,7 @@ CCoronas::RegisterCorona(uint32 id, uint8 red, uint8 green, uint8 blue, uint8 al
 }
 
 void
-CCoronas::UpdateCoronaCoors(int id, const CVector &coors, float drawDist, float someAngle)
+CCoronas::UpdateCoronaCoors(uint32 id, const CVector &coors, float drawDist, float someAngle)
 {
 	int i;
 
diff --git a/src/render/Coronas.h b/src/render/Coronas.h
index ed69b1e6..359a34ed 100644
--- a/src/render/Coronas.h
+++ b/src/render/Coronas.h
@@ -93,7 +93,7 @@ public:
 	static void RegisterCorona(uint32 id, uint8 red, uint8 green, uint8 blue, uint8 alpha,
 		const CVector &coors, float size, float drawDist, uint8 type,
 		int8 flareType, uint8 reflection, uint8 LOScheck, uint8 drawStreak, float someAngle);
-	static void UpdateCoronaCoors(int id, const CVector &coors, float drawDist, float someAngle);
+	static void UpdateCoronaCoors(uint32 id, const CVector &coors, float drawDist, float someAngle);
 	static void Render(void);
 	static void RenderReflections(void);
 	static void DoSunAndMoon(void);
diff --git a/src/render/Renderer.cpp b/src/render/Renderer.cpp
index 7bf4593f..77489e60 100644
--- a/src/render/Renderer.cpp
+++ b/src/render/Renderer.cpp
@@ -359,10 +359,10 @@ CRenderer::SetupEntityVisibility(CEntity *ent)
 				   ent->GetModelIndex() == MI_RHINO ||
 				   ent->GetModelIndex() == MI_COACH ||
 				   TheCamera.m_bInATunnelAndABigVehicle){
-					ent->m_flagD40 = true;
+					ent->bNoBrightHeadLights = true;
 				}else{
 					m_pFirstPersonVehicle = (CVehicle*)ent;
-					ent->m_flagD40 = false;
+					ent->bNoBrightHeadLights = false;
 				}
 				return VIS_OFFSCREEN;
 			}else{
diff --git a/src/render/Shadows.h b/src/render/Shadows.h
index 585518ee..c12327b1 100644
--- a/src/render/Shadows.h
+++ b/src/render/Shadows.h
@@ -177,3 +177,4 @@ public:
 
 extern RwTexture *&gpBloodPoolTex;
 extern RwTexture *&gpShadowExplosionTex;
+extern RwTexture *&gpShadowHeadLightsTex;
diff --git a/src/render/Skidmarks.cpp b/src/render/Skidmarks.cpp
index fd5e7d2b..bbadd54c 100644
--- a/src/render/Skidmarks.cpp
+++ b/src/render/Skidmarks.cpp
@@ -5,3 +5,4 @@
 WRAPPER void CSkidmarks::Clear(void) { EAXJMP(0x518130); }
 
 WRAPPER void CSkidmarks::Render(void) { EAXJMP(0x5182E0); }
+WRAPPER void CSkidmarks::RegisterOne(uint32 id, CVector pos, float fwdx, float fwdY, bool *isMuddy, bool *isBloddy) { EAXJMP(0x5185C0); }
diff --git a/src/render/Skidmarks.h b/src/render/Skidmarks.h
index d1e1d996..280150a7 100644
--- a/src/render/Skidmarks.h
+++ b/src/render/Skidmarks.h
@@ -5,4 +5,5 @@ class CSkidmarks
 public:
 	static void Clear(void);
 	static void Render(void);
+	static void RegisterOne(uint32 id, CVector pos, float fwdx, float fwdY, bool *isMuddy, bool *isBloddy);
 };
diff --git a/src/render/SpecialFX.cpp b/src/render/SpecialFX.cpp
index 4fa2677a..bed5af50 100644
--- a/src/render/SpecialFX.cpp
+++ b/src/render/SpecialFX.cpp
@@ -11,5 +11,6 @@ CBulletTrace (&CBulletTraces::aTraces)[16] = *(CBulletTrace(*)[16])*(uintptr*)0x
 
 WRAPPER void CBulletTraces::Init(void) { EAXJMP(0x518DE0); }
 
+WRAPPER void CBrightLights::RegisterOne(CVector pos, CVector up, CVector right, CVector fwd, uint8 type, uint8 unk1, uint8 unk2, uint8 unk3) { EAXJMP(0x51A410); }
 
 WRAPPER void C3dMarkers::PlaceMarkerSet(uint32 id, uint16 type, CVector& pos, float size, uint8 r, uint8 g, uint8 b, uint8 a, uint16 pulsePeriod, float pulseFraction, int16 rotateRate)  { EAXJMP(0x51BB80); }
\ No newline at end of file
diff --git a/src/render/SpecialFX.h b/src/render/SpecialFX.h
index 08f0f08a..9c61c0fb 100644
--- a/src/render/SpecialFX.h
+++ b/src/render/SpecialFX.h
@@ -29,8 +29,15 @@ public:
 	static void Init(void);
 };
 
+class CBrightLights
+{
+public:
+	static void RegisterOne(CVector pos, CVector up, CVector right, CVector fwd, uint8 type, uint8 unk1 = 0, uint8 unk2 = 0, uint8 unk3 = 0);
+};
+
 class C3dMarkers
 {
 public:
 	static void PlaceMarkerSet(uint32 id, uint16 type, CVector& pos, float size, uint8 r, uint8 g, uint8 b, uint8 a, uint16 pulsePeriod, float pulseFraction, int16 rotateRate);  
-};
\ No newline at end of file
+};
+
-- 
cgit v1.2.3