Merge remote-tracking branch 'origin/master'

exch-bms2 · Oct 4, 2018 · 7d3f628 · 7d3f628
2 parents 0d290ca + eafb1dc
commit 7d3f628
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/bms/player/beatoraja/play/LaneRenderer.java b/src/bms/player/beatoraja/play/LaneRenderer.java
@@ -114,13 +114,15 @@ public void init(BMSModel model) {
 		this.model = model;
 		List<TimeLine> tls = new ArrayList<TimeLine>();
 		double cbpm = model.getBpm();
+		double cscr = 1.0;
 		for (TimeLine tl : model.getAllTimeLines()) {
-			if (cbpm != tl.getBPM() || tl.getStop() > 0 || tl.getSectionLine()) {
+			if (cbpm != tl.getBPM() || tl.getStop() > 0 || cscr != tl.getScroll() || tl.getSectionLine()) {
 				tls.add(tl);
 			} else if (tl.existNote() || tl.existHiddenNote()) {
 				tls.add(tl);
 			}
 			cbpm = tl.getBPM();
+			cscr = tl.getScroll();
 		}
 		this.timelines = tls.toArray(new TimeLine[tls.size()]);
 		// Logger.getGlobal().info("省略したTimeLine数:" +