8 files changed, 131 insertions, 107 deletions

diff --git a/src/render/Credits.cpp b/src/render/Credits.cpp
index e0134e52..2cfdba90 100644
--- a/src/render/Credits.cpp
+++ b/src/render/Credits.cpp
@@ -129,12 +129,12 @@ CCredits::Render(void)
 	PrintCreditSpace(2.0f, lineoffset);
 	PrintCreditText(1.4f, 0.82f, TheText.Get("CRED041"), lineoffset, scrolloffset);
 	if(CMenuManager::m_PrefsLanguage == CMenuManager::LANGUAGE_ITALIAN)
-	        PrintCreditSpace(1.5, lineoffset);
+	        PrintCreditSpace(1.5f, lineoffset);
 	PrintCreditText(1.7f, 1.7f, TheText.Get("CRED042"), lineoffset, scrolloffset);
 	PrintCreditSpace(2.0f, lineoffset);
 	PrintCreditText(1.7f, 1.0f, TheText.Get("CRED043"), lineoffset, scrolloffset);
 	if(CMenuManager::m_PrefsLanguage == CMenuManager::LANGUAGE_ITALIAN)
-	        PrintCreditSpace(1.5, lineoffset);
+	        PrintCreditSpace(1.5f, lineoffset);
 	PrintCreditText(1.7f, 1.7f, TheText.Get("CRED044"), lineoffset, scrolloffset);
 	PrintCreditSpace(2.0f, lineoffset);
 	PrintCreditSpace(2.0f, lineoffset);
@@ -177,14 +177,14 @@ CCredits::Render(void)
 	PrintCreditSpace(2.0f, lineoffset);
 	PrintCreditText(1.7f, 1.0f, TheText.Get("CRED061"), lineoffset, scrolloffset);
 	if(CMenuManager::m_PrefsLanguage == CMenuManager::LANGUAGE_ITALIAN)
-	        PrintCreditSpace(1.5, lineoffset);
+	        PrintCreditSpace(1.5f, lineoffset);
 	PrintCreditText(1.7f, 1.7f, TheText.Get("CRED062"), lineoffset, scrolloffset);
 	PrintCreditSpace(2.0f, lineoffset);
 	PrintCreditText(1.7f, 1.0f, TheText.Get("CRED063"), lineoffset, scrolloffset);
 	PrintCreditText(1.7f, 1.7f, TheText.Get("CRED064"), lineoffset, scrolloffset);
 	PrintCreditSpace(2.0f, lineoffset);
 	PrintCreditText(1.7f, 1.0f, TheText.Get("CRED065"), lineoffset, scrolloffset);
-	PrintCreditSpace(1.5, lineoffset);
+	PrintCreditSpace(1.5f, lineoffset);
 	PrintCreditText(1.7f, 1.7f, TheText.Get("CRED066"), lineoffset, scrolloffset);
 	PrintCreditSpace(2.0f, lineoffset);
 	PrintCreditText(1.7f, 1.0f, TheText.Get("CRED067"), lineoffset, scrolloffset);
@@ -192,16 +192,16 @@ CCredits::Render(void)
 	PrintCreditSpace(2.0f, lineoffset);
 	PrintCreditText(1.7f, 1.0f, TheText.Get("CRED069"), lineoffset, scrolloffset);
 	if(CMenuManager::m_PrefsLanguage == CMenuManager::LANGUAGE_ITALIAN)
-	        PrintCreditSpace(1.5, lineoffset);
+	        PrintCreditSpace(1.5f, lineoffset);
 	PrintCreditText(1.7f, 1.7f, TheText.Get("CRED070"), lineoffset, scrolloffset);
 	PrintCreditSpace(2.0f, lineoffset);
 	PrintCreditText(1.7f, 1.0f, TheText.Get("CRED071"), lineoffset, scrolloffset);
-	PrintCreditSpace(1.5, lineoffset);
+	PrintCreditSpace(1.5f, lineoffset);
 	PrintCreditText(1.7f, 1.7f, TheText.Get("CRED072"), lineoffset, scrolloffset);
 	PrintCreditSpace(2.0f, lineoffset);
 	PrintCreditSpace(2.0f, lineoffset);
 	PrintCreditText(1.7f, 1.0f, TheText.Get("CRED073"), lineoffset, scrolloffset);
-	PrintCreditSpace(1.5, lineoffset);
+	PrintCreditSpace(1.5f, lineoffset);
 	PrintCreditText(1.7f, 1.7f, TheText.Get("CRED074"), lineoffset, scrolloffset);
 	PrintCreditText(1.7f, 1.7f, TheText.Get("CRED075"), lineoffset, scrolloffset);
 	PrintCreditText(1.7f, 1.7f, TheText.Get("CRED076"), lineoffset, scrolloffset);
