mirror of
https://git.rip/DMCA_FUCKER/re3.git
synced 2024-12-23 10:50:01 +00:00
fixes
This commit is contained in:
parent
62ae7245ab
commit
6e6912b613
|
@ -17,8 +17,6 @@
|
||||||
|
|
||||||
cMusicManager &MusicManager = *(cMusicManager *)0x8F3964;
|
cMusicManager &MusicManager = *(cMusicManager *)0x8F3964;
|
||||||
int32 &gNumRetunePresses = *(int32 *)0x650B80;
|
int32 &gNumRetunePresses = *(int32 *)0x650B80;
|
||||||
wchar *pCurrentStation = (wchar *)0x650B9C;
|
|
||||||
uint8 &cDisplay = *(uint8 *)0x650BA1;
|
|
||||||
int32 &gRetuneCounter = *(int32*)0x650B84;
|
int32 &gRetuneCounter = *(int32*)0x650B84;
|
||||||
bool& bHasStarted = *(bool*)0x650B7C;
|
bool& bHasStarted = *(bool*)0x650B7C;
|
||||||
|
|
||||||
|
@ -72,6 +70,8 @@ cMusicManager::DisplayRadioStationName()
|
||||||
int8 pRetune;
|
int8 pRetune;
|
||||||
int8 gStreamedSound;
|
int8 gStreamedSound;
|
||||||
int8 gRetuneCounter;
|
int8 gRetuneCounter;
|
||||||
|
static wchar *pCurrentStation = nil;
|
||||||
|
static uint8 cDisplay = 0;
|
||||||
|
|
||||||
if(!CTimer::GetIsPaused() && !TheCamera.m_WideScreenOn && PlayerInCar() &&
|
if(!CTimer::GetIsPaused() && !TheCamera.m_WideScreenOn && PlayerInCar() &&
|
||||||
!CReplay::IsPlayingBack()) {
|
!CReplay::IsPlayingBack()) {
|
||||||
|
|
|
@ -1106,8 +1106,11 @@ void CRadar::TransformRadarPointToRealWorldSpace(CVector2D &out, const CVector2D
|
||||||
// Radar space goes from -1.0 to 1.0 in x and y, top right is (1.0, 1.0)
|
// Radar space goes from -1.0 to 1.0 in x and y, top right is (1.0, 1.0)
|
||||||
void CRadar::TransformRadarPointToScreenSpace(CVector2D &out, const CVector2D &in)
|
void CRadar::TransformRadarPointToScreenSpace(CVector2D &out, const CVector2D &in)
|
||||||
{
|
{
|
||||||
// FIX? scale RADAR_LEFT here somehow
|
#ifdef FIX_BUGS
|
||||||
|
out.x = (in.x + 1.0f)*0.5f*SCREEN_SCALE_X(RADAR_WIDTH) + SCREEN_SCALE_X(RADAR_LEFT);
|
||||||
|
#else
|
||||||
out.x = (in.x + 1.0f)*0.5f*SCREEN_SCALE_X(RADAR_WIDTH) + RADAR_LEFT;
|
out.x = (in.x + 1.0f)*0.5f*SCREEN_SCALE_X(RADAR_WIDTH) + RADAR_LEFT;
|
||||||
|
#endif
|
||||||
out.y = (1.0f - in.y)*0.5f*SCREEN_SCALE_Y(RADAR_HEIGHT) + SCREEN_SCALE_FROM_BOTTOM(RADAR_BOTTOM + RADAR_HEIGHT);
|
out.y = (1.0f - in.y)*0.5f*SCREEN_SCALE_Y(RADAR_HEIGHT) + SCREEN_SCALE_FROM_BOTTOM(RADAR_BOTTOM + RADAR_HEIGHT);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -793,8 +793,11 @@ void CHud::Draw()
|
||||||
if (m_ItemToFlash == ITEM_RADAR && CTimer::GetFrameCounter() & 8 || m_ItemToFlash != ITEM_RADAR) {
|
if (m_ItemToFlash == ITEM_RADAR && CTimer::GetFrameCounter() & 8 || m_ItemToFlash != ITEM_RADAR) {
|
||||||
CRadar::DrawMap();
|
CRadar::DrawMap();
|
||||||
CRect rect(0.0f, 0.0f, SCREEN_SCALE_X(RADAR_WIDTH), SCREEN_SCALE_Y(RADAR_HEIGHT));
|
CRect rect(0.0f, 0.0f, SCREEN_SCALE_X(RADAR_WIDTH), SCREEN_SCALE_Y(RADAR_HEIGHT));
|
||||||
// FIX? scale RADAR_LEFT here somehow
|
#ifdef FIX_BUGS
|
||||||
|
rect.Translate(SCREEN_SCALE_X(RADAR_LEFT), SCREEN_SCALE_FROM_BOTTOM(RADAR_BOTTOM + RADAR_HEIGHT));
|
||||||
|
#else
|
||||||
rect.Translate(RADAR_LEFT, SCREEN_SCALE_FROM_BOTTOM(RADAR_BOTTOM + RADAR_HEIGHT));
|
rect.Translate(RADAR_LEFT, SCREEN_SCALE_FROM_BOTTOM(RADAR_BOTTOM + RADAR_HEIGHT));
|
||||||
|
#endif
|
||||||
rect.Grow(4.0f);
|
rect.Grow(4.0f);
|
||||||
Sprites[HUD_RADARDISC].Draw(rect, CRGBA(0, 0, 0, 255));
|
Sprites[HUD_RADARDISC].Draw(rect, CRGBA(0, 0, 0, 255));
|
||||||
CRadar::DrawBlips();
|
CRadar::DrawBlips();
|
||||||
|
@ -1094,7 +1097,6 @@ void CHud::DrawAfterFade()
|
||||||
CFont::SetColor(CRGBA(175, 175, 175, 255));
|
CFont::SetColor(CRGBA(175, 175, 175, 255));
|
||||||
CFont::PrintString(SCREEN_SCALE_X(26.0f), SCREEN_SCALE_Y(28.0f + (150.0f - PagerXOffset) * 0.6f), CHud::m_HelpMessageToPrint);
|
CFont::PrintString(SCREEN_SCALE_X(26.0f), SCREEN_SCALE_Y(28.0f + (150.0f - PagerXOffset) * 0.6f), CHud::m_HelpMessageToPrint);
|
||||||
CFont::SetAlphaFade(255.0f);
|
CFont::SetAlphaFade(255.0f);
|
||||||
CFont::DrawFonts();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in a new issue