diff options
author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-03-02 20:54:47 +0100 |
---|---|---|
committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-03-02 20:54:47 +0100 |
commit | 0a3211d0cf5c3ed1873089482a54954a79f0de19 (patch) | |
tree | 7f09b889e83e832b4bf8c6092e08a16f28fbf0f7 /src/core | |
parent | script utils (diff) | |
parent | Merge pull request #340 from erorcun/erorcun (diff) | |
download | re3-0a3211d0cf5c3ed1873089482a54954a79f0de19.tar re3-0a3211d0cf5c3ed1873089482a54954a79f0de19.tar.gz re3-0a3211d0cf5c3ed1873089482a54954a79f0de19.tar.bz2 re3-0a3211d0cf5c3ed1873089482a54954a79f0de19.tar.lz re3-0a3211d0cf5c3ed1873089482a54954a79f0de19.tar.xz re3-0a3211d0cf5c3ed1873089482a54954a79f0de19.tar.zst re3-0a3211d0cf5c3ed1873089482a54954a79f0de19.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/FileLoader.cpp | 6 | ||||
-rw-r--r-- | src/core/PlayerInfo.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/core/FileLoader.cpp b/src/core/FileLoader.cpp index b49fccbb..6305bf33 100644 --- a/src/core/FileLoader.cpp +++ b/src/core/FileLoader.cpp @@ -952,9 +952,9 @@ CFileLoader::Load2dEffect(const char *line) effect->light.lightType = lightType; effect->light.roadReflection = roadReflection; effect->light.flareType = flare; - // TODO: check out the flags - if(flags & 4) - flags &= ~2; + + if(flags & LIGHTFLAG_FOG_ALWAYS) + flags &= ~LIGHTFLAG_FOG_NORMAL; effect->light.flags = flags; break; diff --git a/src/core/PlayerInfo.cpp b/src/core/PlayerInfo.cpp index 633be810..05f3984c 100644 --- a/src/core/PlayerInfo.cpp +++ b/src/core/PlayerInfo.cpp @@ -387,7 +387,7 @@ CPlayerInfo::Process(void) // Because vehicle enter/exit use same key binding.
bool enterOrExitVeh;
- if (m_pPed->m_ped_flagI4 && m_pPed->bInVehicle)
+ if (m_pPed->bVehExitWillBeInstant && m_pPed->bInVehicle)
enterOrExitVeh = CPad::GetPad(0)->ExitVehicleJustDown();
else
enterOrExitVeh = CPad::GetPad(0)->GetExitVehicle();
|