@@ -221,16 +221,16 @@ CCredits::Render(void)
 	PrintCreditSpace(2.0f, lineoffset);
 	PrintCreditText(1.7f, 1.0f, TheText.Get("CRED085"), lineoffset, scrolloffset);
 	if(CMenuManager::m_PrefsLanguage == CMenuManager::LANGUAGE_ITALIAN)
-	        PrintCreditSpace(1.5, lineoffset);
+	        PrintCreditSpace(1.5f, lineoffset);
 	PrintCreditText(1.7f, 1.7f, TheText.Get("CRED086"), lineoffset, scrolloffset);
 	PrintCreditSpace(2.0f, lineoffset);
 	PrintCreditText(1.4f, 0.82f, TheText.Get("CRED087"), lineoffset, scrolloffset);
-	PrintCreditSpace(1.5, lineoffset);
+	PrintCreditSpace(1.5f, lineoffset);
 	PrintCreditText(1.7f, 1.7f, TheText.Get("CRED088"), lineoffset, scrolloffset);
 	PrintCreditSpace(2.0f, lineoffset);
 	PrintCreditSpace(2.0f, lineoffset);
 	PrintCreditText(1.7f, 1.0f, TheText.Get("CRED089"), lineoffset, scrolloffset);
-	PrintCreditSpace(1.5, lineoffset);
+	PrintCreditSpace(1.5f, lineoffset);
 	PrintCreditText(1.7f, 1.7f, TheText.Get("CRED090"), lineoffset, scrolloffset);
 	PrintCreditSpace(2.0f, lineoffset);
 	PrintCreditText(1.7f, 1.0f, TheText.Get("CRED091"), lineoffset, scrolloffset);
@@ -250,7 +250,7 @@ CCredits::Render(void)
 	PrintCreditSpace(2.0f, lineoffset);
 	PrintCreditSpace(2.0f, lineoffset);
 	PrintCreditText(1.4f, 0.82f, TheText.Get("CRED100"), lineoffset, scrolloffset);
-	PrintCreditSpace(1.5, lineoffset);
+	PrintCreditSpace(1.5f, lineoffset);
 	PrintCreditText(1.7f, 1.7f, TheText.Get("CRED101"), lineoffset, scrolloffset);
 	PrintCreditText(1.7f, 1.7f, TheText.Get("CRED102"), lineoffset, scrolloffset);
 	PrintCreditText(1.7f, 1.7f, TheText.Get("CRED103"), lineoffset, scrolloffset);
@@ -261,82 +261,82 @@ CCredits::Render(void)
 	PrintCreditText(1.7f, 1.7f, TheText.Get("CRED269"), lineoffset, scrolloffset);
 	PrintCreditSpace(2.0f, lineoffset);
 	PrintCreditText(1.7f, 1.0f, TheText.Get("CRED107"), lineoffset, scrolloffset);
-	PrintCreditSpace(1.5, lineoffset);
-	PrintCreditText(1.0, 1.0, TheText.Get("CRED108"), lineoffset, scrolloffset);
-	PrintCreditSpace(1.0, lineoffset);
-	PrintCreditText(1.0, 1.0, TheText.Get("CRED109"), lineoffset, scrolloffset);
+	PrintCreditSpace(1.5f, lineoffset);
+	PrintCreditText(1.0f, 1.0f, TheText.Get("CRED108"), lineoffset, scrolloffset);
+	PrintCreditSpace(1.0f, lineoffset);
+	PrintCreditText(1.0f, 1.0f, TheText.Get("CRED109"), lineoffset, scrolloffset);
 	if(CMenuManager::m_PrefsLanguage == CMenuManager::LANGUAGE_ITALIAN)
-	        PrintCreditSpace(1.0, lineoffset);
-	PrintCreditText(1.0, 1.0, TheText.Get("CRED110"), lineoffset, scrolloffset);
+	        PrintCreditSpace(1.0f, lineoffset);
+	PrintCreditText(1.0f, 1.0f, TheText.Get("CRED110"), lineoffset, scrolloffset);
 	PrintCreditSpace(2.0f, lineoffset);
 	PrintCreditText(1.7f, 1.0f, TheText.Get("CRED111"), lineoffset, scrolloffset);
-	PrintCreditText(1.0, 1.0, TheText.Get("CRED112"), lineoffset, scrolloffset);
+	PrintCreditText(1.0f, 1.0f, TheText.Get("CRED112"), lineoffset, scrolloffset);
 	if(CMenuManager::m_PrefsLanguage == CMenuManager::LANGUAGE_ITALIAN)
-	        PrintCreditSpace(1.0, lineoffset);
-	PrintCreditText(1.0, 1.0, TheText.Get("CRED113"), lineoffset, scrolloffset);
+	        PrintCreditSpace(1.0f, lineoffset);
+	PrintCreditText(1.0f, 1.0f, TheText.Get("CRED113"), lineoffset, scrolloffset);
 	if(CMenuManager::m_PrefsLanguage == CMenuManager::LANGUAGE_ITALIAN)
