1 files changed, 17 insertions, 13 deletions

diff --git a/src/render/Coronas.h b/src/render/Coronas.h
index 46eb4315..45f027d8 100644
--- a/src/render/Coronas.h
+++ b/src/render/Coronas.h
@@ -4,19 +4,21 @@ extern RwTexture *gpCoronaTexture[9];
 
 struct CRegisteredCorona
 {
+	CVector coors;
 	uint32 id;
 	uint32 lastLOScheck;
 	RwTexture *texture;
+	float size;
+	float someAngle;
+	float drawDist;
+	float nearDist;
+	float heightAboveRoad;
 	uint8 red;
 	uint8 green;
 	uint8 blue;
 	uint8 alpha;		// alpha when fully visible
 	uint8 fadeAlpha;	// actual value used for rendering, faded
-	CVector coors;
-	float size;
-	float someAngle;
 	bool registeredThisFrame;
-	float drawDist;
 	int8 flareType;
 	int8 reflection;
 
@@ -25,12 +27,11 @@ struct CRegisteredCorona
 	uint8 firstUpdate : 1;
 	uint8 drawStreak : 1;
 	uint8 sightClear : 1;
+	uint8 useNearDist : 1;
+	uint8 renderReflection : 1;
 
-	bool renderReflection;
-	float heightAboveRoad;
-
-	float prevX[6];
-	float prevY[6];
+	int16 prevX[6];
+	int16 prevY[6];
 	uint8 prevRed[6];
 	uint8 prevGreen[6];
 	uint8 prevBlue[6];
@@ -39,7 +40,7 @@ struct CRegisteredCorona
 	void Update(void);
 };
 
-VALIDATE_SIZE(CRegisteredCorona, 0x80);
+VALIDATE_SIZE(CRegisteredCorona, 0x68);
 
 class CCoronas
 {
@@ -81,7 +82,7 @@ public:
 	static float LightsMult;
 	static float SunScreenY;
 	static float SunScreenX;
-	static bool bSmallMoon;
+	static int MoonSize;
 	static bool SunBlockedByClouds;
 	static int bChangeBrightnessImmediately;
 
@@ -90,12 +91,15 @@ public:
 	static void Update(void);
 	static void RegisterCorona(uint32 id, uint8 red, uint8 green, uint8 blue, uint8 alpha,
 		const CVector &coors, float size, float drawDist, RwTexture *tex,
-		int8 flareType, uint8 reflection, uint8 LOScheck, uint8 drawStreak, float someAngle);
+		int8 flareType, uint8 reflection, uint8 LOScheck, uint8 drawStreak, float someAngle,
+		bool useNearDist = false, float nearDist = 1.5f);
 	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);
+		int8 flareType, uint8 reflection, uint8 LOScheck, uint8 drawStreak, float someAngle,
+		bool useNearDist = false, float nearDist = 1.5f);
 	static void UpdateCoronaCoors(uint32 id, const CVector &coors, float drawDist, float someAngle);
 	static void Render(void);
 	static void RenderReflections(void);
+	static void RenderSunReflection(void);
 	static void DoSunAndMoon(void);
 };