2 files changed, 146 insertions, 146 deletions

diff --git a/src/render/Timecycle.cpp b/src/render/Timecycle.cpp
index 162983dd..0d94dbd6 100644
--- a/src/render/Timecycle.cpp
+++ b/src/render/Timecycle.cpp
@@ -10,42 +10,42 @@
 #include "FileMgr.h"
 #include "Timecycle.h"
 
-int   CTimeCycle::m_nAmbientRed[NUMHOURS][NUMWEATHERS];
-int   CTimeCycle::m_nAmbientGreen[NUMHOURS][NUMWEATHERS];
-int   CTimeCycle::m_nAmbientBlue[NUMHOURS][NUMWEATHERS];
-int   CTimeCycle::m_nDirectionalRed[NUMHOURS][NUMWEATHERS];
-int   CTimeCycle::m_nDirectionalGreen[NUMHOURS][NUMWEATHERS];
-int   CTimeCycle::m_nDirectionalBlue[NUMHOURS][NUMWEATHERS];
-int   CTimeCycle::m_nSkyTopRed[NUMHOURS][NUMWEATHERS];
-int   CTimeCycle::m_nSkyTopGreen[NUMHOURS][NUMWEATHERS];
-int   CTimeCycle::m_nSkyTopBlue[NUMHOURS][NUMWEATHERS];
-int   CTimeCycle::m_nSkyBottomRed[NUMHOURS][NUMWEATHERS];
-int   CTimeCycle::m_nSkyBottomGreen[NUMHOURS][NUMWEATHERS];
-int   CTimeCycle::m_nSkyBottomBlue[NUMHOURS][NUMWEATHERS];
-int   CTimeCycle::m_nSunCoreRed[NUMHOURS][NUMWEATHERS];
-int   CTimeCycle::m_nSunCoreGreen[NUMHOURS][NUMWEATHERS];
-int   CTimeCycle::m_nSunCoreBlue[NUMHOURS][NUMWEATHERS];
-int   CTimeCycle::m_nSunCoronaRed[NUMHOURS][NUMWEATHERS];
-int   CTimeCycle::m_nSunCoronaGreen[NUMHOURS][NUMWEATHERS];
-int   CTimeCycle::m_nSunCoronaBlue[NUMHOURS][NUMWEATHERS];
+int32 CTimeCycle::m_nAmbientRed[NUMHOURS][NUMWEATHERS];
+int32 CTimeCycle::m_nAmbientGreen[NUMHOURS][NUMWEATHERS];
+int32 CTimeCycle::m_nAmbientBlue[NUMHOURS][NUMWEATHERS];
+int32 CTimeCycle::m_nDirectionalRed[NUMHOURS][NUMWEATHERS];
+int32 CTimeCycle::m_nDirectionalGreen[NUMHOURS][NUMWEATHERS];
+int32 CTimeCycle::m_nDirectionalBlue[NUMHOURS][NUMWEATHERS];
+int32 CTimeCycle::m_nSkyTopRed[NUMHOURS][NUMWEATHERS];
+int32 CTimeCycle::m_nSkyTopGreen[NUMHOURS][NUMWEATHERS];
+int32 CTimeCycle::m_nSkyTopBlue[NUMHOURS][NUMWEATHERS];
+int32 CTimeCycle::m_nSkyBottomRed[NUMHOURS][NUMWEATHERS];
+int32 CTimeCycle::m_nSkyBottomGreen[NUMHOURS][NUMWEATHERS];
+int32 CTimeCycle::m_nSkyBottomBlue[NUMHOURS][NUMWEATHERS];
+int32 CTimeCycle::m_nSunCoreRed[NUMHOURS][NUMWEATHERS];
+int32 CTimeCycle::m_nSunCoreGreen[NUMHOURS][NUMWEATHERS];
+int32 CTimeCycle::m_nSunCoreBlue[NUMHOURS][NUMWEATHERS];
+int32 CTimeCycle::m_nSunCoronaRed[NUMHOURS][NUMWEATHERS];
+int32 CTimeCycle::m_nSunCoronaGreen[NUMHOURS][NUMWEATHERS];
+int32 CTimeCycle::m_nSunCoronaBlue[NUMHOURS][NUMWEATHERS];
 float CTimeCycle::m_fSunSize[NUMHOURS][NUMWEATHERS];
 float CTimeCycle::m_fSpriteSize[NUMHOURS][NUMWEATHERS];
 float CTimeCycle::m_fSpriteBrightness[NUMHOURS][NUMWEATHERS];