-	        PrintCreditSpace(1.0, lineoffset);
-	PrintCreditText(1.0, 1.0, TheText.Get("CRED114"), lineoffset, scrolloffset);
+	        PrintCreditSpace(1.0f, lineoffset);
+	PrintCreditText(1.0f, 1.0f, TheText.Get("CRED114"), lineoffset, scrolloffset);
 	if(CMenuManager::m_PrefsLanguage == CMenuManager::LANGUAGE_ITALIAN)
-	        PrintCreditSpace(1.0, lineoffset);
-	PrintCreditText(1.0, 1.0, TheText.Get("CRED115"), lineoffset, scrolloffset);
+	        PrintCreditSpace(1.0f, lineoffset);
+	PrintCreditText(1.0f, 1.0f, TheText.Get("CRED115"), lineoffset, scrolloffset);
 	if(CMenuManager::m_PrefsLanguage == CMenuManager::LANGUAGE_ITALIAN)
-	        PrintCreditSpace(1.0, lineoffset);
-	PrintCreditText(1.0, 1.0, TheText.Get("CRED116"), lineoffset, scrolloffset);
+	        PrintCreditSpace(1.0f, lineoffset);
+	PrintCreditText(1.0f, 1.0f, TheText.Get("CRED116"), lineoffset, scrolloffset);
 	if(CMenuManager::m_PrefsLanguage == CMenuManager::LANGUAGE_ITALIAN)
-	        PrintCreditSpace(1.0, lineoffset);
-	PrintCreditText(1.0, 1.0, TheText.Get("CRED117"), lineoffset, scrolloffset);
+	        PrintCreditSpace(1.0f, lineoffset);
+	PrintCreditText(1.0f, 1.0f, TheText.Get("CRED117"), lineoffset, scrolloffset);
 	if(CMenuManager::m_PrefsLanguage == CMenuManager::LANGUAGE_ITALIAN)
-	        PrintCreditSpace(1.0, lineoffset);
-	PrintCreditText(1.0, 1.0, TheText.Get("CRED118"), lineoffset, scrolloffset);
+	        PrintCreditSpace(1.0f, lineoffset);
+	PrintCreditText(1.0f, 1.0f, TheText.Get("CRED118"), lineoffset, scrolloffset);
 	if(CMenuManager::m_PrefsLanguage == CMenuManager::LANGUAGE_ITALIAN)
-	        PrintCreditSpace(1.0, lineoffset);
-	PrintCreditText(1.0, 1.0, TheText.Get("CRED119"), lineoffset, scrolloffset);
+	        PrintCreditSpace(1.0f, lineoffset);
+	PrintCreditText(1.0f, 1.0f, TheText.Get("CRED119"), lineoffset, scrolloffset);
 	if(CMenuManager::m_PrefsLanguage == CMenuManager::LANGUAGE_ITALIAN)
-	        PrintCreditSpace(1.0, lineoffset);
-	PrintCreditText(1.0, 1.0, TheText.Get("CRED120"), lineoffset, scrolloffset);
+	        PrintCreditSpace(1.0f, lineoffset);
+	PrintCreditText(1.0f, 1.0f, TheText.Get("CRED120"), lineoffset, scrolloffset);
 	if(CMenuManager::m_PrefsLanguage == CMenuManager::LANGUAGE_ITALIAN)
-	        PrintCreditSpace(1.0, lineoffset);
-	PrintCreditText(1.0, 1.0, TheText.Get("CRED121"), lineoffset, scrolloffset);
+	        PrintCreditSpace(1.0f, lineoffset);
+	PrintCreditText(1.0f, 1.0f, TheText.Get("CRED121"), lineoffset, scrolloffset);
 	if(CMenuManager::m_PrefsLanguage == CMenuManager::LANGUAGE_ITALIAN)
-	        PrintCreditSpace(1.0, lineoffset);
-	PrintCreditText(1.0, 1.0, TheText.Get("CRED122"), lineoffset, scrolloffset);
+	        PrintCreditSpace(1.0f, lineoffset);
+	PrintCreditText(1.0f, 1.0f, TheText.Get("CRED122"), lineoffset, scrolloffset);
 	if(CMenuManager::m_PrefsLanguage == CMenuManager::LANGUAGE_ITALIAN)
-	        PrintCreditSpace(1.0, lineoffset);
-	PrintCreditText(1.0, 1.0, TheText.Get("CRED123"), lineoffset, scrolloffset);
+	        PrintCreditSpace(1.0f, lineoffset);
+	PrintCreditText(1.0f, 1.0f, TheText.Get("CRED123"), lineoffset, scrolloffset);
 	if(CMenuManager::m_PrefsLanguage == CMenuManager::LANGUAGE_ITALIAN)
