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

Make HitObjectType more accessible.

Browse Source 
# Conflicts:
#	osu.Game.Modes.Osu/Objects/OsuHitObjectParser.cs
This commit is contained in:
Dean Herbert
2017-02-14 09:40:26 +09:00
parent 9f96a511a7
commit 9a5ac64332
2 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
osu.Game.Modes.Osu/Objects/OsuHitObject.cs
View File

@ -31,19 +31,19 @@ namespace osu.Game.Modes.Osu.Objects
Scale = (1.0f - 0.7f * (beatmap.BeatmapInfo.BaseDifficulty.CircleSize - 5) / 5) / 2; Scale = (1.0f - 0.7f * (beatmap.BeatmapInfo.BaseDifficulty.CircleSize - 5) / 5) / 2;
} }
}
[Flags] [Flags]
internal enum HitObjectType public enum HitObjectType
{ {
Circle = 1, Circle = 1,
Slider = 2, Slider = 2,
NewCombo = 4, NewCombo = 4,
CircleNewCombo = 5, CircleNewCombo = 5,
SliderNewCombo = 6, SliderNewCombo = 6,
Spinner = 8, Spinner = 8,
ColourHax = 122, ColourHax = 122,
Hold = 128, Hold = 128,
ManiaLong = 128, ManiaLong = 128,
}
} }
} }

14
osu.Game.Modes.Osu/Objects/OsuHitObjectParser.cs
View File

@ -18,17 +18,17 @@ namespace osu.Game.Modes.Osu.Objects
public override HitObject Parse(string text) public override HitObject Parse(string text)
{ {
string[] split = text.Split(','); string[] split = text.Split(',');
var type = (OsuHitObject.HitObjectType)int.Parse(split[3]); var type = (HitObjectType)int.Parse(split[3]);
bool combo = type.HasFlag(OsuHitObject.HitObjectType.NewCombo); bool combo = type.HasFlag(HitObjectType.NewCombo);
type &= (OsuHitObject.HitObjectType)0xF; type &= (HitObjectType)0xF;
type &= ~OsuHitObject.HitObjectType.NewCombo; type &= ~HitObjectType.NewCombo;
OsuHitObject result; OsuHitObject result;
switch (type) switch (type)
{ {
case OsuHitObject.HitObjectType.Circle: case HitObjectType.Circle:
result = new HitCircle(); result = new HitCircle();
break; break;
case OsuHitObject.HitObjectType.Slider: case HitObjectType.Slider:
Slider s = new Slider(); Slider s = new Slider();
CurveTypes curveType = CurveTypes.Catmull; CurveTypes curveType = CurveTypes.Catmull;
@ -92,7 +92,7 @@ namespace osu.Game.Modes.Osu.Objects
result = s; result = s;
break; break;
case OsuHitObject.HitObjectType.Spinner: case HitObjectType.Spinner:
result = new Spinner(); result = new Spinner();
break; break;
default: default: