diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-12-19 03:21:04 +0300 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-12-19 03:21:04 +0300 |
| commit | 8d1996833bd73271ca14a3df46633d9b2ed13052 (patch) | |
| tree | daedb1622096e5bb6b8b9ec15882769b827506e1 /src/core/PlayerInfo.cpp | |
| parent | c17ccc50ab76e7f161af484400914db373dcafae (diff) | |
| parent | a080fbfbd41ac8a2bc6cfe053d4fa0932dd8d334 (diff) | |
merge attempt
Diffstat (limited to 'src/core/PlayerInfo.cpp')
| -rw-r--r-- | src/core/PlayerInfo.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/PlayerInfo.cpp b/src/core/PlayerInfo.cpp index 8cb9c49e..77ddfdb1 100644 --- a/src/core/PlayerInfo.cpp +++ b/src/core/PlayerInfo.cpp @@ -405,13 +405,13 @@ CPlayerInfo::Process(void) uint32 timeWithoutRemoteCar = CTimer::GetTimeInMilliseconds() - m_nTimeLostRemoteCar; if (CTimer::GetPreviousTimeInMilliseconds() - m_nTimeLostRemoteCar < 1000 && timeWithoutRemoteCar >= 1000 && m_WBState == WBSTATE_PLAYING && field_D6) { TheCamera.SetFadeColour(0, 0, 0); - TheCamera.Fade(1.0f, 0); + TheCamera.Fade(1.0f, FADE_OUT); } if (timeWithoutRemoteCar > 2000) { if (m_WBState == WBSTATE_PLAYING && field_D6) { TheCamera.RestoreWithJumpCut(); TheCamera.SetFadeColour(0, 0, 0); - TheCamera.Fade(1.0f, 1); + TheCamera.Fade(1.0f, FADE_IN); TheCamera.Process(); CTimer::Stop(); CCullZones::ForceCullZoneCoors(TheCamera.GetPosition()); |