diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2021-01-30 23:46:33 +0100 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2021-01-30 23:46:33 +0100 |
| commit | e5190481e4301f0d7a7667f97090ac73ef8445f3 (patch) | |
| tree | b4f32736f1be0f77fdad796e4a8e10999b252a8b | |
| parent | fix (diff) | |
| parent | use macro for waterlevel z offset (diff) | |
| download | re3-e5190481e4301f0d7a7667f97090ac73ef8445f3.tar re3-e5190481e4301f0d7a7667f97090ac73ef8445f3.tar.gz re3-e5190481e4301f0d7a7667f97090ac73ef8445f3.tar.bz2 re3-e5190481e4301f0d7a7667f97090ac73ef8445f3.tar.lz re3-e5190481e4301f0d7a7667f97090ac73ef8445f3.tar.xz re3-e5190481e4301f0d7a7667f97090ac73ef8445f3.tar.zst re3-e5190481e4301f0d7a7667f97090ac73ef8445f3.zip | |
| -rw-r--r-- | src/render/Font.cpp | 13 | ||||
| -rw-r--r-- | src/render/Hud.cpp | 4 | ||||
| -rw-r--r-- | src/render/WaterLevel.cpp | 2 |
3 files changed, 12 insertions, 7 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); 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; |