diff options
author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2021-02-27 12:18:22 -0500 |
---|---|---|
committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2021-02-27 12:18:22 -0500 |
commit | 4be70b7d55493cdc2d5e909d5101e70a16bee6f1 (patch) | |
tree | 18c4fcd55da55a7445fc7827c35ce5b7760ba44a /res/scripts | |
parent | 3c793733b6350451fb3000a8a5e41aa5cfe98bfb (diff) | |
download | tanetane-4be70b7d55493cdc2d5e909d5101e70a16bee6f1.tar.gz tanetane-4be70b7d55493cdc2d5e909d5101e70a16bee6f1.tar.bz2 tanetane-4be70b7d55493cdc2d5e909d5101e70a16bee6f1.zip |
Added underwater music and fixed music not changing bug
Diffstat (limited to 'res/scripts')
-rw-r--r-- | res/scripts/common.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/res/scripts/common.lua b/res/scripts/common.lua index a5e7873..23b881a 100644 --- a/res/scripts/common.lua +++ b/res/scripts/common.lua | |||
@@ -264,7 +264,7 @@ function ChangeMap(map, warp, options) | |||
264 | 264 | ||
265 | if (mixer():isPlayingMusic() and not getMap():hasMusic()) then | 265 | if (mixer():isPlayingMusic() and not getMap():hasMusic()) then |
266 | mixer():fadeoutMusic(150) | 266 | mixer():fadeoutMusic(150) |
267 | elseif (getMap():hasMusic() and (not mixer():isPlayingMusic() or not mixer():getPlayingTrack() == getMap():getMusic())) then | 267 | elseif (getMap():hasMusic() and (not mixer():isPlayingMusic() or not (mixer():getPlayingTrack() == getMap():getMusic()))) then |
268 | mixer():playMusic(getMap():getMusic(), 150) | 268 | mixer():playMusic(getMap():getMusic(), 150) |
269 | end | 269 | end |
270 | 270 | ||