mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2024-11-15 09:59:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1248 from davicr/radar-cutscene-bugfix

Browse source 
Fix blip rendering during scripted sequences
This commit is contained in:
Sergeanur 2021-07-31 20:06:20 +03:00 committed by GitHub
commit 9d25e7f315
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/core/Radar.cpp
View file

@ -485,7 +485,11 @@ void CRadar::Draw3dMarkers()
void CRadar::DrawBlips() void CRadar::DrawBlips()
{ {
if (!TheCamera.m_WideScreenOn && CHud::m_Wants_To_Draw_Hud) { if ((!TheCamera.m_WideScreenOn && CHud::m_Wants_To_Draw_Hud)
#ifdef MENU_MAP
|| CMenuManager::bMenuMapActive
#endif
) {
RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, (void*)FALSE); RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, (void*)FALSE);
RwRenderStateSet(rwRENDERSTATEZTESTENABLE, (void*)FALSE); RwRenderStateSet(rwRENDERSTATEZTESTENABLE, (void*)FALSE);
RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)TRUE); RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)TRUE);
@ -1216,7 +1220,11 @@ void CRadar::ShowRadarMarker(CVector pos, uint32 color, float radius) {
void CRadar::ShowRadarTrace(float x, float y, uint32 size, uint8 red, uint8 green, uint8 blue, uint8 alpha) void CRadar::ShowRadarTrace(float x, float y, uint32 size, uint8 red, uint8 green, uint8 blue, uint8 alpha)
{ {
if (!CHud::m_Wants_To_Draw_Hud || TheCamera.m_WideScreenOn) if ((TheCamera.m_WideScreenOn || !CHud::m_Wants_To_Draw_Hud)
#ifdef MENU_MAP
&& !CMenuManager::bMenuMapActive
#endif
)
return; return;
CSprite2d::DrawRect(CRect(x - SCREEN_SCALE_X(size + 1.0f), y - SCREEN_SCALE_Y(size + 1.0f), SCREEN_SCALE_X(size + 1.0f) + x, SCREEN_SCALE_Y(size + 1.0f) + y), CRGBA(0, 0, 0, alpha)); CSprite2d::DrawRect(CRect(x - SCREEN_SCALE_X(size + 1.0f), y - SCREEN_SCALE_Y(size + 1.0f), SCREEN_SCALE_X(size + 1.0f) + x, SCREEN_SCALE_Y(size + 1.0f) + y), CRGBA(0, 0, 0, alpha));
@ -1225,7 +1233,11 @@ void CRadar::ShowRadarTrace(float x, float y, uint32 size, uint8 red, uint8 gree
void CRadar::ShowRadarTraceWithHeight(float x, float y, uint32 size, uint8 red, uint8 green, uint8 blue, uint8 alpha, uint8 mode) void CRadar::ShowRadarTraceWithHeight(float x, float y, uint32 size, uint8 red, uint8 green, uint8 blue, uint8 alpha, uint8 mode)
{ {
if (!CHud::m_Wants_To_Draw_Hud || TheCamera.m_WideScreenOn) if ((TheCamera.m_WideScreenOn || !CHud::m_Wants_To_Draw_Hud)
#ifdef MENU_MAP
&& !CMenuManager::bMenuMapActive
#endif
)
return; return;
switch (mode) switch (mode)