From d7fa0869d716f78560bcfc1617fcd9fbaf2ffea9 Mon Sep 17 00:00:00 2001 From: RandomityGuy <31925790+RandomityGuy@users.noreply.github.com> Date: Sun, 18 Dec 2022 01:51:30 +0530 Subject: [PATCH] finish backport --- src/gui/EndGameGui.hx | 1 - src/gui/GuiButton.hx | 2 +- src/gui/GuiSlider.hx | 2 +- src/gui/MainMenuGui.hx | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/gui/EndGameGui.hx b/src/gui/EndGameGui.hx index aaaddbef..03955d63 100644 --- a/src/gui/EndGameGui.hx +++ b/src/gui/EndGameGui.hx @@ -53,7 +53,6 @@ class EndGameGui extends GuiControl { restartButton.pressedAction = restartFunc; function setButtonStates(enabled:Bool) { - nextLevelBtn.disabled = !enabled; continueButton.disabled = !enabled; restartButton.disabled = !enabled; } diff --git a/src/gui/GuiButton.hx b/src/gui/GuiButton.hx index 8732eb74..7da736f8 100644 --- a/src/gui/GuiButton.hx +++ b/src/gui/GuiButton.hx @@ -71,7 +71,7 @@ class GuiButton extends GuiAnim { } if (!disabled && accelerator != 0 && hxd.Key.isReleased(accelerator)) { if (this.pressedAction != null) { - this.pressedAction(new GuiEvent(this)); + this.pressedAction(this); } } super.update(dt, mouseState); diff --git a/src/gui/GuiSlider.hx b/src/gui/GuiSlider.hx index ffe4d4c9..46580b0d 100644 --- a/src/gui/GuiSlider.hx +++ b/src/gui/GuiSlider.hx @@ -19,7 +19,7 @@ class GuiSlider extends GuiImage { sliderValue = Util.clamp(sliderValue, 0, 1); if (this.pressedAction != null) - this.pressedAction(new GuiEvent(this)); + this.pressedAction(this); if (slidingSound != null) slidingSound.pause = false; diff --git a/src/gui/MainMenuGui.hx b/src/gui/MainMenuGui.hx index 5dc05289..5977bf49 100644 --- a/src/gui/MainMenuGui.hx +++ b/src/gui/MainMenuGui.hx @@ -27,7 +27,7 @@ class MainMenuGui extends GuiImage { versionText.vertSizing = Top; versionText.position = new Vector(289, 457); versionText.extent = new Vector(62, 18); - versionText.text.text = "1.1.3"; + versionText.text.text = "1.1.4"; this.addChild(versionText); var homebase = new GuiImage(ResourceLoader.getResource("data/ui/home/homegui.png", ResourceLoader.getImage, this.imageResources).toTile());