summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorerorcun <erayorcunus@gmail.com>2020-07-09 23:06:16 +0200
committerGitHub <noreply@github.com>2020-07-09 23:06:16 +0200
commit30723cf723a6b866c158b9f721f5a3dd01a5d95c (patch)
tree4f4cfd03c6eabfe9ef860c762570760fdedb5f90 /src/core
parentMerge pull request #653 from Domiiniik/miami (diff)
parentVC fighting, Peds, many fixes including ghost bikes (diff)
downloadre3-30723cf723a6b866c158b9f721f5a3dd01a5d95c.tar
re3-30723cf723a6b866c158b9f721f5a3dd01a5d95c.tar.gz
re3-30723cf723a6b866c158b9f721f5a3dd01a5d95c.tar.bz2
re3-30723cf723a6b866c158b9f721f5a3dd01a5d95c.tar.lz
re3-30723cf723a6b866c158b9f721f5a3dd01a5d95c.tar.xz
re3-30723cf723a6b866c158b9f721f5a3dd01a5d95c.tar.zst
re3-30723cf723a6b866c158b9f721f5a3dd01a5d95c.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/Radar.cpp3
-rw-r--r--src/core/Streaming.cpp6
2 files changed, 5 insertions, 4 deletions
diff --git a/src/core/Radar.cpp b/src/core/Radar.cpp
index 3b581dea..c359793c 100644
--- a/src/core/Radar.cpp
+++ b/src/core/Radar.cpp
@@ -766,7 +766,8 @@ void CRadar::DrawMap()
m_radarRange = RADAR_MIN_RANGE;
vec2DRadarOrigin = CVector2D(FindPlayerCentreOfWorld_NoSniperShift());
- DrawRadarMap();
+ if (FrontEndMenuManager.m_PrefsRadarMode != 1)
+ DrawRadarMap();
}
}
diff --git a/src/core/Streaming.cpp b/src/core/Streaming.cpp
index d560a695..e712e3d6 100644
--- a/src/core/Streaming.cpp
+++ b/src/core/Streaming.cpp
@@ -1380,11 +1380,11 @@ CStreaming::StreamVehiclesAndPeds(void)
}
if(FindPlayerPed()->m_pWanted->AreFbiRequired()){
- RequestModel(MI_FBICAR, STREAMFLAGS_DONT_REMOVE);
+ RequestModel(MI_FBIRANCH, STREAMFLAGS_DONT_REMOVE);
RequestModel(MI_FBI, STREAMFLAGS_DONT_REMOVE);
}else{
- SetModelIsDeletable(MI_FBICAR);
- if(!HasModelLoaded(MI_FBICAR))
+ SetModelIsDeletable(MI_FBIRANCH);
+ if(!HasModelLoaded(MI_FBIRANCH))
SetModelIsDeletable(MI_FBI);
}