summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authoreray orçunus <erayorcunus@gmail.com>2020-03-02 01:03:39 +0100
committereray orçunus <erayorcunus@gmail.com>2020-03-02 01:06:52 +0100
commita718e699ad3666f7309d7d922f929e9ec52d96d8 (patch)
treeee6cb8fbeec9622d4dd7dab02022592540de30ff /src/core
parentMerge pull request #336 from Nick007J/master (diff)
downloadre3-a718e699ad3666f7309d7d922f929e9ec52d96d8.tar
re3-a718e699ad3666f7309d7d922f929e9ec52d96d8.tar.gz
re3-a718e699ad3666f7309d7d922f929e9ec52d96d8.tar.bz2
re3-a718e699ad3666f7309d7d922f929e9ec52d96d8.tar.lz
re3-a718e699ad3666f7309d7d922f929e9ec52d96d8.tar.xz
re3-a718e699ad3666f7309d7d922f929e9ec52d96d8.tar.zst
re3-a718e699ad3666f7309d7d922f929e9ec52d96d8.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/FileLoader.cpp6
-rw-r--r--src/core/PlayerInfo.cpp2
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();