diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2021-01-01 12:53:20 +0100 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2021-01-01 12:53:20 +0100 |
| commit | 9fd93e8e5792781b1bce0eb5d75aa6eff00d9f69 (patch) | |
| tree | 49f4d64c4ee48b03e9ac032fca6b97259d181935 /src/control/Darkel.cpp | |
| parent | Merge branch 'miami' of github.com:GTAmodding/re3 into miami (diff) | |
| parent | actual struct name (diff) | |
| download | re3-9fd93e8e5792781b1bce0eb5d75aa6eff00d9f69.tar re3-9fd93e8e5792781b1bce0eb5d75aa6eff00d9f69.tar.gz re3-9fd93e8e5792781b1bce0eb5d75aa6eff00d9f69.tar.bz2 re3-9fd93e8e5792781b1bce0eb5d75aa6eff00d9f69.tar.lz re3-9fd93e8e5792781b1bce0eb5d75aa6eff00d9f69.tar.xz re3-9fd93e8e5792781b1bce0eb5d75aa6eff00d9f69.tar.zst re3-9fd93e8e5792781b1bce0eb5d75aa6eff00d9f69.zip | |
Diffstat (limited to 'src/control/Darkel.cpp')
| -rw-r--r-- | src/control/Darkel.cpp | 32 |
1 files changed, 30 insertions, 2 deletions
diff --git a/src/control/Darkel.cpp b/src/control/Darkel.cpp index 722ebbcd..f1400de8 100644 --- a/src/control/Darkel.cpp +++ b/src/control/Darkel.cpp @@ -73,13 +73,21 @@ CDarkel::DrawMessages() { CFont::SetJustifyOff(); CFont::SetBackgroundOff(); - CFont::SetCentreSize(SCREEN_SCALE_X(610.0f)); +#ifdef FIX_BUGS + CFont::SetCentreSize(SCREEN_SCALE_X(DEFAULT_SCREEN_WIDTH - 30)); +#else + CFont::SetCentreSize(SCREEN_WIDTH - 30); +#endif CFont::SetCentreOn(); CFont::SetPropOn(); uint32 timePassedSinceStart = CTimer::GetTimeInMilliseconds() - TimeOfFrenzyStart; if (bStandardSoundAndMessages) { if (timePassedSinceStart >= 3000 && timePassedSinceStart < 11000) { +#ifdef FIX_BUGS CFont::SetScale(SCREEN_SCALE_X(1.3f), SCREEN_SCALE_Y(1.3f)); +#else + CFont::SetScale(1.3f, 1.3f); +#endif CFont::SetJustifyOff(); CFont::SetColor(CRGBA(255, 255, 128, CalcFade(timePassedSinceStart, 3000, 11000))); CFont::SetFontStyle(FONT_STANDARD); @@ -89,7 +97,11 @@ CDarkel::DrawMessages() } } else { if (timePassedSinceStart < 8000) { +#ifdef FIX_BUGS CFont::SetScale(SCREEN_SCALE_X(1.3f), SCREEN_SCALE_Y(1.3f)); +#else + CFont::SetScale(1.3f, 1.3f); +#endif CFont::SetJustifyOff(); CFont::SetColor(CRGBA(255, 255, 128, CalcFade(timePassedSinceStart, 0, 8000))); CFont::SetFontStyle(FONT_STANDARD); @@ -98,7 +110,11 @@ CDarkel::DrawMessages() } } } +#ifdef FIX_BUGS CFont::SetScale(SCREEN_SCALE_X(0.75f), SCREEN_SCALE_Y(1.5f)); +#else + CFont::SetScale(0.75f, 1.5f); +#endif CFont::SetCentreOff(); CFont::SetRightJustifyOn(); CFont::SetFontStyle(FONT_HEADING); @@ -127,13 +143,25 @@ CDarkel::DrawMessages() uint32 timePassedSinceStart = CTimer::GetTimeInMilliseconds() - TimeOfFrenzyStart; if (CTimer::GetTimeInMilliseconds() - TimeOfFrenzyStart < 5000) { CFont::SetBackgroundOff(); - CFont::SetCentreSize(SCREEN_SCALE_X(620.0f)); +#ifdef FIX_BUGS + CFont::SetCentreSize(SCREEN_SCALE_X(DEFAULT_SCREEN_WIDTH - 20)); +#else + CFont::SetCentreSize(SCREEN_WIDTH - 20); +#endif CFont::SetCentreOn(); +#ifdef FIX_BUGS CFont::SetScale(SCREEN_SCALE_X(1.5f), SCREEN_SCALE_Y(1.5f)); +#else + CFont::SetScale(1.5f, 1.5f); +#endif CFont::SetJustifyOff(); CFont::SetColor(CRGBA(128, 255, 128, CalcFade(timePassedSinceStart, 0, 5000))); CFont::SetFontStyle(FONT_STANDARD); +#ifdef FIX_BUGS int y = SCREEN_HEIGHT / 2 + SCREEN_SCALE_Y(25.0f - timePassedSinceStart * 0.01f); +#else + int y = (SCREEN_HEIGHT / 2 + 25) - (timePassedSinceStart * 0.01f); +#endif CFont::PrintString(SCREEN_WIDTH / 2, y, TheText.Get("KF_3")); } } |