summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorerorcun <erorcunerorcun@hotmail.com.tr>2021-07-31 21:57:54 +0200
committererorcun <erorcunerorcun@hotmail.com.tr>2021-07-31 21:57:54 +0200
commite80cbf8bb2abbe3edb7a604ae5b0af366bf10a9a (patch)
treeff2ef613383a14f797f362703d312c9bad19685d /src
parentAllow sector ped count to exceed gap-list size (diff)
downloadre3-e80cbf8bb2abbe3edb7a604ae5b0af366bf10a9a.tar
re3-e80cbf8bb2abbe3edb7a604ae5b0af366bf10a9a.tar.gz
re3-e80cbf8bb2abbe3edb7a604ae5b0af366bf10a9a.tar.bz2
re3-e80cbf8bb2abbe3edb7a604ae5b0af366bf10a9a.tar.lz
re3-e80cbf8bb2abbe3edb7a604ae5b0af366bf10a9a.tar.xz
re3-e80cbf8bb2abbe3edb7a604ae5b0af366bf10a9a.tar.zst
re3-e80cbf8bb2abbe3edb7a604ae5b0af366bf10a9a.zip
Diffstat (limited to 'src')
-rw-r--r--src/audio/MusicManager.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/audio/MusicManager.cpp b/src/audio/MusicManager.cpp
index 8f5fb5b8..a099f10d 100644
--- a/src/audio/MusicManager.cpp
+++ b/src/audio/MusicManager.cpp
@@ -561,7 +561,7 @@ cMusicManager::ServiceGameMode()
}
}
#ifdef RADIO_SCROLL_TO_PREV_STATION
- else if(CPad::GetPad(0)->GetMouseWheelDownJustDown() || CPad::GetPad(0)->GetMouseWheelUpJustDown()) {
+ else if(!CPad::GetPad(0)->ArePlayerControlsDisabled() && (CPad::GetPad(0)->GetMouseWheelDownJustDown() || CPad::GetPad(0)->GetMouseWheelUpJustDown())) {
if(!UsesPoliceRadio(vehicle) && !UsesTaxiRadio(vehicle)) {
int scrollNext = ControlsManager.GetControllerKeyAssociatedWithAction(VEHICLE_CHANGE_RADIO_STATION, MOUSE);
int scrollPrev = scrollNext == rsMOUSEWHEELUPBUTTON ? rsMOUSEWHEELDOWNBUTTON