use clamped x for juicestream but keep original (/b/17294)
This commit is contained in:
@@ -99,12 +99,10 @@ fn convert_object<'a>(
|
|||||||
attrs: &mut CatchDifficultyAttributesBuilder,
|
attrs: &mut CatchDifficultyAttributesBuilder,
|
||||||
bufs: &'a mut JuiceStreamBufs,
|
bufs: &'a mut JuiceStreamBufs,
|
||||||
) -> ObjectIter<'a> {
|
) -> ObjectIter<'a> {
|
||||||
let mut x = h.pos.x;
|
|
||||||
|
|
||||||
let state = match h.kind {
|
let state = match h.kind {
|
||||||
HitObjectKind::Circle => ObjectIterState::Fruit(Some(Fruit::new(attrs))),
|
HitObjectKind::Circle => ObjectIterState::Fruit(Some(Fruit::new(attrs))),
|
||||||
HitObjectKind::Slider(ref slider) => {
|
HitObjectKind::Slider(ref slider) => {
|
||||||
x = JuiceStream::clamp_to_playfield(x);
|
let x = JuiceStream::clamp_to_playfield(h.pos.x);
|
||||||
let stream = JuiceStream::new(x, h.start_time, slider, converted, attrs, bufs);
|
let stream = JuiceStream::new(x, h.start_time, slider, converted, attrs, bufs);
|
||||||
|
|
||||||
ObjectIterState::JuiceStream(stream)
|
ObjectIterState::JuiceStream(stream)
|
||||||
@@ -116,7 +114,7 @@ fn convert_object<'a>(
|
|||||||
};
|
};
|
||||||
|
|
||||||
ObjectIter {
|
ObjectIter {
|
||||||
x,
|
x: h.pos.x,
|
||||||
start_time: h.start_time,
|
start_time: h.start_time,
|
||||||
state,
|
state,
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user