diff options
| author | erorcun <erorcunerorcun@hotmail.com.tr> | 2021-02-08 11:23:19 +0100 |
|---|---|---|
| committer | erorcun <erorcunerorcun@hotmail.com.tr> | 2021-02-08 11:23:19 +0100 |
| commit | b464bb7fd43a86264e816e950ccac1d6845b0230 (patch) | |
| tree | 1070200f94f1f7adf4ae26950011884e1956576d /src/render/Font.cpp | |
| parent | Use our synonyms for attack anims again (diff) | |
| parent | reorganize shaders; use modulate flag; update librw (diff) | |
| download | re3-b464bb7fd43a86264e816e950ccac1d6845b0230.tar re3-b464bb7fd43a86264e816e950ccac1d6845b0230.tar.gz re3-b464bb7fd43a86264e816e950ccac1d6845b0230.tar.bz2 re3-b464bb7fd43a86264e816e950ccac1d6845b0230.tar.lz re3-b464bb7fd43a86264e816e950ccac1d6845b0230.tar.xz re3-b464bb7fd43a86264e816e950ccac1d6845b0230.tar.zst re3-b464bb7fd43a86264e816e950ccac1d6845b0230.zip | |
Diffstat (limited to 'src/render/Font.cpp')
| -rw-r--r-- | src/render/Font.cpp | 13 |
1 files changed, 8 insertions, 5 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 |