-short CTimeCycle::m_nShadowStrength[NUMHOURS][NUMWEATHERS];
-short CTimeCycle::m_nLightShadowStrength[NUMHOURS][NUMWEATHERS];
-short CTimeCycle::m_nTreeShadowStrength[NUMHOURS][NUMWEATHERS];
+int16 CTimeCycle::m_nShadowStrength[NUMHOURS][NUMWEATHERS];
+int16 CTimeCycle::m_nLightShadowStrength[NUMHOURS][NUMWEATHERS];
+int16 CTimeCycle::m_nTreeShadowStrength[NUMHOURS][NUMWEATHERS];
 float CTimeCycle::m_fFogStart[NUMHOURS][NUMWEATHERS];
 float CTimeCycle::m_fFarClip[NUMHOURS][NUMWEATHERS];
 float CTimeCycle::m_fLightsOnGroundBrightness[NUMHOURS][NUMWEATHERS];
-int   CTimeCycle::m_nLowCloudsRed[NUMHOURS][NUMWEATHERS];
-int   CTimeCycle::m_nLowCloudsGreen[NUMHOURS][NUMWEATHERS];
-int   CTimeCycle::m_nLowCloudsBlue[NUMHOURS][NUMWEATHERS];
-int   CTimeCycle::m_nFluffyCloudsTopRed[NUMHOURS][NUMWEATHERS];
-int   CTimeCycle::m_nFluffyCloudsTopGreen[NUMHOURS][NUMWEATHERS];
-int   CTimeCycle::m_nFluffyCloudsTopBlue[NUMHOURS][NUMWEATHERS];
-int   CTimeCycle::m_nFluffyCloudsBottomRed[NUMHOURS][NUMWEATHERS];
-int   CTimeCycle::m_nFluffyCloudsBottomGreen[NUMHOURS][NUMWEATHERS];
-int   CTimeCycle::m_nFluffyCloudsBottomBlue[NUMHOURS][NUMWEATHERS];
+int32 CTimeCycle::m_nLowCloudsRed[NUMHOURS][NUMWEATHERS];
+int32 CTimeCycle::m_nLowCloudsGreen[NUMHOURS][NUMWEATHERS];
+int32 CTimeCycle::m_nLowCloudsBlue[NUMHOURS][NUMWEATHERS];
+int32 CTimeCycle::m_nFluffyCloudsTopRed[NUMHOURS][NUMWEATHERS];
+int32 CTimeCycle::m_nFluffyCloudsTopGreen[NUMHOURS][NUMWEATHERS];
+int32 CTimeCycle::m_nFluffyCloudsTopBlue[NUMHOURS][NUMWEATHERS];
+int32 CTimeCycle::m_nFluffyCloudsBottomRed[NUMHOURS][NUMWEATHERS];
+int32 CTimeCycle::m_nFluffyCloudsBottomGreen[NUMHOURS][NUMWEATHERS];
+int32 CTimeCycle::m_nFluffyCloudsBottomBlue[NUMHOURS][NUMWEATHERS];
 float CTimeCycle::m_fBlurRed[NUMHOURS][NUMWEATHERS];
 float CTimeCycle::m_fBlurGreen[NUMHOURS][NUMWEATHERS];
 float CTimeCycle::m_fBlurBlue[NUMHOURS][NUMWEATHERS];
