diff options
author | Nikolay Korolev <nickvnuk@gmail.com> | 2021-08-01 11:54:20 +0200 |
---|---|---|
committer | Nikolay Korolev <nickvnuk@gmail.com> | 2021-08-01 11:54:20 +0200 |
commit | 1479093d338a06fe84603ce04a989863cddac486 (patch) | |
tree | dac491860d0da766aa179b8d0bf82f7051ec4816 /src/audio/MusicManager.cpp | |
parent | mission replay (diff) | |
parent | Fix radio scroll when player controls disabled (diff) | |
download | re3-1479093d338a06fe84603ce04a989863cddac486.tar re3-1479093d338a06fe84603ce04a989863cddac486.tar.gz re3-1479093d338a06fe84603ce04a989863cddac486.tar.bz2 re3-1479093d338a06fe84603ce04a989863cddac486.tar.lz re3-1479093d338a06fe84603ce04a989863cddac486.tar.xz re3-1479093d338a06fe84603ce04a989863cddac486.tar.zst re3-1479093d338a06fe84603ce04a989863cddac486.zip |
Diffstat (limited to 'src/audio/MusicManager.cpp')
-rw-r--r-- | src/audio/MusicManager.cpp | 2 |
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 |