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

Addition/Edge Addition SampleSet

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

4
src/itdelatrisu/opsu/states/Game.java
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++;
}

2
src/itdelatrisu/opsu/states/SongMenu.java
View File

@@ -1260,7 +1260,7 @@ public class SongMenu extends BasicGameState {
OsuFile osu = MusicController.getOsuFile();
Display.setTitle(String.format("%s - %s", game.getTitle(), osu.toString()));
OsuParser.parseHitObjects(osu);
HitSound.setSampleSet(osu.sampleSet);
HitSound.setDefaultSampleSet(osu.sampleSet);
((Game) game.getState(Opsu.STATE_GAME)).setRestart(Game.Restart.NEW);
game.enterState(Opsu.STATE_GAME, new FadeOutTransition(Color.black), new FadeInTransition(Color.black));
}