h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-30 07:12:58 +08:00
Code Issues Releases Wiki Activity

Merge branch 'ppy:master' into master

Browse Source
This commit is contained in:
Josh 2022-08-15 17:24:02 +08:00 committed by GitHub
commit c64c9144c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
osu.Game/Overlays/Comments/CommentMarkdownContainer.cs
View File

@ -4,7 +4,6 @@
#nullable disable #nullable disable
using Markdig.Syntax; using Markdig.Syntax;
using Markdig.Syntax.Inlines;
using osu.Framework.Graphics.Containers.Markdown; using osu.Framework.Graphics.Containers.Markdown;
using osu.Game.Graphics.Containers.Markdown; using osu.Game.Graphics.Containers.Markdown;
@ -12,16 +11,8 @@ namespace osu.Game.Overlays.Comments
{ {
public class CommentMarkdownContainer : OsuMarkdownContainer public class CommentMarkdownContainer : OsuMarkdownContainer
{ {
public override MarkdownTextFlowContainer CreateTextFlow() => new CommentMarkdownTextFlowContainer();
protected override MarkdownHeading CreateHeading(HeadingBlock headingBlock) => new CommentMarkdownHeading(headingBlock); protected override MarkdownHeading CreateHeading(HeadingBlock headingBlock) => new CommentMarkdownHeading(headingBlock);
private class CommentMarkdownTextFlowContainer : OsuMarkdownTextFlowContainer
{
// Don't render image in comment for now
protected override void AddImage(LinkInline linkInline) { }
}
private class CommentMarkdownHeading : OsuMarkdownHeading private class CommentMarkdownHeading : OsuMarkdownHeading
{ {
public CommentMarkdownHeading(HeadingBlock headingBlock) public CommentMarkdownHeading(HeadingBlock headingBlock)

3
osu.Game/Screens/Play/HUD/SongProgress.cs
View File

@ -94,6 +94,9 @@ namespace osu.Game.Screens.Play.HUD
double objectOffsetCurrent = currentTime - FirstHitTime; double objectOffsetCurrent = currentTime - FirstHitTime;
double objectDuration = LastHitTime - FirstHitTime; double objectDuration = LastHitTime - FirstHitTime;
if (objectDuration == 0)
UpdateProgress(0, false);
else
UpdateProgress(objectOffsetCurrent / objectDuration, false); UpdateProgress(objectOffsetCurrent / objectDuration, false);
} }
} }