Addition/Edge Addition SampleSet

Minor fix with combo colors and spinners
This commit is contained in:
fd
2015-03-01 11:06:46 -05:00
parent 955a184d2c
commit 04bfbc70fc
10 changed files with 138 additions and 50 deletions

View File

@@ -449,7 +449,7 @@ public class Game extends BasicGameState {
beatLengthBase = beatLength = timingPoint.getBeatLength();
else
beatLength = beatLengthBase * timingPoint.getSliderMultiplier();
HitSound.setSampleSet(timingPoint.getSampleType());
HitSound.setDefaultSampleSet(timingPoint.getSampleType());
SoundController.setSampleVolume(timingPoint.getSampleVolume());
timingPointIndex++;
}
@@ -728,7 +728,7 @@ public class Game extends BasicGameState {
OsuTimingPoint timingPoint = osu.timingPoints.get(0);
if (!timingPoint.isInherited()) {
beatLengthBase = beatLength = timingPoint.getBeatLength();
HitSound.setSampleSet(timingPoint.getSampleType());
HitSound.setDefaultSampleSet(timingPoint.getSampleType());
SoundController.setSampleVolume(timingPoint.getSampleVolume());
timingPointIndex++;
}