-	        PrintCreditSpace(1.0, lineoffset);
-	PrintCreditText(1.0, 1.0, TheText.Get("CRED124"), lineoffset, scrolloffset);
+	        PrintCreditSpace(1.0f, lineoffset);
+	PrintCreditText(1.0f, 1.0f, TheText.Get("CRED124"), lineoffset, scrolloffset);
 	if(CMenuManager::m_PrefsLanguage == CMenuManager::LANGUAGE_ITALIAN)
-	        PrintCreditSpace(1.0, lineoffset);
-	PrintCreditText(1.0, 1.0, TheText.Get("CRED125"), lineoffset, scrolloffset);
+	        PrintCreditSpace(1.0f, lineoffset);
+	PrintCreditText(1.0f, 1.0f, TheText.Get("CRED125"), lineoffset, scrolloffset);
 	if(CMenuManager::m_PrefsLanguage == CMenuManager::LANGUAGE_ITALIAN)
-	        PrintCreditSpace(1.0, lineoffset);
-	PrintCreditText(1.0, 1.0, TheText.Get("CRED126"), lineoffset, scrolloffset);
+	        PrintCreditSpace(1.0f, lineoffset);
+	PrintCreditText(1.0f, 1.0f, TheText.Get("CRED126"), lineoffset, scrolloffset);
 	if(CMenuManager::m_PrefsLanguage == CMenuManager::LANGUAGE_ITALIAN)
-	        PrintCreditSpace(1.0, lineoffset);
-	PrintCreditText(1.0, 1.0, TheText.Get("CRED127"), lineoffset, scrolloffset);
+	        PrintCreditSpace(1.0f, lineoffset);
+	PrintCreditText(1.0f, 1.0f, TheText.Get("CRED127"), lineoffset, scrolloffset);
 	if(CMenuManager::m_PrefsLanguage == CMenuManager::LANGUAGE_ITALIAN)
-	        PrintCreditSpace(1.0, lineoffset);
-	PrintCreditText(1.0, 1.0, TheText.Get("CRED128"), lineoffset, scrolloffset);
+	        PrintCreditSpace(1.0f, lineoffset);
+	PrintCreditText(1.0f, 1.0f, TheText.Get("CRED128"), lineoffset, scrolloffset);
 	if(CMenuManager::m_PrefsLanguage == CMenuManager::LANGUAGE_ITALIAN)
-	        PrintCreditSpace(1.0, lineoffset);
-	PrintCreditText(1.0, 1.0, TheText.Get("CRED129"), lineoffset, scrolloffset);
+	        PrintCreditSpace(1.0f, lineoffset);
+	PrintCreditText(1.0f, 1.0f, TheText.Get("CRED129"), lineoffset, scrolloffset);
 	if(CMenuManager::m_PrefsLanguage == CMenuManager::LANGUAGE_ITALIAN)
-	        PrintCreditSpace(1.0, lineoffset);
-	PrintCreditText(1.0, 1.0, TheText.Get("CRED130"), lineoffset, scrolloffset);
+	        PrintCreditSpace(1.0f, lineoffset);
+	PrintCreditText(1.0f, 1.0f, TheText.Get("CRED130"), lineoffset, scrolloffset);
 	if(CMenuManager::m_PrefsLanguage == CMenuManager::LANGUAGE_ITALIAN)
-	        PrintCreditSpace(1.0, lineoffset);
-	PrintCreditText(1.0, 1.0, TheText.Get("CRED131"), lineoffset, scrolloffset);
+	        PrintCreditSpace(1.0f, lineoffset);
+	PrintCreditText(1.0f, 1.0f, TheText.Get("CRED131"), lineoffset, scrolloffset);
 	if(CMenuManager::m_PrefsLanguage == CMenuManager::LANGUAGE_ITALIAN)
-	        PrintCreditSpace(1.0, lineoffset);
-	PrintCreditText(1.0, 1.0, TheText.Get("CRED132"), lineoffset, scrolloffset);
+	        PrintCreditSpace(1.0f, lineoffset);
+	PrintCreditText(1.0f, 1.0f, TheText.Get("CRED132"), lineoffset, scrolloffset);
 	if(CMenuManager::m_PrefsLanguage == CMenuManager::LANGUAGE_ITALIAN)
-	        PrintCreditSpace(1.0, lineoffset);
-	PrintCreditText(1.0, 1.0, TheText.Get("CRED133"), lineoffset, scrolloffset);
+	        PrintCreditSpace(1.0f, lineoffset);
+	PrintCreditText(1.0f, 1.0f, TheText.Get("CRED133"), lineoffset, scrolloffset);
 	if(CMenuManager::m_PrefsLanguage == CMenuManager::LANGUAGE_ITALIAN)
