5 files changed, 43 insertions, 29 deletions

diff --git a/src/render/Credits.cpp b/src/render/Credits.cpp
index 75342bad..f45c0aee 100644
--- a/src/render/Credits.cpp
+++ b/src/render/Credits.cpp
@@ -73,7 +73,7 @@ CCredits::Render(void)
 	scrolloffset = (CTimer::GetTimeInMilliseconds() - CreditsStartTime) / 24.0f;
 	CFont::SetJustifyOff();
 	CFont::SetBackgroundOff();
-	CFont::SetCentreSize(SCALE_AND_CENTER_X(DEFAULT_SCREEN_WIDTH * 0.75f));
+	CFont::SetCentreSize(SCREEN_SCALE_X(DEFAULT_SCREEN_WIDTH * 0.75f));
 	CFont::SetCentreOn();
 	CFont::SetPropOn();
 	CFont::SetFontStyle(FONT_STANDARD);
@@ -421,7 +421,7 @@ CCredits::Render(void)
     PrintCreditText(0.65f, 0.65f, TheText.Get("CRED129"), lineoffset, scrolloffset);
     PrintCreditSpace(1.5f, lineoffset);
 
-    CFont::SetCentreSize(SCALE_AND_CENTER_X(DEFAULT_SCREEN_WIDTH * 0.8f));
+    CFont::SetCentreSize(SCREEN_SCALE_X(DEFAULT_SCREEN_WIDTH * 0.8f));
 
     PrintCreditText(1.1f, 0.8f, TheText.Get("CRD111A"), lineoffset, scrolloffset);
     PrintCreditSpace(0.5f, lineoffset);
@@ -469,7 +469,7 @@ CCredits::Render(void)
         PrintCreditSpace(0.5f, lineoffset);
     PrintCreditText(0.65f, 0.65f, TheText.Get("CRD134I"), lineoffset, scrolloffset);
 
-    CFont::SetCentreSize(SCALE_AND_CENTER_X(DEFAULT_SCREEN_WIDTH * 0.7f));
+    CFont::SetCentreSize(SCREEN_SCALE_X(DEFAULT_SCREEN_WIDTH * 0.7f));
 
     PrintCreditSpace(1.5f, lineoffset);
     PrintCreditText(1.1f, 0.8f, TheText.Get("CRED135"), lineoffset, scrolloffset);
@@ -505,7 +505,7 @@ CCredits::Render(void)
     PrintCreditText(1.1f, 1.1f, TheText.Get("CRD140L"), lineoffset, scrolloffset);
     PrintCreditSpace(1.5f, lineoffset);
     
-    CFont::SetCentreSize(SCALE_AND_CENTER_X(DEFAULT_SCREEN_WIDTH * 0.85f));
+    CFont::SetCentreSize(SCREEN_SCALE_X(DEFAULT_SCREEN_WIDTH * 0.85f));
 
     PrintCreditText(0.95f, 0.7f, TheText.Get("CRED259"), lineoffset, scrolloffset);
     PrintCreditSpace(0.5f, lineoffset);
@@ -586,7 +586,7 @@ CCredits::Render(void)
     PrintCreditText(0.65f, 0.65f, TheText.Get("CRED172"), lineoffset, scrolloffset);
     PrintCreditSpace(0.5f, lineoffset);
 
-    CFont::SetCentreSize(SCALE_AND_CENTER_X(DEFAULT_SCREEN_WIDTH * 0.75f));
+    CFont::SetCentreSize(SCREEN_SCALE_X(DEFAULT_SCREEN_WIDTH * 0.75f));
 
     PrintCreditSpace(1.5f, lineoffset);
     PrintCreditText(0.95f, 0.7f, TheText.Get("CRED217"), lineoffset, scrolloffset);
@@ -709,7 +709,7 @@ CCredits::Render(void)
     PrintCreditText(0.65f, 0.65f, TheText.Get("CRED332"), lineoffset, scrolloffset);
     PrintCreditSpace(1.5f, lineoffset);
     
-    CFont::SetCentreSize(SCALE_AND_CENTER_X(DEFAULT_SCREEN_WIDTH * 0.8f));
+    CFont::SetCentreSize(SCREEN_SCALE_X(DEFAULT_SCREEN_WIDTH * 0.8f));
 
     PrintCreditText(0.95f, 0.7f, TheText.Get("CRED333"), lineoffset, scrolloffset);
     PrintCreditSpace(0.5f, lineoffset);
