Sunpy/opsu-dance
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Skin options: HitCircleOverlayAboveNumber, LayeredHitSounds.

Browse Source 
Also includes a cursor fix: beatmap-skinned cursors are now always treated like new-style cursors (as in osu!), and no longer render cursormiddle unless also skinned.

Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
This commit is contained in:
Jeffrey Han
2015-05-25 05:33:12 -04:00
parent b804a4d154
commit c1b38b2306
4 changed files with 34 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/itdelatrisu/opsu/audio/SoundController.java
View File

@@ -279,16 +279,20 @@ public class SoundController {
return;
// play all sounds
HitSound.setSampleSet(sampleSet);
playClip(HitSound.NORMAL.getClip(), volume, null);
if (hitSound == HitObject.SOUND_NORMAL || Options.getSkin().isLayeredHitSounds()) {
HitSound.setSampleSet(sampleSet);
playClip(HitSound.NORMAL.getClip(), volume, null);
}
HitSound.setSampleSet(additionSampleSet);
if ((hitSound & HitObject.SOUND_WHISTLE) > 0)
playClip(HitSound.WHISTLE.getClip(), volume, null);
if ((hitSound & HitObject.SOUND_FINISH) > 0)
playClip(HitSound.FINISH.getClip(), volume, null);
if ((hitSound & HitObject.SOUND_CLAP) > 0)
playClip(HitSound.CLAP.getClip(), volume, null);
if (hitSound != HitObject.SOUND_NORMAL) {
HitSound.setSampleSet(additionSampleSet);
if ((hitSound & HitObject.SOUND_WHISTLE) > 0)
playClip(HitSound.WHISTLE.getClip(), volume, null);
if ((hitSound & HitObject.SOUND_FINISH) > 0)
playClip(HitSound.FINISH.getClip(), volume, null);
if ((hitSound & HitObject.SOUND_CLAP) > 0)
playClip(HitSound.CLAP.getClip(), volume, null);
}
}
/**