-	        PrintCreditSpace(1.0, lineoffset);
-	PrintCreditText(1.0, 1.0, TheText.Get("CRED134"), lineoffset, scrolloffset);
+	        PrintCreditSpace(1.0f, lineoffset);
+	PrintCreditText(1.0f, 1.0f, TheText.Get("CRED134"), lineoffset, scrolloffset);
 	PrintCreditSpace(2.0f, lineoffset);
 	PrintCreditText(1.7f, 1.0f, TheText.Get("CRED135"), lineoffset, scrolloffset);
 	PrintCreditText(1.7f, 1.0f, TheText.Get("CRED136"), lineoffset, scrolloffset);
@@ -349,7 +349,7 @@ CCredits::Render(void)
 	PrintCreditText(1.7f, 1.7f, TheText.Get("CRD138A"), lineoffset, scrolloffset);
 	PrintCreditText(1.7f, 1.7f, TheText.Get("CRD138B"), lineoffset, scrolloffset);
 	PrintCreditSpace(2.0f, lineoffset);
-	PrintCreditText(1.0, 1.0, TheText.Get("CRED139"), lineoffset, scrolloffset);
+	PrintCreditText(1.0f, 1.0f, TheText.Get("CRED139"), lineoffset, scrolloffset);
 	PrintCreditSpace(2.0f, lineoffset);
 	PrintCreditText(1.7f, 1.0f, TheText.Get("CRED140"), lineoffset, scrolloffset);
 	PrintCreditText(1.7f, 1.7f, TheText.Get("CRD140A"), lineoffset, scrolloffset);
@@ -359,12 +359,12 @@ CCredits::Render(void)
 	PrintCreditText(1.7f, 1.7f, TheText.Get("CRD140E"), lineoffset, scrolloffset);
 	PrintCreditSpace(2.0f, lineoffset);
 	PrintCreditText(1.4f, 0.82f, TheText.Get("CRED141"), lineoffset, scrolloffset);
-	PrintCreditText(1.0, 1.0, TheText.Get("CRED142"), lineoffset, scrolloffset);
-	PrintCreditSpace(1.0, lineoffset);
-	PrintCreditText(1.0, 1.0, TheText.Get("CRED143"), lineoffset, scrolloffset);
-	PrintCreditSpace(1.0, lineoffset);
-	PrintCreditText(1.0, 1.0, TheText.Get("CRED144"), lineoffset, scrolloffset);
-	PrintCreditSpace(1.0, lineoffset);
+	PrintCreditText(1.0f, 1.0f, TheText.Get("CRED142"), lineoffset, scrolloffset);
+	PrintCreditSpace(1.0f, lineoffset);
+	PrintCreditText(1.0f, 1.0f, TheText.Get("CRED143"), lineoffset, scrolloffset);
+	PrintCreditSpace(1.0f, lineoffset);
+	PrintCreditText(1.0f, 1.0f, TheText.Get("CRED144"), lineoffset, scrolloffset);
+	PrintCreditSpace(1.0f, lineoffset);
 	PrintCreditSpace(2.0f, lineoffset);
 	PrintCreditText(1.4f, 0.82f, TheText.Get("CRED145"), lineoffset, scrolloffset);
 	PrintCreditText(1.4f, 1.4f, TheText.Get("CRED146"), lineoffset, scrolloffset);
@@ -441,19 +441,19 @@ CCredits::Render(void)
 	PrintCreditText(1.4f, 1.4f, TheText.Get("CRED241"), lineoffset, scrolloffset);
 	PrintCreditSpace(2.0f, lineoffset);
 	PrintCreditText(1.4f, 0.82f, TheText.Get("CRED217"), lineoffset, scrolloffset);
-	PrintCreditSpace(1.5, lineoffset);
+	PrintCreditSpace(1.5f, lineoffset);
 	PrintCreditSpace(2.0f, lineoffset);
 	PrintCreditText(1.4f, 0.82f, TheText.Get("CRED218"), lineoffset, scrolloffset);
-	PrintCreditSpace(1.5, lineoffset);
+	PrintCreditSpace(1.5f, lineoffset);
 	PrintCreditText(1.7f, 1.7f, TheText.Get("CRD218A"), lineoffset, scrolloffset);
 	PrintCreditText(1.7f, 1.7f, TheText.Get("CRD218B"), lineoffset, scrolloffset);
 	PrintCreditSpace(2.0f, lineoffset);
 	PrintCreditText(1.4f, 0.82f, TheText.Get("CRED219"), lineoffset, scrolloffset);
-	PrintCreditSpace(1.5, lineoffset);
+	PrintCreditSpace(1.5f, lineoffset);
 	PrintCreditText(1.7f, 1.7f, TheText.Get("CRED220"), lineoffset, scrolloffset);
 	PrintCreditSpace(2.0f, lineoffset);
 	PrintCreditText(1.4f, 0.82f, TheText.Get("CRED221"), lineoffset, scrolloffset);