@@ -57,47 +57,47 @@ float CTimeCycle::m_fCurrentAmbientBlue;
 float CTimeCycle::m_fCurrentDirectionalRed;
 float CTimeCycle::m_fCurrentDirectionalGreen;
 float CTimeCycle::m_fCurrentDirectionalBlue;
-int   CTimeCycle::m_nCurrentSkyTopRed;
-int   CTimeCycle::m_nCurrentSkyTopGreen;
-int   CTimeCycle::m_nCurrentSkyTopBlue;
-int   CTimeCycle::m_nCurrentSkyBottomRed;
-int   CTimeCycle::m_nCurrentSkyBottomGreen;
-int   CTimeCycle::m_nCurrentSkyBottomBlue;
-int   CTimeCycle::m_nCurrentSunCoreRed;
-int   CTimeCycle::m_nCurrentSunCoreGreen;
-int   CTimeCycle::m_nCurrentSunCoreBlue;
-int   CTimeCycle::m_nCurrentSunCoronaRed;
-int   CTimeCycle::m_nCurrentSunCoronaGreen;
-int   CTimeCycle::m_nCurrentSunCoronaBlue;
+int32 CTimeCycle::m_nCurrentSkyTopRed;
+int32 CTimeCycle::m_nCurrentSkyTopGreen;
+int32 CTimeCycle::m_nCurrentSkyTopBlue;
+int32 CTimeCycle::m_nCurrentSkyBottomRed;
+int32 CTimeCycle::m_nCurrentSkyBottomGreen;
+int32 CTimeCycle::m_nCurrentSkyBottomBlue;
+int32 CTimeCycle::m_nCurrentSunCoreRed;
+int32 CTimeCycle::m_nCurrentSunCoreGreen;
+int32 CTimeCycle::m_nCurrentSunCoreBlue;
+int32 CTimeCycle::m_nCurrentSunCoronaRed;
+int32 CTimeCycle::m_nCurrentSunCoronaGreen;
+int32 CTimeCycle::m_nCurrentSunCoronaBlue;
 float CTimeCycle::m_fCurrentSunSize;
 float CTimeCycle::m_fCurrentSpriteSize;
 float CTimeCycle::m_fCurrentSpriteBrightness;
-int   CTimeCycle::m_nCurrentShadowStrength;
-int   CTimeCycle::m_nCurrentLightShadowStrength;
-int   CTimeCycle::m_nCurrentTreeShadowStrength;
+int32 CTimeCycle::m_nCurrentShadowStrength;
+int32 CTimeCycle::m_nCurrentLightShadowStrength;
+int32 CTimeCycle::m_nCurrentTreeShadowStrength;
 float CTimeCycle::m_fCurrentFogStart;
 float CTimeCycle::m_fCurrentFarClip;
 float CTimeCycle::m_fCurrentLightsOnGroundBrightness;
-int   CTimeCycle::m_nCurrentLowCloudsRed;
-int   CTimeCycle::m_nCurrentLowCloudsGreen;
-int   CTimeCycle::m_nCurrentLowCloudsBlue;
-int   CTimeCycle::m_nCurrentFluffyCloudsTopRed;
-int   CTimeCycle::m_nCurrentFluffyCloudsTopGreen;
-int   CTimeCycle::m_nCurrentFluffyCloudsTopBlue;
-int   CTimeCycle::m_nCurrentFluffyCloudsBottomRed;
-int   CTimeCycle::m_nCurrentFluffyCloudsBottomGreen;
-int   CTimeCycle::m_nCurrentFluffyCloudsBottomBlue;
+int32 CTimeCycle::m_nCurrentLowCloudsRed;
+int32 CTimeCycle::m_nCurrentLowCloudsGreen;
+int32 CTimeCycle::m_nCurrentLowCloudsBlue;
+int32 CTimeCycle::m_nCurrentFluffyCloudsTopRed;
+int32 CTimeCycle::m_nCurrentFluffyCloudsTopGreen;
+int32 CTimeCycle::m_nCurrentFluffyCloudsTopBlue;
+int32 CTimeCycle::m_nCurrentFluffyCloudsBottomRed;
+int32 CTimeCycle::m_nCurrentFluffyCloudsBottomGreen;
+int32 CTimeCycle::m_nCurrentFluffyCloudsBottomBlue;
 float CTimeCycle::m_fCurrentBlurRed;
 float CTimeCycle::m_fCurrentBlurGreen;
 float CTimeCycle::m_fCurrentBlurBlue;
 float CTimeCycle::m_fCurrentBlurAlpha;
