thirdpartymirrors/MBHaxe
1
0
Fork 0
mirror of https://github.com/RandomityGuy/MBHaxe.git synced 2025-12-25 09:22:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix slider and js settings

Browse source
This commit is contained in:
RandomityGuy 2021-07-12 12:20:53 +05:30
parent 3cbd1066ad
commit 4cb5587ac5
4 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
marblegame.hl
View file

Binary file not shown.

3
src/MarbleGame.hx
View file

@ -107,7 +107,8 @@ class MarbleGame {
});
canvas.pushDialog(exitGameDlg);
} else {
canvas.popDialog(exitGameDlg);
if (exitGameDlg != null)
canvas.popDialog(exitGameDlg);
world.setCursorLock(true);
}
}

22
src/Settings.hx
View file

@ -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<Dynamic> = [];
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;

1
src/gui/GuiSlider.hx
View file

@ -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;
}
}