h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-31 06:12:55 +08:00
Code Issues Releases Wiki Activity

Attempt to fix nullref warning.

Browse Source
This commit is contained in:
smoogipooo 2017-03-14 17:14:11 +09:00
parent 2b3b3b7255
commit d6ccc66b23
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
View File

@ -6,7 +6,6 @@ using System.Linq;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Screens.Testing; using osu.Framework.Screens.Testing;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Beatmaps.Formats;
using OpenTK; using OpenTK;
using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Sprites;
using osu.Game.Beatmaps.IO; using osu.Game.Beatmaps.IO;

3
osu.Game.Modes.Osu/Beatmaps/OsuBeatmapProcessor.cs
View File

@ -14,9 +14,6 @@ namespace osu.Game.Modes.Osu.Beatmaps
public void PostProcess(Beatmap<OsuHitObject> beatmap) public void PostProcess(Beatmap<OsuHitObject> beatmap)
{ {
if ((beatmap.ComboColors?.Count ?? 0) == 0)
return;
int comboIndex = 0; int comboIndex = 0;
int colourIndex = 0; int colourIndex = 0;

2
osu.Game/Beatmaps/Beatmap.cs
View File

@ -19,7 +19,7 @@ namespace osu.Game.Beatmaps
{ {
public BeatmapInfo BeatmapInfo; public BeatmapInfo BeatmapInfo;
public List<ControlPoint> ControlPoints; public List<ControlPoint> ControlPoints;
public List<Color4> ComboColors = new List<Color4> public readonly List<Color4> ComboColors = new List<Color4>
{ {
new Color4(17, 136, 170, 255), new Color4(17, 136, 170, 255),
new Color4(102, 136, 0, 255), new Color4(102, 136, 0, 255),

3
osu.Game/Modes/UI/HitRenderer.cs
View File

@ -11,6 +11,7 @@ using osu.Game.Modes.Objects.Drawables;
using osu.Game.Screens.Play; using osu.Game.Screens.Play;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics;
using System.Linq; using System.Linq;
namespace osu.Game.Modes.UI namespace osu.Game.Modes.UI
@ -52,6 +53,8 @@ namespace osu.Game.Modes.UI
protected HitRenderer(WorkingBeatmap beatmap) protected HitRenderer(WorkingBeatmap beatmap)
{ {
Debug.Assert(beatmap != null, "HitRenderer initialized with a null beatmap.");
// Convert + process the beatmap // Convert + process the beatmap
Beatmap = CreateBeatmapConverter().Convert(beatmap.Beatmap); Beatmap = CreateBeatmapConverter().Convert(beatmap.Beatmap);
Beatmap.HitObjects.ForEach(CreateBeatmapProcessor().SetDefaults); Beatmap.HitObjects.ForEach(CreateBeatmapProcessor().SetDefaults);