From c193ade58b8956d3a72ef91507c8ca23a043828d Mon Sep 17 00:00:00 2001
From: Sergeanur <s.anureev@yandex.ua>
Date: Sat, 30 Jan 2021 20:46:37 +0200
Subject: [PATCH 1/2] Font fixes

---
 src/render/Font.cpp | 13 ++++++++-----
 src/render/Hud.cpp  |  4 +++-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/render/Font.cpp b/src/render/Font.cpp
index de1ee8b4..0f5930ee 100644
--- a/src/render/Font.cpp
+++ b/src/render/Font.cpp
@@ -406,16 +406,19 @@ CFont::DrawButton(float x, float y)
 	if (PS2Symbol != BUTTON_NONE) {
 		CRect rect;
 		rect.left = x;
-		rect.top = Details.scaleY + Details.scaleY + y;
-		rect.right = Details.scaleY * 17.0f + x;
-		rect.bottom = Details.scaleY * 19.0f + y;
+		rect.top = RenderState.scaleY + RenderState.scaleY + y;
+		rect.right = RenderState.scaleY * 17.0f + x;
+		rect.bottom = RenderState.scaleY * 19.0f + y;
 
 		int vertexAlphaState;
 		void *raster;
 		RwRenderStateGet(rwRENDERSTATEVERTEXALPHAENABLE, &vertexAlphaState);
 		RwRenderStateGet(rwRENDERSTATETEXTURERASTER, &raster);
 		RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void *)TRUE);
-		ButtonSprite[PS2Symbol].Draw(rect, CRGBA(255, 255, 255, Details.color.a));
+		if (RenderState.bIsShadow)
+			ButtonSprite[PS2Symbol].Draw(rect, RenderState.color);
+		else
+			ButtonSprite[PS2Symbol].Draw(rect, CRGBA(255, 255, 255, RenderState.color.a));
 		RwRenderStateSet(rwRENDERSTATETEXTURERASTER, raster);
 		RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void *)vertexAlphaState);
 	}
@@ -585,7 +588,7 @@ CFont::RenderFontBuffer()
 #ifdef BUTTON_ICONS
 			if(PS2Symbol != BUTTON_NONE) {
 				DrawButton(textPosX, textPosY);
-				textPosX += Details.scaleY * 17.0f;
+				textPosX += RenderState.scaleY * 17.0f;
 				PS2Symbol = BUTTON_NONE;
 			}
 #endif
diff --git a/src/render/Hud.cpp b/src/render/Hud.cpp
index a0f3c3ee..e0419a65 100644
--- a/src/render/Hud.cpp
+++ b/src/render/Hud.cpp
@@ -1173,8 +1173,10 @@ void CHud::Draw()
 			CFont::SetCentreOn();
 			CFont::SetPropOn();
 #ifdef CUTSCENE_BORDERS_SWITCH
-			if (!FrontEndMenuManager.m_PrefsCutsceneBorders)
+			if (!FrontEndMenuManager.m_PrefsCutsceneBorders) {
+				CFont::SetDropColor(CRGBA(0, 0, 0, 255));
 				CFont::SetDropShadowPosition(2);
+			}
 			else
 #endif
 				CFont::SetDropShadowPosition(0);

From 5dfe396af3d2c3e2c7c0d01ba96f3c15f01cf888 Mon Sep 17 00:00:00 2001
From: withmorten <morten.with@gmail.com>
Date: Sat, 30 Jan 2021 20:13:25 +0100
Subject: [PATCH 2/2] use macro for waterlevel z offset

---
 src/render/WaterLevel.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/render/WaterLevel.cpp b/src/render/WaterLevel.cpp
index 1ba615c0..3d33dbf6 100644
--- a/src/render/WaterLevel.cpp
+++ b/src/render/WaterLevel.cpp
@@ -73,7 +73,7 @@ RwRaster *gpWaterEnvBaseRaster;
 RwRaster *gpWaterWakeRaster;
 
 bool _bSeaLife;
-float _fWaterZOffset = 0.5f;
+float _fWaterZOffset = WATER_Z_OFFSET;
 
 #ifdef PC_WATER
 float fEnvScale               = 0.25f;