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

Merge pull request #293 from peppy/general-fixes

Browse Source 
Fix some nullrefs when running visualtests with no maps loaded.
This commit is contained in:
Dean Herbert
2017-01-27 16:12:46 +09:00
committed by GitHub
parent 335420ec30 d4e30f65db
commit 8987a09741
7 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
View File

@ -43,8 +43,8 @@ namespace osu.Game.Modes.Objects.Drawables
state = value;
UpdateState(state);
Expire();
if (IsLoaded)
Expire();
if (State == ArmedState.Hit)
PlaySample();
@ -56,8 +56,8 @@ namespace osu.Game.Modes.Objects.Drawables
[BackgroundDependencyLoader]
private void load(AudioManager audio)
{
string hitType = (HitObject.Sample.Type == SampleType.None ? SampleType.Normal : HitObject.Sample.Type).ToString().ToLower();
string sampleSet = HitObject.Sample.Set.ToString().ToLower();
string hitType = ((HitObject.Sample?.Type ?? SampleType.None) == SampleType.None ? SampleType.Normal : HitObject.Sample.Type).ToString().ToLower();
string sampleSet = (HitObject.Sample?.Set ?? SampleSet.Normal).ToString().ToLower();
sample = audio.Sample.Get($@"Gameplay/{sampleSet}-hit{hitType}");
}