From bcfe54fa3bcc5225bec15f944df17fe7a3c32b8d Mon Sep 17 00:00:00 2001 From: FajsiEx Date: Fri, 30 Jul 2021 18:40:49 +0200 Subject: [PATCH] / songwheel crash if no jacket is found and if cleared medal is shown --- scripts/songselect/songwheel.lua | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/scripts/songselect/songwheel.lua b/scripts/songselect/songwheel.lua index 4e27d18..8994eb1 100644 --- a/scripts/songselect/songwheel.lua +++ b/scripts/songselect/songwheel.lua @@ -5,6 +5,8 @@ local songPlateBottomBarOverlayImage = gfx.CreateSkinImage("song_select/plate/bo local cursorImage = gfx.CreateSkinImage("song_select/cursor.png", 1) +local defaultJacketImage = gfx.CreateSkinImage("song_select/loading.png", 0) + local difficultyLabelImages = { gfx.CreateSkinImage("song_select/plate/difficulty_labels/novice.png", 1), gfx.CreateSkinImage("song_select/plate/difficulty_labels/advanced.png", 1), @@ -19,7 +21,7 @@ local difficultyLabelImages = { local badgeImages = { gfx.CreateSkinImage("song_select/medal/nomedal.png", 1), gfx.CreateSkinImage("song_select/medal/played.png", 1), - gfx.CreateSkinImage("song_select/medal/cleared.png", 1), + gfx.CreateSkinImage("song_select/medal/clear.png", 1), gfx.CreateSkinImage("song_select/medal/hard.png", 1), gfx.CreateSkinImage("song_select/medal/uc.png", 1), gfx.CreateSkinImage("song_select/medal/puc.png", 1), @@ -97,7 +99,7 @@ function drawSong(song, y) -- Draw jacket local jacketImage = getJacketImage(song); gfx.BeginPath() - gfx.ImageRect(songX+4, y+4, 163, 163, jacketImage, 1, 0) + gfx.ImageRect(songX+4, y+4, 163, 163, jacketImage or defaultJacketImage, 1, 0) -- Draw the overlay for the song plate (that bottom black bar) gfx.BeginPath() @@ -113,10 +115,11 @@ function drawSong(song, y) -- Draw score badge local badgeImage = badgeImages[1]; - if bestScore and bestScore.badge > 0 then + if bestScore then badgeImage = badgeImages[bestScore.badge+1]; end + gfx.BeginPath() gfx.ImageRect(songX+282, y+44, 79, 69, badgeImage, 1, 0) end