From 4cb5587ac5f46aa685e99022b9bf4e21e9a5772f Mon Sep 17 00:00:00 2001 From: RandomityGuy <31925790+RandomityGuy@users.noreply.github.com> Date: Mon, 12 Jul 2021 12:20:53 +0530 Subject: [PATCH] fix slider and js settings --- marblegame.hl | Bin 1787662 -> 1787988 bytes src/MarbleGame.hx | 3 ++- src/Settings.hx | 22 ++++++++++++++++++++-- src/gui/GuiSlider.hx | 1 + 4 files changed, 23 insertions(+), 3 deletions(-) diff --git a/marblegame.hl b/marblegame.hl index 9252b318ed95edc7c02d0be3f4f96b0211995934..686f26dd553209710a07d0f288e62c5b8ac1ca82 100644 GIT binary patch delta 14572 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 diff --git a/src/MarbleGame.hx b/src/MarbleGame.hx index 78ac4f8e..3dd13643 100644 --- a/src/MarbleGame.hx +++ b/src/MarbleGame.hx @@ -107,7 +107,8 @@ class MarbleGame { }); canvas.pushDialog(exitGameDlg); } else { - canvas.popDialog(exitGameDlg); + if (exitGameDlg != null) + canvas.popDialog(exitGameDlg); world.setCursorLock(true); } } diff --git a/src/Settings.hx b/src/Settings.hx index 0e246bf3..302c1d7c 100644 --- a/src/Settings.hx +++ b/src/Settings.hx @@ -112,13 +112,29 @@ class Settings { } public static function save() { - var outputData = { - highScores: highScores, + var outputData:Dynamic = { options: optionsSettings, controls: controlsSettings, progression: progression, highscoreName: highscoreName }; + var scoreCount = 0; + for (key => value in highScores) { + scoreCount++; + } + #if hl + if (scoreCount != 0) + outputData.highScores = highScores; + else + outputData.highScores = {}; + #end + #if js + var kvps:Array = []; + for (key => value in highScores) + kvps.push([key, value]); + var jobj = js.lib.Object.fromEntries(kvps); + outputData.highScores = jobj; + #end var json = Json.stringify(outputData); #if hl File.saveContent("settings.json", json); @@ -158,6 +174,8 @@ class Settings { controlsSettings = json.controls; progression = json.progression; highscoreName = json.highscoreName; + } else { + save(); } #if hl Window.getInstance().vsync = optionsSettings.vsync; diff --git a/src/gui/GuiSlider.hx b/src/gui/GuiSlider.hx index 456be3a9..02e28c55 100644 --- a/src/gui/GuiSlider.hx +++ b/src/gui/GuiSlider.hx @@ -25,6 +25,7 @@ class GuiSlider extends GuiImage { slidingSound.pause = true; super.update(dt, mouseState); this.bmp.x = renderRect.position.x + renderRect.extent.x * sliderValue; + this.bmp.x = Util.clamp(this.bmp.x, renderRect.position.x, renderRect.position.x + renderRect.extent.x - bmp.width / 2); this.bmp.width = this.bmp.tile.width; } }