-int   CTimeCycle::m_nCurrentFogColourRed;
-int   CTimeCycle::m_nCurrentFogColourGreen;
-int   CTimeCycle::m_nCurrentFogColourBlue;
+int32 CTimeCycle::m_nCurrentFogColourRed;
+int32 CTimeCycle::m_nCurrentFogColourGreen;
+int32 CTimeCycle::m_nCurrentFogColourBlue;
 
-int   CTimeCycle::m_FogReduction;
+int32 CTimeCycle::m_FogReduction;
 
-int   CTimeCycle::m_CurrentStoredValue;
+int32 CTimeCycle::m_CurrentStoredValue;
 CVector CTimeCycle::m_VectorToSun[16];
 float CTimeCycle::m_fShadowFrontX[16];
 float CTimeCycle::m_fShadowFrontY[16];
@@ -227,7 +227,7 @@ CTimeCycle::Update(void)
 	float c2 = (1.0f-timeInterp) * CWeather::InterpolationValue;
 	float c3 = timeInterp * CWeather::InterpolationValue;
 
-#define INTERP(v) v[h1][w1]*c0 + v[h2][w1]*c1 + v[h1][w2]*c2 + v[h2][w2]*c3;
+#define INTERP(v) v[h1][w1]*c0 + v[h2][w1]*c1 + v[h1][w2]*c2 + v[h2][w2]*c3
 
 	m_nCurrentSkyTopRed = INTERP(m_nSkyTopRed);
 	m_nCurrentSkyTopGreen = INTERP(m_nSkyTopGreen);
