RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix some code quality

This commit is contained in:
jorolf 2019-07-29 11:49:59 +02:00
parent f4effd12c3
commit 0635680db5
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
osu.Game/Skinning/LegacySkin.cs
View File

@ -54,28 +54,33 @@ protected override void Dispose(bool isDisposing)
public override Drawable GetDrawableComponent(string componentName)
{
bool animatable = false;
(bool looping, double frametime) animationData = (false, 1000 / 60d);
bool looping = true;
const double frametime = 1000 / 60d;
switch (componentName)
{
case "Play/Miss":
componentName = "hit0";
animatable = true;
looping = false;
break;
case "Play/Meh":
componentName = "hit50";
animatable = true;
looping = false;
break;
case "Play/Good":
componentName = "hit100";
animatable = true;
looping = false;
break;
case "Play/Great":
componentName = "hit300";
animatable = true;
looping = false;
break;
case "Play/osu/number-text":
@ -93,7 +98,7 @@ public override Drawable GetDrawableComponent(string componentName)
if (texture != null && animatable)
{
var animation = new TextureAnimation { DefaultFrameLength = animationData.frametime };
var animation = new TextureAnimation { DefaultFrameLength = frametime };
for (int i = 1; texture != null; i++)
{
@ -101,7 +106,9 @@ public override Drawable GetDrawableComponent(string componentName)
texture = GetTexture($"{componentName}-{i}");
}
animation.Repeat = animationData.looping;
// This comment can be removed once we have components which are looping
// ReSharper disable once ConditionIsAlwaysTrueOrFalse
animation.Repeat = looping;
return animation;
}
@ -109,10 +116,7 @@ public override Drawable GetDrawableComponent(string componentName)
{
texture = GetTexture(componentName);
if (texture == null)
return null;
return new Sprite { Texture = texture };
return texture == null ? null : new Sprite { Texture = texture };
}
}