@@ -747,7 +747,7 @@ CCredits::Render(void)
 
     PrintCreditSpace(1.5f, lineoffset);
 
-    CFont::SetCentreSize(SCALE_AND_CENTER_X(DEFAULT_SCREEN_WIDTH * 0.75f));
+    CFont::SetCentreSize(SCREEN_SCALE_X(DEFAULT_SCREEN_WIDTH * 0.75f));
 
     PrintCreditText(0.95f, 0.7f, TheText.Get("CRED267"), lineoffset, scrolloffset);
     PrintCreditSpace(0.5f, lineoffset);
@@ -810,4 +810,4 @@ CCredits::Render(void)
 bool CCredits::AreCreditsDone(void)
 {
 	return !bCreditsGoing;
-}
\ No newline at end of file
+}
diff --git a/src/render/Font.cpp b/src/render/Font.cpp
index 787a0c40..78a8599e 100644
--- a/src/render/Font.cpp
+++ b/src/render/Font.cpp
@@ -268,8 +268,8 @@ CFont::Initialise(void)
 	SetColor(CRGBA(0xFF, 0xFF, 0xFF, 0));
 	SetJustifyOff();
 	SetCentreOff();
-	SetWrapx(SCREEN_STRETCH_X(DEFAULT_SCREEN_WIDTH));
-	SetCentreSize(SCREEN_STRETCH_X(DEFAULT_SCREEN_WIDTH));
+	SetWrapx(SCREEN_WIDTH);
+	SetCentreSize(SCREEN_WIDTH);
 	SetBackgroundOff();
 	SetBackgroundColor(CRGBA(0x80, 0x80, 0x80, 0x80));
 	SetBackGroundOnlyTextOff();
@@ -646,7 +646,14 @@ CFont::GetNumberLines(float xstart, float ystart, wchar *s)
 	y = ystart;
 
 	while(*s){
+#ifdef FIX_BUGS
+		float f = Details.centre ? Details.centreSize :
+		           Details.rightJustify ? xstart - Details.rightJustifyWrap :
+		           Details.wrapX;
+#else
 		float f = (Details.centre ? Details.centreSize : Details.wrapX);
+#endif
+
 #ifdef MORE_LANGUAGES
 		if (IsJapaneseFont())
 			f -= SCREEN_SCALE_X(21.0f * 2.0f);
@@ -726,8 +733,15 @@ CFont::GetTextRect(CRect *rect, float xstart, float ystart, wchar *s)
 			x = xstart;
 		y = ystart;
 
+#ifdef FIX_BUGS
+		float xEnd = Details.centre ? Details.centreSize :
+		           Details.rightJustify ? xstart - Details.rightJustifyWrap :
+		           Details.wrapX;
+#else
+		float xEnd = (Details.centre ? Details.centreSize : Details.wrapX);
+#endif
 		while(*s){
-			if(x + GetStringWidth(s) > (Details.centre ? Details.centreSize : Details.wrapX)){
+			if(x + GetStringWidth(s) > xEnd){
 				// reached end of line
 				if(x > maxlength)
 					maxlength = x;
diff --git a/src/render/Glass.cpp b/src/render/Glass.cpp
index 426fa7f1..536d94e0 100644
--- a/src/render/Glass.cpp
+++ b/src/render/Glass.cpp
@@ -967,7 +967,7 @@ CGlass::BreakGlassPhysically(CVector pos, float radius)
 					for ( int32 j = 0; j < col->numTriangles; j++ )
 					{
 						if ( CCollision::TestSphereTriangle(sphere,
-							col->vertices, col->triangles[i], col->trianglePlanes[i]) )
+							col->vertices, col->triangles[j], col->trianglePlanes[j]) )
 						{
 							hit = true;
 						}
diff --git a/src/render/Hud.cpp b/src/render/Hud.cpp
index cf0e2b70..ed78ac4c 100644
--- a/src/render/Hud.cpp
+++ b/src/render/Hud.cpp
@@ -1095,7 +1095,7 @@ void CHud::Draw()
 					CFont::SetCentreOff();
 
 				CFont::SetWrapx(SCALE_AND_CENTER_X(CTheScripts::IntroTextLines[i].m_fWrapX));
-				CFont::SetCentreSize(SCALE_AND_CENTER_X(CTheScripts::IntroTextLines[i].m_fCenterSize));
+				CFont::SetCentreSize(SCREEN_SCALE_X(CTheScripts::IntroTextLines[i].m_fCenterSize));
 
 				if (CTheScripts::IntroTextLines[i].m_bBackground)
 					CFont::SetBackgroundOn();
@@ -1168,7 +1168,7 @@ void CHud::Draw()
 				onceItWasWidescreen = true;
 				
 				if (FrontEndMenuManager.m_PrefsShowSubtitles || !CCutsceneMgr::IsRunning()) {
-					CFont::SetCentreSize(SCREEN_SCALE_FROM_RIGHT(60.0f));
+					CFont::SetCentreSize(SCREEN_WIDTH - SCREEN_SCALE_X(60.0f));
 					CFont::SetScale(SCREEN_SCALE_X(0.58f), SCREEN_SCALE_Y(1.2f));
 					CFont::PrintString(SCREEN_WIDTH / 2.f, SCREEN_SCALE_FROM_BOTTOM(80.0f), m_Message);
 				}
@@ -1182,11 +1182,11 @@ void CHud::Draw()
 				CFont::SetDropColor(CRGBA(0, 0, 0, 255));
 				CFont::SetScale(SCREEN_SCALE_X(0.58f), SCREEN_SCALE_Y(1.22f));
 
-				float offsetX = SCREEN_SCALE_X(140.0f) + SCREEN_SCALE_X(8.0f);
-				float center = SCREEN_SCALE_FROM_RIGHT(20.0f) - SCREEN_SCALE_X(8.0f) - offsetX;
-				CFont::SetCentreSize(center);
+				float radarBulge = SCREEN_SCALE_X(140.0f) + SCREEN_SCALE_X(8.0f);
+				float rectWidth = SCREEN_WIDTH - SCREEN_SCALE_X(20.0f) - SCREEN_SCALE_X(8.0f) - radarBulge;
+				CFont::SetCentreSize(rectWidth);
 
-				CFont::PrintString(center / 2.0f + offsetX, SCREEN_SCALE_FROM_BOTTOM(105.f + 2.0f), m_Message);
+				CFont::PrintString(rectWidth / 2.0f + radarBulge, SCREEN_SCALE_FROM_BOTTOM(105.f + 2.0f), m_Message);
 			}
 			CFont::SetDropShadowPosition(0);
 		}
@@ -1322,13 +1322,13 @@ void CHud::Draw()
 				}
 				CFont::SetPropOn();
 				CFont::SetCentreOn();
