mirrors
/
re3
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/miami' into miami

This commit is contained in:
Nikolay Korolev 2021-01-31 01:46:33 +03:00
parent 2420325c02 5dfe396af3
commit e5190481e4
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/render/Font.cpp
View File

@ -406,16 +406,19 @@ CFont::DrawButton(float x, float y)
if (PS2Symbol != BUTTON_NONE) { if (PS2Symbol != BUTTON_NONE) {
CRect rect; CRect rect;
rect.left = x; rect.left = x;
rect.top = Details.scaleY + Details.scaleY + y; rect.top = RenderState.scaleY + RenderState.scaleY + y;
rect.right = Details.scaleY * 17.0f + x; rect.right = RenderState.scaleY * 17.0f + x;
rect.bottom = Details.scaleY * 19.0f + y; rect.bottom = RenderState.scaleY * 19.0f + y;
int vertexAlphaState; int vertexAlphaState;
void *raster; void *raster;
RwRenderStateGet(rwRENDERSTATEVERTEXALPHAENABLE, &vertexAlphaState); RwRenderStateGet(rwRENDERSTATEVERTEXALPHAENABLE, &vertexAlphaState);
RwRenderStateGet(rwRENDERSTATETEXTURERASTER, &raster); RwRenderStateGet(rwRENDERSTATETEXTURERASTER, &raster);
RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void *)TRUE); 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(rwRENDERSTATETEXTURERASTER, raster);
RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void *)vertexAlphaState); RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void *)vertexAlphaState);
} }
@ -585,7 +588,7 @@ CFont::RenderFontBuffer()
#ifdef BUTTON_ICONS #ifdef BUTTON_ICONS
if(PS2Symbol != BUTTON_NONE) { if(PS2Symbol != BUTTON_NONE) {
DrawButton(textPosX, textPosY); DrawButton(textPosX, textPosY);
textPosX += Details.scaleY * 17.0f; textPosX += RenderState.scaleY * 17.0f;
PS2Symbol = BUTTON_NONE; PS2Symbol = BUTTON_NONE;
} }
#endif #endif

4
src/render/Hud.cpp
View File

@ -1173,8 +1173,10 @@ void CHud::Draw()
CFont::SetCentreOn(); CFont::SetCentreOn();
CFont::SetPropOn(); CFont::SetPropOn();
#ifdef CUTSCENE_BORDERS_SWITCH #ifdef CUTSCENE_BORDERS_SWITCH
if (!FrontEndMenuManager.m_PrefsCutsceneBorders) if (!FrontEndMenuManager.m_PrefsCutsceneBorders) {
CFont::SetDropColor(CRGBA(0, 0, 0, 255));
CFont::SetDropShadowPosition(2); CFont::SetDropShadowPosition(2);
}
else else
#endif #endif
CFont::SetDropShadowPosition(0); CFont::SetDropShadowPosition(0);

2
src/render/WaterLevel.cpp
View File

@ -73,7 +73,7 @@ RwRaster *gpWaterEnvBaseRaster;
RwRaster *gpWaterWakeRaster; RwRaster *gpWaterWakeRaster;
bool _bSeaLife; bool _bSeaLife;
float _fWaterZOffset = 0.5f; float _fWaterZOffset = WATER_Z_OFFSET;
#ifdef PC_WATER #ifdef PC_WATER
float fEnvScale = 0.25f; float fEnvScale = 0.25f;