-	PrintCreditSpace(1.5, lineoffset);
+	PrintCreditSpace(1.5f, lineoffset);
 	PrintCreditText(1.7f, 1.7f, TheText.Get("CRED222"), lineoffset, scrolloffset);
 	PrintCreditSpace(2.0f, lineoffset);
 	PrintCreditText(1.4f, 0.82f, TheText.Get("CRED223"), lineoffset, scrolloffset);
@@ -462,7 +462,7 @@ CCredits::Render(void)
 	PrintCreditText(1.7f, 1.7f, TheText.Get("CRED226"), lineoffset, scrolloffset);
 	PrintCreditSpace(2.0f, lineoffset);
 	PrintCreditText(1.4f, 0.82f, TheText.Get("CRED227"), lineoffset, scrolloffset);
-	PrintCreditSpace(1.5, lineoffset);
+	PrintCreditSpace(1.5f, lineoffset);
 	PrintCreditText(1.7f, 1.7f, TheText.Get("CRED228"), lineoffset, scrolloffset);
 	PrintCreditText(1.7f, 1.7f, TheText.Get("CRED229"), lineoffset, scrolloffset);
 	PrintCreditSpace(2.0f, lineoffset);
diff --git a/src/render/Draw.cpp b/src/render/Draw.cpp
index bb37a3a3..db87e76d 100644
--- a/src/render/Draw.cpp
+++ b/src/render/Draw.cpp
@@ -3,6 +3,7 @@
 #include "Draw.h"
 #include "Frontend.h"
 #include "Camera.h"
+#include "CutsceneMgr.h"
 
 #ifdef ASPECT_RATIO_SCALE
 float CDraw::ms_fAspectRatio = DEFAULT_ASPECT_RATIO;
@@ -62,7 +63,10 @@ void
 CDraw::SetFOV(float fov)
 {
 #ifdef ASPECT_RATIO_SCALE
-	ms_fScaledFOV = ConvertFOV(fov);
+	if (!CCutsceneMgr::IsRunning())
+		ms_fScaledFOV = ConvertFOV(fov);
+	else
+		ms_fScaledFOV = fov;
 #endif
 	ms_fFOV = fov;
 }
diff --git a/src/render/Fluff.cpp b/src/render/Fluff.cpp
index da29daec..f86801bf 100644
--- a/src/render/Fluff.cpp
+++ b/src/render/Fluff.cpp
@@ -614,7 +614,7 @@ void CScrollBar::Update()
 			break;
 		}
 
-		m_MessageLength = strlen(m_pMessage);
+		m_MessageLength = (uint32)strlen(m_pMessage);
 		m_MessageCurrentChar = 0;
 	}
 