-				CFont::SetCentreSize(SCREEN_SCALE_FROM_RIGHT(50.0f));
+				CFont::SetCentreSize(SCREEN_SCALE_X(590.0f));
 				CFont::SetColor(CRGBA(255, 255, 0, BigMessageAlpha[0])); // unused color
 				CFont::SetFontStyle(FONT_HEADING);
 
 				// Appearently sliding text in here was abandoned very early, since this text is centered now.
 
-				if (BigMessageX[0] >= SCREEN_SCALE_FROM_RIGHT(20.0f)) {
+				if (BigMessageX[0] >= SCALE_AND_CENTER_X(620.0f)) {
 					BigMessageInUse[0] += CTimer::GetTimeStep();
 
 					if (BigMessageInUse[0] >= 120.0f) {
@@ -1356,7 +1356,7 @@ void CHud::Draw()
 			}
 			else {
 				BigMessageAlpha[0] = 0.0f;
-				BigMessageX[0] = SCREEN_SCALE_FROM_RIGHT(DEFAULT_SCREEN_WIDTH + 60.0f);
+				BigMessageX[0] = SCALE_AND_CENTER_X(-60.0f);
 				BigMessageInUse[0] = 1.0f;
 			}
 		}
@@ -1435,7 +1435,7 @@ void CHud::DrawAfterFade()
 				CFont::SetCentreOff();
 
 			CFont::SetWrapx(SCALE_AND_CENTER_X(line.m_fWrapX));
-			CFont::SetCentreSize(SCALE_AND_CENTER_X(line.m_fCenterSize));
+			CFont::SetCentreSize(SCREEN_SCALE_X(line.m_fCenterSize));
 			if (line.m_bBackground)
 				CFont::SetBackgroundOn();
 			else
@@ -1481,7 +1481,7 @@ void CHud::DrawAfterFade()
 		CFont::SetScale(SCREEN_SCALE_X(1.2f), SCREEN_SCALE_Y(1.5f));
 		CFont::SetCentreOn();
 		CFont::SetPropOn();
-		CFont::SetCentreSize(SCREEN_SCALE_FROM_RIGHT(40.0f));
+		CFont::SetCentreSize(SCREEN_SCALE_X(600.0f));
 		CFont::SetFontStyle(FONT_LOCALE(FONT_STANDARD));
 		CFont::SetDropShadowPosition(2);
 		CFont::SetDropColor(CRGBA(0, 0, 0, 255));
@@ -1495,7 +1495,7 @@ void CHud::DrawAfterFade()
 		CFont::SetScale(SCREEN_SCALE_X(1.2f), SCREEN_SCALE_Y(1.5f));
 		CFont::SetCentreOn();
 		CFont::SetPropOn();
-		CFont::SetCentreSize(SCREEN_SCALE_FROM_RIGHT(60.0f));
+		CFont::SetCentreSize(SCREEN_SCALE_X(580.0f));
 		CFont::SetFontStyle(FONT_LOCALE(FONT_STANDARD));
 		CFont::SetDropShadowPosition(2);
 		CFont::SetDropColor(CRGBA(0, 0, 0, 255));
@@ -1550,7 +1550,7 @@ void CHud::DrawAfterFade()
 			CFont::SetScale(SCREEN_SCALE_X(1.0f), SCREEN_SCALE_Y(1.2f));
 			CFont::SetCentreOn();
 			CFont::SetPropOn();
-			CFont::SetCentreSize(SCREEN_SCALE_FROM_RIGHT(80.0f));
+			CFont::SetCentreSize(SCREEN_SCALE_X(560.0f));
 			CFont::SetFontStyle(FONT_LOCALE(FONT_STANDARD));
 			CFont::SetDropShadowPosition(2);
 			CFont::SetDropColor(CRGBA(0, 0, 0, 255));
@@ -1581,7 +1581,7 @@ void CHud::DrawAfterFade()
 				CFont::SetScale(SCREEN_SCALE_X(1.04f), SCREEN_SCALE_Y(1.6f));
 
 			CFont::SetPropOn();
-			CFont::SetRightJustifyWrap(0.0f);
+			CFont::SetRightJustifyWrap(SCALE_AND_CENTER_X(0.0f));
 			CFont::SetRightJustifyOn();
 			CFont::SetFontStyle(FONT_BANK);
 			CFont::SetScale(FrontEndMenuManager.m_PrefsLanguage == CMenuManager::LANGUAGE_AMERICAN ? SCREEN_SCALE_X(1.7f) : SCREEN_SCALE_X(1.5f), SCREEN_SCALE_Y(1.8f));
@@ -2067,4 +2067,4 @@ CHud::ResetWastedText(void)
 	BigMessageInUse[0] = 0.0f;
 	m_BigMessage[2][0] = 0;
 	m_BigMessage[0][0] = 0;
-}
\ No newline at end of file
+}
diff --git a/src/render/SpecialFX.cpp b/src/render/SpecialFX.cpp
index 7125bda8..665a41ab 100644
--- a/src/render/SpecialFX.cpp
+++ b/src/render/SpecialFX.cpp
@@ -182,7 +182,7 @@ CSpecialFX::Render2DFXs(void)
 		CFont::SetScale(SCREEN_SCALE_X(1.5f), SCREEN_SCALE_Y(1.5f));
 		CFont::SetJustifyOff();
 		CFont::SetBackgroundOff();
-		CFont::SetCentreSize(SCREEN_SCALE_FROM_RIGHT(20.0f));
+		CFont::SetCentreSize(SCREEN_SCALE_X(620.0f)); // unused
 		CFont::SetCentreOff();
 		CFont::SetPropOn();
 		CFont::SetColor(CRGBA(0, 255, 0, 200));
@@ -207,7 +207,7 @@ CSpecialFX::Render2DFXs(void)
 		CFont::SetScale(SCREEN_SCALE_X(1.5f), SCREEN_SCALE_Y(1.5f));
 		CFont::SetJustifyOff();
 		CFont::SetBackgroundOff();
-		CFont::SetCentreSize(SCREEN_SCALE_FROM_RIGHT(20.0f));
+		CFont::SetCentreSize(SCREEN_SCALE_X(620.0f)); // unused
 		CFont::SetCentreOff();
 		CFont::SetPropOn();
 		CFont::SetColor(CRGBA(100, 100, 100, 200));