diff --git a/src/render/Timecycle.h b/src/render/Timecycle.h
index 0cb02b67..d5d7b67a 100644
--- a/src/render/Timecycle.h
+++ b/src/render/Timecycle.h
@@ -2,42 +2,42 @@
 
 class CTimeCycle
 {
-	static int   m_nAmbientRed[NUMHOURS][NUMWEATHERS];
-	static int   m_nAmbientGreen[NUMHOURS][NUMWEATHERS];
-	static int   m_nAmbientBlue[NUMHOURS][NUMWEATHERS];
-	static int   m_nDirectionalRed[NUMHOURS][NUMWEATHERS];
-	static int   m_nDirectionalGreen[NUMHOURS][NUMWEATHERS];
-	static int   m_nDirectionalBlue[NUMHOURS][NUMWEATHERS];
-	static int   m_nSkyTopRed[NUMHOURS][NUMWEATHERS];
-	static int   m_nSkyTopGreen[NUMHOURS][NUMWEATHERS];
-	static int   m_nSkyTopBlue[NUMHOURS][NUMWEATHERS];
-	static int   m_nSkyBottomRed[NUMHOURS][NUMWEATHERS];
-	static int   m_nSkyBottomGreen[NUMHOURS][NUMWEATHERS];
-	static int   m_nSkyBottomBlue[NUMHOURS][NUMWEATHERS];
-	static int   m_nSunCoreRed[NUMHOURS][NUMWEATHERS];
-	static int   m_nSunCoreGreen[NUMHOURS][NUMWEATHERS];
-	static int   m_nSunCoreBlue[NUMHOURS][NUMWEATHERS];
-	static int   m_nSunCoronaRed[NUMHOURS][NUMWEATHERS];
-	static int   m_nSunCoronaGreen[NUMHOURS][NUMWEATHERS];
-	static int   m_nSunCoronaBlue[NUMHOURS][NUMWEATHERS];
+	static int32 m_nAmbientRed[NUMHOURS][NUMWEATHERS];
+	static int32 m_nAmbientGreen[NUMHOURS][NUMWEATHERS];
+	static int32 m_nAmbientBlue[NUMHOURS][NUMWEATHERS];
+	static int32 m_nDirectionalRed[NUMHOURS][NUMWEATHERS];
+	static int32 m_nDirectionalGreen[NUMHOURS][NUMWEATHERS];
+	static int32 m_nDirectionalBlue[NUMHOURS][NUMWEATHERS];
+	static int32 m_nSkyTopRed[NUMHOURS][NUMWEATHERS];
+	static int32 m_nSkyTopGreen[NUMHOURS][NUMWEATHERS];
+	static int32 m_nSkyTopBlue[NUMHOURS][NUMWEATHERS];
+	static int32 m_nSkyBottomRed[NUMHOURS][NUMWEATHERS];
+	static int32 m_nSkyBottomGreen[NUMHOURS][NUMWEATHERS];
+	static int32 m_nSkyBottomBlue[NUMHOURS][NUMWEATHERS];
+	static int32 m_nSunCoreRed[NUMHOURS][NUMWEATHERS];
+	static int32 m_nSunCoreGreen[NUMHOURS][NUMWEATHERS];
+	static int32 m_nSunCoreBlue[NUMHOURS][NUMWEATHERS];
+	static int32 m_nSunCoronaRed[NUMHOURS][NUMWEATHERS];
+	static int32 m_nSunCoronaGreen[NUMHOURS][NUMWEATHERS];
+	static int32 m_nSunCoronaBlue[NUMHOURS][NUMWEATHERS];
 	static float m_fSunSize[NUMHOURS][NUMWEATHERS];
 	static float m_fSpriteSize[NUMHOURS][NUMWEATHERS];
 	static float m_fSpriteBrightness[NUMHOURS][NUMWEATHERS];
-	static short m_nShadowStrength[NUMHOURS][NUMWEATHERS];
-	static short m_nLightShadowStrength[NUMHOURS][NUMWEATHERS];
-	static short m_nTreeShadowStrength[NUMHOURS][NUMWEATHERS];
+	static int16 m_nShadowStrength[NUMHOURS][NUMWEATHERS];
+	static int16 m_nLightShadowStrength[NUMHOURS][NUMWEATHERS];
+	static int16 m_nTreeShadowStrength[NUMHOURS][NUMWEATHERS];
 	static float m_fFogStart[NUMHOURS][NUMWEATHERS];
 	static float m_fFarClip[NUMHOURS][NUMWEATHERS];
 	static float m_fLightsOnGroundBrightness[NUMHOURS][NUMWEATHERS];
-	static int   m_nLowCloudsRed[NUMHOURS][NUMWEATHERS];
-	static int   m_nLowCloudsGreen[NUMHOURS][NUMWEATHERS];
-	static int   m_nLowCloudsBlue[NUMHOURS][NUMWEATHERS];
-	static int   m_nFluffyCloudsTopRed[NUMHOURS][NUMWEATHERS];
-	static int   m_nFluffyCloudsTopGreen[NUMHOURS][NUMWEATHERS];
-	static int   m_nFluffyCloudsTopBlue[NUMHOURS][NUMWEATHERS];
-	static int   m_nFluffyCloudsBottomRed[NUMHOURS][NUMWEATHERS];
-	static int   m_nFluffyCloudsBottomGreen[NUMHOURS][NUMWEATHERS];
-	static int   m_nFluffyCloudsBottomBlue[NUMHOURS][NUMWEATHERS];
+	static int32 m_nLowCloudsRed[NUMHOURS][NUMWEATHERS];
+	static int32 m_nLowCloudsGreen[NUMHOURS][NUMWEATHERS];
+	static int32 m_nLowCloudsBlue[NUMHOURS][NUMWEATHERS];
+	static int32 m_nFluffyCloudsTopRed[NUMHOURS][NUMWEATHERS];
+	static int32 m_nFluffyCloudsTopGreen[NUMHOURS][NUMWEATHERS];
+	static int32 m_nFluffyCloudsTopBlue[NUMHOURS][NUMWEATHERS];
+	static int32 m_nFluffyCloudsBottomRed[NUMHOURS][NUMWEATHERS];
+	static int32 m_nFluffyCloudsBottomGreen[NUMHOURS][NUMWEATHERS];
+	static int32 m_nFluffyCloudsBottomBlue[NUMHOURS][NUMWEATHERS];
 	static float m_fBlurRed[NUMHOURS][NUMWEATHERS];
 	static float m_fBlurGreen[NUMHOURS][NUMWEATHERS];
 	static float m_fBlurBlue[NUMHOURS][NUMWEATHERS];
@@ -49,48 +49,48 @@ class CTimeCycle
 	static float m_fCurrentDirectionalRed;
 	static float m_fCurrentDirectionalGreen;
 	static float m_fCurrentDirectionalBlue;
-	static int   m_nCurrentSkyTopRed;
-	static int   m_nCurrentSkyTopGreen;
-	static int   m_nCurrentSkyTopBlue;
-	static int   m_nCurrentSkyBottomRed;
-	static int   m_nCurrentSkyBottomGreen;
-	static int   m_nCurrentSkyBottomBlue;
-	static int   m_nCurrentSunCoreRed;
-	static int   m_nCurrentSunCoreGreen;
-	static int   m_nCurrentSunCoreBlue;
-	static int   m_nCurrentSunCoronaRed;
-	static int   m_nCurrentSunCoronaGreen;
-	static int   m_nCurrentSunCoronaBlue;
+	static int32 m_nCurrentSkyTopRed;
+	static int32 m_nCurrentSkyTopGreen;
+	static int32 m_nCurrentSkyTopBlue;
+	static int32 m_nCurrentSkyBottomRed;
+	static int32 m_nCurrentSkyBottomGreen;
+	static int32 m_nCurrentSkyBottomBlue;
+	static int32 m_nCurrentSunCoreRed;
+	static int32 m_nCurrentSunCoreGreen;
+	static int32 m_nCurrentSunCoreBlue;
+	static int32 m_nCurrentSunCoronaRed;
+	static int32 m_nCurrentSunCoronaGreen;
+	static int32 m_nCurrentSunCoronaBlue;
 	static float m_fCurrentSunSize;
 	static float m_fCurrentSpriteSize;
 	static float m_fCurrentSpriteBrightness;
-	static int   m_nCurrentShadowStrength;
-	static int   m_nCurrentLightShadowStrength;
-	static int   m_nCurrentTreeShadowStrength;
+	static int32 m_nCurrentShadowStrength;
+	static int32 m_nCurrentLightShadowStrength;
+	static int32 m_nCurrentTreeShadowStrength;
 	static float m_fCurrentFogStart;
 	static float m_fCurrentFarClip;
 	static float m_fCurrentLightsOnGroundBrightness;
-	static int   m_nCurrentLowCloudsRed;
-	static int   m_nCurrentLowCloudsGreen;
-	static int   m_nCurrentLowCloudsBlue;
-	static int   m_nCurrentFluffyCloudsTopRed;
-	static int   m_nCurrentFluffyCloudsTopGreen;
-	static int   m_nCurrentFluffyCloudsTopBlue;
-	static int   m_nCurrentFluffyCloudsBottomRed;
-	static int   m_nCurrentFluffyCloudsBottomGreen;
-	static int   m_nCurrentFluffyCloudsBottomBlue;
+	static int32 m_nCurrentLowCloudsRed;
+	static int32 m_nCurrentLowCloudsGreen;
+	static int32 m_nCurrentLowCloudsBlue;
+	static int32 m_nCurrentFluffyCloudsTopRed;
+	static int32 m_nCurrentFluffyCloudsTopGreen;
+	static int32 m_nCurrentFluffyCloudsTopBlue;
+	static int32 m_nCurrentFluffyCloudsBottomRed;
+	static int32 m_nCurrentFluffyCloudsBottomGreen;
+	static int32 m_nCurrentFluffyCloudsBottomBlue;
 	static float m_fCurrentBlurRed;
 	static float m_fCurrentBlurGreen;
 	static float m_fCurrentBlurBlue;
 	static float m_fCurrentBlurAlpha;
-	static int   m_nCurrentFogColourRed;
-	static int   m_nCurrentFogColourGreen;
-	static int   m_nCurrentFogColourBlue;
+	static int32 m_nCurrentFogColourRed;
+	static int32 m_nCurrentFogColourGreen;
+	static int32 m_nCurrentFogColourBlue;
 
-	static int   m_FogReduction;
+	static int32 m_FogReduction;
 
 public:
-	static int   m_CurrentStoredValue;
+	static int32 m_CurrentStoredValue;
 	static CVector m_VectorToSun[16];
 	static float m_fShadowFrontX[16];
 	static float m_fShadowFrontY[16];
@@ -105,40 +105,40 @@ public:
 	static float GetDirectionalRed(void) { return m_fCurrentDirectionalRed; }
 	static float GetDirectionalGreen(void) { return m_fCurrentDirectionalGreen; }
 	static float GetDirectionalBlue(void) { return m_fCurrentDirectionalBlue; }
-	static int GetSkyTopRed(void) { return m_nCurrentSkyTopRed; }
-	static int GetSkyTopGreen(void) { return m_nCurrentSkyTopGreen; }
-	static int GetSkyTopBlue(void) { return m_nCurrentSkyTopBlue; }
-	static int GetSkyBottomRed(void) { return m_nCurrentSkyBottomRed; }
-	static int GetSkyBottomGreen(void) { return m_nCurrentSkyBottomGreen; }
-	static int GetSkyBottomBlue(void) { return m_nCurrentSkyBottomBlue; }
-	static int GetSunCoreRed(void) { return m_nCurrentSunCoreRed; }
-	static int GetSunCoreGreen(void) { return m_nCurrentSunCoreGreen; }
-	static int GetSunCoreBlue(void) { return m_nCurrentSunCoreBlue; }
-	static int GetSunCoronaRed(void) { return m_nCurrentSunCoronaRed; }
-	static int GetSunCoronaGreen(void) { return m_nCurrentSunCoronaGreen; }
-	static int GetSunCoronaBlue(void) { return m_nCurrentSunCoronaBlue; }
+	static int32 GetSkyTopRed(void) { return m_nCurrentSkyTopRed; }
+	static int32 GetSkyTopGreen(void) { return m_nCurrentSkyTopGreen; }
+	static int32 GetSkyTopBlue(void) { return m_nCurrentSkyTopBlue; }
+	static int32 GetSkyBottomRed(void) { return m_nCurrentSkyBottomRed; }
+	static int32 GetSkyBottomGreen(void) { return m_nCurrentSkyBottomGreen; }
+	static int32 GetSkyBottomBlue(void) { return m_nCurrentSkyBottomBlue; }
+	static int32 GetSunCoreRed(void) { return m_nCurrentSunCoreRed; }
+	static int32 GetSunCoreGreen(void) { return m_nCurrentSunCoreGreen; }
+	static int32 GetSunCoreBlue(void) { return m_nCurrentSunCoreBlue; }
+	static int32 GetSunCoronaRed(void) { return m_nCurrentSunCoronaRed; }
+	static int32 GetSunCoronaGreen(void) { return m_nCurrentSunCoronaGreen; }
+	static int32 GetSunCoronaBlue(void) { return m_nCurrentSunCoronaBlue; }
 	static float GetSunSize(void) { return m_fCurrentSunSize; }
 	static float GetSpriteBrightness(void) { return m_fCurrentSpriteBrightness; }
 	static float GetSpriteSize(void) { return m_fCurrentSpriteSize; }
-	static int GetShadowStrength(void) { return m_nCurrentShadowStrength; }
-	static int GetLightShadowStrength(void) { return m_nCurrentLightShadowStrength; }
+	static int32 GetShadowStrength(void) { return m_nCurrentShadowStrength; }
+	static int32 GetLightShadowStrength(void) { return m_nCurrentLightShadowStrength; }
 	static float GetLightOnGroundBrightness(void) { return m_fCurrentLightsOnGroundBrightness; }
 	static float GetFarClip(void) { return m_fCurrentFarClip; }
 	static float GetFogStart(void) { return m_fCurrentFogStart; }
 
-	static int GetLowCloudsRed(void) { return m_nCurrentLowCloudsRed; }
-	static int GetLowCloudsGreen(void) { return m_nCurrentLowCloudsGreen; }
-	static int GetLowCloudsBlue(void) { return m_nCurrentLowCloudsBlue; }
-	static int GetFluffyCloudsTopRed(void) { return m_nCurrentFluffyCloudsTopRed; }
-	static int GetFluffyCloudsTopGreen(void) { return m_nCurrentFluffyCloudsTopGreen; }
-	static int GetFluffyCloudsTopBlue(void) { return m_nCurrentFluffyCloudsTopBlue; }
-	static int GetFluffyCloudsBottomRed(void) { return m_nCurrentFluffyCloudsBottomRed; }
-	static int GetFluffyCloudsBottomGreen(void) { return m_nCurrentFluffyCloudsBottomGreen; }
-	static int GetFluffyCloudsBottomBlue(void) { return m_nCurrentFluffyCloudsBottomBlue; }
-	static int GetFogRed(void) { return m_nCurrentFogColourRed; }
-	static int GetFogGreen(void) { return m_nCurrentFogColourGreen; }
-	static int GetFogBlue(void) { return m_nCurrentFogColourBlue; }
-	static int GetFogReduction(void) { return m_FogReduction; }
+	static int32 GetLowCloudsRed(void) { return m_nCurrentLowCloudsRed; }
+	static int32 GetLowCloudsGreen(void) { return m_nCurrentLowCloudsGreen; }
+	static int32 GetLowCloudsBlue(void) { return m_nCurrentLowCloudsBlue; }
+	static int32 GetFluffyCloudsTopRed(void) { return m_nCurrentFluffyCloudsTopRed; }
+	static int32 GetFluffyCloudsTopGreen(void) { return m_nCurrentFluffyCloudsTopGreen; }
+	static int32 GetFluffyCloudsTopBlue(void) { return m_nCurrentFluffyCloudsTopBlue; }
+	static int32 GetFluffyCloudsBottomRed(void) { return m_nCurrentFluffyCloudsBottomRed; }
+	static int32 GetFluffyCloudsBottomGreen(void) { return m_nCurrentFluffyCloudsBottomGreen; }
+	static int32 GetFluffyCloudsBottomBlue(void) { return m_nCurrentFluffyCloudsBottomBlue; }
+	static int32 GetFogRed(void) { return m_nCurrentFogColourRed; }
+	static int32 GetFogGreen(void) { return m_nCurrentFogColourGreen; }
+	static int32 GetFogBlue(void) { return m_nCurrentFogColourBlue; }
+	static int32 GetFogReduction(void) { return m_FogReduction; }
 
 	static void Initialise(void);
 	static void Update(void);