summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorerorcun <erorcunerorcun@hotmail.com.tr>2021-07-31 22:03:59 +0200
committererorcun <erorcunerorcun@hotmail.com.tr>2021-07-31 22:03:59 +0200
commit0542b1bd4d8a08c39904a43c6104b27594c0a259 (patch)
treebfd7a9a9d38f7897137ddb1397cbcae27ecce78f /src
parentMerge pull request #1251 from Sergeanur/HigherDrawDist (diff)
downloadre3-0542b1bd4d8a08c39904a43c6104b27594c0a259.tar
re3-0542b1bd4d8a08c39904a43c6104b27594c0a259.tar.gz
re3-0542b1bd4d8a08c39904a43c6104b27594c0a259.tar.bz2
re3-0542b1bd4d8a08c39904a43c6104b27594c0a259.tar.lz
re3-0542b1bd4d8a08c39904a43c6104b27594c0a259.tar.xz
re3-0542b1bd4d8a08c39904a43c6104b27594c0a259.tar.zst
re3-0542b1bd4d8a08c39904a43c6104b27594c0a259.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 815e55f2..9872589a 100644
--- a/src/audio/MusicManager.cpp
+++ b/src/audio/MusicManager.cpp
@@ -527,7 +527,7 @@ cMusicManager::ServiceGameMode()
#endif
}
#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())) {
int scrollNext = ControlsManager.GetControllerKeyAssociatedWithAction(VEHICLE_CHANGE_RADIO_STATION, MOUSE);
int scrollPrev = scrollNext == rsMOUSEWHEELUPBUTTON ? rsMOUSEWHEELDOWNBUTTON : scrollNext == rsMOUSEWHEELDOWNBUTTON ? rsMOUSEWHEELUPBUTTON : -1;