From bdfa361d2d2fc64d11e254e4337123aad9757a57 Mon Sep 17 00:00:00 2001
From: RandomityGuy <31925790+RandomityGuy@users.noreply.github.com>
Date: Mon, 6 Apr 2026 12:22:45 +0100
Subject: [PATCH] some fixes
---
src/Mission.hx | 21 +++++++++++++++++++++
src/gui/HelpCreditsGui.hx | 12 ++++++------
src/gui/PlayMissionGui.hx | 1 -
src/touch/CameraInput.hx | 3 +--
4 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/src/Mission.hx b/src/Mission.hx
index 210d25cd..10e78a88 100644
--- a/src/Mission.hx
+++ b/src/Mission.hx
@@ -204,6 +204,27 @@ class Mission {
}
}
+ public function getPreviewImageSync() {
+ if (!this.isClaMission) {
+ var basename = haxe.io.Path.withoutExtension(this.path);
+ if (ResourceLoader.fileSystem.exists(basename + ".png")) {
+ var ret = ResourceLoader.getResource(basename + ".png", ResourceLoader.getImage, this.imageResources).toTile();
+ return ret;
+ }
+ if (ResourceLoader.fileSystem.exists(basename + ".jpg")) {
+ var ret = ResourceLoader.getResource(basename + ".jpg", ResourceLoader.getImage, this.imageResources).toTile();
+ return ret;
+ }
+ var img = new BitmapData(1, 1);
+ img.setPixel(0, 0, 0);
+ return Tile.fromBitmap(img);
+ } else {
+ var img = new BitmapData(1, 1);
+ img.setPixel(0, 0, 0);
+ return Tile.fromBitmap(img);
+ }
+ }
+
public function getDifPath(rawElementPath:String) {
if (StringTools.contains(rawElementPath, "$usermods")) {
rawElementPath = rawElementPath.split("@").slice(1).map(x -> {
diff --git a/src/gui/HelpCreditsGui.hx b/src/gui/HelpCreditsGui.hx
index 7ff107e5..13c9bf61 100644
--- a/src/gui/HelpCreditsGui.hx
+++ b/src/gui/HelpCreditsGui.hx
@@ -237,7 +237,7 @@ class HelpCreditsGui extends GuiImage {
gem1Ctrl.render(MarbleGame.canvas.scene2d);
gem2Ctrl.render(MarbleGame.canvas.scene2d);
gem3Ctrl.render(MarbleGame.canvas.scene2d);
- hcText2.render(MarbleGame.canvas.scene2d, @:privateAccess hcText2.parent._flow);
+ hcText2.render(MarbleGame.canvas.scene2d);
superJumpCtrl.render(MarbleGame.canvas.scene2d);
superSpeedCtrl.render(MarbleGame.canvas.scene2d);
shockAbsorberCtrl.render(MarbleGame.canvas.scene2d);
@@ -265,7 +265,7 @@ class HelpCreditsGui extends GuiImage {
gem1Ctrl.render(MarbleGame.canvas.scene2d);
gem2Ctrl.render(MarbleGame.canvas.scene2d);
gem3Ctrl.render(MarbleGame.canvas.scene2d);
- hcText2.render(MarbleGame.canvas.scene2d, @:privateAccess hcText2.parent._flow);
+ hcText2.render(MarbleGame.canvas.scene2d);
superJumpCtrl.render(MarbleGame.canvas.scene2d);
superSpeedCtrl.render(MarbleGame.canvas.scene2d);
shockAbsorberCtrl.render(MarbleGame.canvas.scene2d);
@@ -289,7 +289,7 @@ class HelpCreditsGui extends GuiImage {
hcText2.position = new Vector(110, 35);
hcText2.extent = new Vector(418, 274);
hcText2.text.text = "
Gyrocopter PowerUp - slows your fall in the air.
Time Travel - takes some time off the clock.
Gravity Modifier - Changes the direction of \"down\" - the new down is in the direction of the arrow.";
- hcText2.render(MarbleGame.canvas.scene2d, @:privateAccess hcText2.parent._flow);
+ hcText2.render(MarbleGame.canvas.scene2d);
superJumpCtrl.render(MarbleGame.canvas.scene2d);
superSpeedCtrl.render(MarbleGame.canvas.scene2d);
shockAbsorberCtrl.render(MarbleGame.canvas.scene2d);
@@ -315,7 +315,7 @@ class HelpCreditsGui extends GuiImage {
hcText2.position = new Vector(110, 38);
hcText2.extent = new Vector(418, 274);
hcText2.text.text = "
Duct Fan - be careful this doesn't blow you away!
Tornado - it'll pull you in and spit you out.
Trap Door - keep moving when you're rolling over one of these.";
- hcText2.render(MarbleGame.canvas.scene2d, @:privateAccess hcText2.parent._flow);
+ hcText2.render(MarbleGame.canvas.scene2d);
helicopterCtrl.render(MarbleGame.canvas.scene2d);
timeTravelCtrl.render(MarbleGame.canvas.scene2d);
antiGravityCtrl.render(MarbleGame.canvas.scene2d);
@@ -337,7 +337,7 @@ class HelpCreditsGui extends GuiImage {
hcText2.position = new Vector(110, 30);
hcText2.extent = new Vector(418, 274);
hcText2.text.text = "
Bumper - this'll bounce you if you touch it.
Land Mine - Warning! Explodes on contact!
Oil Slick - you won't have much traction on these surfaces";
- hcText2.render(MarbleGame.canvas.scene2d, @:privateAccess hcText2.parent._flow);
+ hcText2.render(MarbleGame.canvas.scene2d);
ductFanCtrl.render(MarbleGame.canvas.scene2d);
tornadoCtrl.render(MarbleGame.canvas.scene2d);
trapdoorCtrl.render(MarbleGame.canvas.scene2d);
@@ -370,7 +370,7 @@ class HelpCreditsGui extends GuiImage {
hcText2.extent = new Vector(155, 274);
hcText2.text.text = '
'
+ "Mark Frohnmayer
Brian Hahn
Tim Gift
Kevin Ryan
Jay Moore
John Quigley";
- hcText2.render(MarbleGame.canvas.scene2d, @:privateAccess hcText2.parent._flow);
+ hcText2.render(MarbleGame.canvas.scene2d);
}
if (page == 11) {
hcText2.text.text = "";
diff --git a/src/gui/PlayMissionGui.hx b/src/gui/PlayMissionGui.hx
index 4ed803c0..a51f57e9 100644
--- a/src/gui/PlayMissionGui.hx
+++ b/src/gui/PlayMissionGui.hx
@@ -603,7 +603,6 @@ class PlayMissionGui extends GuiImage {
#end
}
this.addChild(kofi);
- #end
}
public override function render(scene2d:Scene) {
diff --git a/src/touch/CameraInput.hx b/src/touch/CameraInput.hx
index 5d662376..71195f52 100644
--- a/src/touch/CameraInput.hx
+++ b/src/touch/CameraInput.hx
@@ -83,8 +83,7 @@ class CameraInput {
scaleFactor = js.Browser.window.devicePixelRatio / Settings.zoomRatio;
#end
var jumpcam = MarbleGame.instance.touchInput.jumpButton.pressed
- || MarbleGame.instance.touchInput.powerupButton.pressed
- || MarbleGame.instance.touchInput.blastbutton.pressed;
+ || MarbleGame.instance.touchInput.powerupButton.pressed;
if (jumpcam) {
scaleFactor /= Settings.touchSettings.buttonJoystickMultiplier;
}