summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2021-01-20 19:12:42 +0100
committerNikolay Korolev <nickvnuk@gmail.com>2021-01-20 19:12:42 +0100
commitad745aae63b0c5e3d918fbadcee54d269240b5a3 (patch)
treecd3f15aed49a450dcd037ade408f09bb902e794b /src/core
parentMerge branch 'lcs-dev' into lcs (diff)
downloadre3-ad745aae63b0c5e3d918fbadcee54d269240b5a3.tar
re3-ad745aae63b0c5e3d918fbadcee54d269240b5a3.tar.gz
re3-ad745aae63b0c5e3d918fbadcee54d269240b5a3.tar.bz2
re3-ad745aae63b0c5e3d918fbadcee54d269240b5a3.tar.lz
re3-ad745aae63b0c5e3d918fbadcee54d269240b5a3.tar.xz
re3-ad745aae63b0c5e3d918fbadcee54d269240b5a3.tar.zst
re3-ad745aae63b0c5e3d918fbadcee54d269240b5a3.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/PlayerInfo.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/core/PlayerInfo.cpp b/src/core/PlayerInfo.cpp
index f0f3e2c6..64f3b9d0 100644
--- a/src/core/PlayerInfo.cpp
+++ b/src/core/PlayerInfo.cpp
@@ -420,8 +420,10 @@ CPlayerInfo::Process(void)
CTimer::Update();
}
m_bInRemoteMode = false;
- CWorld::Players[CWorld::PlayerInFocus].m_pRemoteVehicle->bRemoveFromWorld = true;
- CWorld::Players[CWorld::PlayerInFocus].m_pRemoteVehicle = nil;
+ if (CWorld::Players[CWorld::PlayerInFocus].m_pRemoteVehicle) {
+ CWorld::Players[CWorld::PlayerInFocus].m_pRemoteVehicle->bRemoveFromWorld = true;
+ CWorld::Players[CWorld::PlayerInFocus].m_pRemoteVehicle = nil;
+ }
if (FindPlayerVehicle()) {
FindPlayerVehicle()->SetStatus(STATUS_PLAYER);
}