Skip to content

Commit 3c6b9a4

Browse files
committed
Don't change day/night music when swimming.
1 parent 91eace7 commit 3c6b9a4

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

OpenTESArena/src/Game/GameState.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -781,7 +781,8 @@ void GameState::tickGameClock(double dt, Game &game)
781781
// Check for changes in exterior music depending on the time.
782782
const MapDefinition &activeMapDef = this->getActiveMapDef();
783783
const MapType activeMapType = activeMapDef.getMapType();
784-
if ((activeMapType == MapType::City) || (activeMapType == MapType::Wilderness))
784+
const Player &player = game.player;
785+
if ((activeMapType != MapType::Interior) && !player.groundState.isSwimming)
785786
{
786787
const Clock &dayMusicStartClock = clockLibrary.getClock(ArenaClockUtils::MusicSwitchToDay);
787788
const Clock &nightMusicStartClock = clockLibrary.getClock(ArenaClockUtils::MusicSwitchToNight);

0 commit comments

Comments
 (0)