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

CI fixes.

Browse Source
This commit is contained in:
smoogipooo 2017-04-21 19:51:23 +09:00
parent 6c8bd4dfe4
commit 382e656e9f
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
osu.Game/Rulesets/Objects/CurvedHitObject.cs
View File

@ -5,7 +5,6 @@ using OpenTK;
using osu.Game.Rulesets.Objects.Types; using osu.Game.Rulesets.Objects.Types;
using System.Collections.Generic; using System.Collections.Generic;
using osu.Game.Audio; using osu.Game.Audio;
using System;
namespace osu.Game.Rulesets.Objects namespace osu.Game.Rulesets.Objects
{ {

21
osu.Game/Rulesets/Objects/Legacy/HitObjectParser.cs
View File

@ -226,14 +226,15 @@ namespace osu.Game.Rulesets.Objects.Legacy
private List<SampleInfo> convertSoundType(LegacySoundType type, SampleBankInfo bankInfo) private List<SampleInfo> convertSoundType(LegacySoundType type, SampleBankInfo bankInfo)
{ {
var soundTypes = new List<SampleInfo>(); var soundTypes = new List<SampleInfo>
soundTypes.Add(new SampleInfo
{ {
Bank = bankInfo.Normal, new SampleInfo
Name = SampleInfo.HIT_NORMAL, {
Volume = bankInfo.Volume Bank = bankInfo.Normal,
}); Name = SampleInfo.HIT_NORMAL,
Volume = bankInfo.Volume
}
};
if ((type & LegacySoundType.Finish) > 0) if ((type & LegacySoundType.Finish) > 0)
{ {
@ -270,9 +271,9 @@ namespace osu.Game.Rulesets.Objects.Legacy
private class SampleBankInfo private class SampleBankInfo
{ {
public string Normal = null; public string Normal;
public string Add = null; public string Add;
public int Volume = 0; public int Volume;
public SampleBankInfo Clone() public SampleBankInfo Clone()
{ {