diff --git a/src/render/Glass.cpp b/src/render/Glass.cpp
index ac892ddb..ee36bad3 100644
--- a/src/render/Glass.cpp
+++ b/src/render/Glass.cpp
@@ -424,10 +424,10 @@ CGlass::RenderEntityInGlass(CEntity *entity)
 	ASSERT(col!=nil);
 	if ( col->numTriangles >= 2 )
 	{
-		CVector a = object->GetMatrix() * col->vertices[0];
-		CVector b = object->GetMatrix() * col->vertices[1];
-		CVector c = object->GetMatrix() * col->vertices[2];
-		CVector d = object->GetMatrix() * col->vertices[3];
+		CVector a = object->GetMatrix() * col->vertices[0].Get();
+		CVector b = object->GetMatrix() * col->vertices[1].Get();
+		CVector c = object->GetMatrix() * col->vertices[2].Get();
+		CVector d = object->GetMatrix() * col->vertices[3].Get();
 
 		if ( object->bGlassCracked )
 		{
@@ -613,10 +613,10 @@ CGlass::WindowRespondsToCollision(CEntity *entity, float amount, CVector speed,
 	CColModel *col = object->GetColModel();
 	ASSERT(col!=nil);
 	
-	CVector a = object->GetMatrix() * col->vertices[0];
-	CVector b = object->GetMatrix() * col->vertices[1];
-	CVector c = object->GetMatrix() * col->vertices[2];
-	CVector d = object->GetMatrix() * col->vertices[3];
+	CVector a = object->GetMatrix() * col->vertices[0].Get();
+	CVector b = object->GetMatrix() * col->vertices[1].Get();
+	CVector c = object->GetMatrix() * col->vertices[2].Get();
+	CVector d = object->GetMatrix() * col->vertices[3].Get();
 
 	float minx = Min(Min(a.x, b.x), Min(c.x, d.x));
 	float maxx = Max(Max(a.x, b.x), Max(c.x, d.x));
diff --git a/src/render/MBlur.cpp b/src/render/MBlur.cpp
index f2b94848..ec811e56 100644
--- a/src/render/MBlur.cpp
+++ b/src/render/MBlur.cpp
@@ -1,5 +1,11 @@
 #define WITHWINDOWS
+#ifndef LIBRW
+#define WITHD3D
+#endif
 #include "common.h"
+#ifndef LIBRW
+#include <d3d8caps.h>
+#endif
 
 #include "RwHelper.h"
 #include "Camera.h"
@@ -15,6 +21,9 @@ bool CMBlur::BlurOn;
 static RwIm2DVertex Vertex[4];
 static RwImVertexIndex Index[6] = { 0, 1, 2, 0, 2, 3 };
 
+#ifndef LIBRW
+extern "C" D3DCAPS8 _RwD3D8DeviceCaps;
+#endif
 RwBool
 CMBlur::MotionBlurOpen(RwCamera *cam)
 {
@@ -62,12 +71,11 @@ CMBlur::MotionBlurOpen(RwCamera *cam)
 		
 	if(BlurOn)
 	{
-		int32 width  = Pow(2.0f, int32(log2(RwRasterGetWidth (RwCameraGetRaster(cam))))+1);
-		int32 height = Pow(2.0f, int32(log2(RwRasterGetHeight(RwCameraGetRaster(cam))))+1);
-		int32 depth  = RwRasterGetDepth(RwCameraGetRaster(cam));
+		uint32 width  = Pow(2.0f, int32(log2(RwRasterGetWidth (RwCameraGetRaster(cam))))+1);
+		uint32 height = Pow(2.0f, int32(log2(RwRasterGetHeight(RwCameraGetRaster(cam))))+1);
+		uint32 depth  = RwRasterGetDepth(RwCameraGetRaster(cam));
 		
 #ifndef LIBRW
-		extern D3DCAPS8 _RwD3D8DeviceCaps;
 		extern DWORD _dwMemTotalVideo;
 		if ( _RwD3D8DeviceCaps.MaxTextureWidth >= width && _RwD3D8DeviceCaps.MaxTextureHeight >= height )
 		{
diff --git a/src/render/Renderer.cpp b/src/render/Renderer.cpp
index 8a48eb11..88d412c9 100644
--- a/src/render/Renderer.cpp
+++ b/src/render/Renderer.cpp
@@ -311,7 +311,11 @@ enum Visbility
 	VIS_STREAMME
 };
 
+#ifdef FIX_BUGS
+#define LOD_DISTANCE (300.0f*TheCamera.LODDistMultiplier)
+#else
 #define LOD_DISTANCE 300.0f
+#endif
 #define FADE_DISTANCE 20.0f
 #define STREAM_DISTANCE 30.0f
 
@@ -674,14 +678,7 @@ CRenderer::ScanWorld(void)
 			poly[2].y = CWorld::GetSectorY(vectors[CORNER_LOD_RIGHT].y);
 			ScanSectorPoly(poly, 3, ScanSectorList_Subway);
 		}else{
-			if(f <= LOD_DISTANCE){
-				poly[0].x = CWorld::GetSectorX(vectors[CORNER_CAM].x);
-				poly[0].y = CWorld::GetSectorY(vectors[CORNER_CAM].y);
-				poly[1].x = CWorld::GetSectorX(vectors[CORNER_FAR_TOPLEFT].x);
-				poly[1].y = CWorld::GetSectorY(vectors[CORNER_FAR_TOPLEFT].y);
-				poly[2].x = CWorld::GetSectorX(vectors[CORNER_FAR_TOPRIGHT].x);
-				poly[2].y = CWorld::GetSectorY(vectors[CORNER_FAR_TOPRIGHT].y);
-			}else{
+			if(f > LOD_DISTANCE){
 				// priority
 				poly[0].x = CWorld::GetSectorX(vectors[CORNER_CAM].x);
 				poly[0].y = CWorld::GetSectorY(vectors[CORNER_CAM].y);
@@ -698,11 +695,27 @@ CRenderer::ScanWorld(void)
 				poly[1].y = CWorld::GetSectorY(vectors[CORNER_LOD_LEFT].y);
 				poly[2].x = CWorld::GetSectorX(vectors[CORNER_LOD_RIGHT].x);
 				poly[2].y = CWorld::GetSectorY(vectors[CORNER_LOD_RIGHT].y);
+				ScanSectorPoly(poly, 3, ScanSectorList);
+			}else{
+				poly[0].x = CWorld::GetSectorX(vectors[CORNER_CAM].x);
+				poly[0].y = CWorld::GetSectorY(vectors[CORNER_CAM].y);
+				poly[1].x = CWorld::GetSectorX(vectors[CORNER_FAR_TOPLEFT].x);
+				poly[1].y = CWorld::GetSectorY(vectors[CORNER_FAR_TOPLEFT].y);
+				poly[2].x = CWorld::GetSectorX(vectors[CORNER_FAR_TOPRIGHT].x);
+				poly[2].y = CWorld::GetSectorY(vectors[CORNER_FAR_TOPRIGHT].y);
+				ScanSectorPoly(poly, 3, ScanSectorList);
 			}
-			ScanSectorPoly(poly, 3, ScanSectorList);
-
+#ifdef NO_ISLAND_LOADING
+			ScanBigBuildingList(CWorld::GetBigBuildingList(LEVEL_INDUSTRIAL));
+			ScanBigBuildingList(CWorld::GetBigBuildingList(LEVEL_COMMERCIAL));
+			ScanBigBuildingList(CWorld::GetBigBuildingList(LEVEL_SUBURBAN));
+#else
+	#ifdef FIX_BUGS
+			if (CCollision::ms_collisionInMemory != LEVEL_GENERIC)
+	#endif
 			ScanBigBuildingList(CWorld::GetBigBuildingList(CCollision::ms_collisionInMemory));
-			ScanBigBuildingList(CWorld::GetBigBuildingList(LEVEL_NONE));
+#endif
+			ScanBigBuildingList(CWorld::GetBigBuildingList(LEVEL_GENERIC));
 		}
 	}
 }
@@ -844,9 +857,9 @@ CRenderer::ScanSectorPoly(RwV2d *poly, int32 numVertices, void (*scanfunc)(CPtrL
 
 	// prestep x1 and x2 to next integer y
 	deltaA = CalcNewDelta(&poly[a1], &poly[a2]);
-	xA = deltaA * (ceilf(poly[a1].y) - poly[a1].y) + poly[a1].x;
+	xA = deltaA * (Ceil(poly[a1].y) - poly[a1].y) + poly[a1].x;
 	deltaB = CalcNewDelta(&poly[b1], &poly[b2]);
-	xB = deltaB * (ceilf(poly[b1].y) - poly[b1].y) + poly[b1].x;
+	xB = deltaB * (Ceil(poly[b1].y) - poly[b1].y) + poly[b1].x;
 
 	if(y != yend){
 		if(deltaB < 0.0f && (int)xB < xstart)
@@ -891,7 +904,7 @@ CRenderer::ScanSectorPoly(RwV2d *poly, int32 numVertices, void (*scanfunc)(CPtrL
 						xstart = poly[b1].x;
 				}while(y == (int)poly[b2].y);
 				deltaB = CalcNewDelta(&poly[b1], &poly[b2]);
-				xB = deltaB * (ceilf(poly[b1].y) - poly[b1].y) + poly[b1].x;
+				xB = deltaB * (Ceil(poly[b1].y) - poly[b1].y) + poly[b1].x;
 				if(deltaB < 0.0f && (int)xB < xstart)
 					xstart = xB;
 			}
@@ -927,7 +940,7 @@ CRenderer::ScanSectorPoly(RwV2d *poly, int32 numVertices, void (*scanfunc)(CPtrL
 						xend = poly[a1].x;
 				}while(y == (int)poly[a2].y);
 				deltaA = CalcNewDelta(&poly[a1], &poly[a2]);
-				xA = deltaA * (ceilf(poly[a1].y) - poly[a1].y) + poly[a1].x;
+				xA = deltaA * (Ceil(poly[a1].y) - poly[a1].y) + poly[a1].x;
 				if(deltaA >= 0.0f && (int)xA > xend)
 					xend = xA;
 			}
diff --git a/src/render/Shadows.cpp b/src/render/Shadows.cpp
index d07c302a..c169c351 100644
--- a/src/render/Shadows.cpp
+++ b/src/render/Shadows.cpp
@@ -796,6 +796,8 @@ CShadows::RenderStaticShadows(void)
 	RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void *)TRUE);
 	RwRenderStateSet(rwRENDERSTATEFOGENABLE,         (void *)FALSE);
 
+	SetAlphaTest(0);
+
 	for ( int32 i = 0; i < MAX_STATICSHADOWS; i++ )
 		aStaticShadows[i].m_bRendered = false;
 
@@ -849,6 +851,7 @@ CShadows::RenderStaticShadows(void)
 			RenderBuffer::RenderStuffInBuffer();
 		}
 	}
+	RestoreAlphaTest();
 
 	RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void *)FALSE);
 	RwRenderStateSet(rwRENDERSTATEZWRITEENABLE,      (void *)TRUE);
diff --git a/src/render/Sprite.cpp b/src/render/Sprite.cpp
index 0789769a..9ec7b002 100644
--- a/src/render/Sprite.cpp
+++ b/src/render/Sprite.cpp
@@ -29,11 +29,7 @@ CSprite::CalcScreenCoors(const RwV3d &in, RwV3d *out, float *outw, float *outh,
 	float recip = 1.0f/out->z;
 	out->x *= SCREEN_WIDTH * recip;
 	out->y *= SCREEN_HEIGHT * recip;
-#ifdef ASPECT_RATIO_SCALE
-	float fov = CDraw::ConvertFOV(DefaultFOV);
-#else
 	const float fov = DefaultFOV;
-#endif
 	// this is used to scale correctly if you zoom in with sniper rifle
 	float fovScale = fov / CDraw::GetFOV();