sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 08:20:00 +09:00
Code Issues Packages Projects Releases Wiki Activity

Implement combo offsets

Browse Source
This commit is contained in:
smoogipoo
2018-08-15 11:47:31 +09:00
parent da3e2cfee2
commit 31f324945e
13 changed files with 38 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
View File

@ -22,12 +22,12 @@ namespace osu.Game.Rulesets.Objects.Legacy
/// <summary>
/// The offset to apply to all time values.
/// </summary>
public double Offset;
protected readonly double Offset;
/// <summary>
/// The beatmap version.
/// </summary>
public int FormatVersion;
protected readonly int FormatVersion;
protected ConvertHitObjectParser(double offset, int formatVersion)
{
@ -43,11 +43,12 @@ namespace osu.Game.Rulesets.Objects.Legacy
Vector2 pos = new Vector2((int)Convert.ToSingle(split[0], CultureInfo.InvariantCulture), (int)Convert.ToSingle(split[1], CultureInfo.InvariantCulture));
ConvertHitObjectType type = (ConvertHitObjectType)int.Parse(split[3]) & ~ConvertHitObjectType.ComboOffset;
ConvertHitObjectType type = (ConvertHitObjectType)int.Parse(split[3]);
int comboOffset = (int)(type & ConvertHitObjectType.ComboOffset) >> 4;
type &= ~ConvertHitObjectType.ComboOffset;
bool combo = type.HasFlag(ConvertHitObjectType.NewCombo);
int comboOffset = (int)(type & ConvertHitObjectType.ComboOffset) >> 4;
type &= ~ConvertHitObjectType.NewCombo;
var soundType = (LegacySoundType)int.Parse(split[4]);