From 203d66ccfe6f28fe8df3e6e046c0878542017d23 Mon Sep 17 00:00:00 2001
From: RandomityGuy <31925790+RandomityGuy@users.noreply.github.com>
Date: Fri, 23 Dec 2022 22:11:08 +0530
Subject: [PATCH] attempt fix clipping and fix onscreen text

---
 src/MarbleWorld.hx         | 10 ++++------
 src/gui/GuiTextListCtrl.hx |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/MarbleWorld.hx b/src/MarbleWorld.hx
index 71252fd6..18e0a338 100644
--- a/src/MarbleWorld.hx
+++ b/src/MarbleWorld.hx
@@ -415,8 +415,6 @@ class MarbleWorld extends Scheduler {
 		this.blastAmount = 0;
 		this.outOfBoundsTime = null;
 		this.finishTime = null;
-		this.helpTextTimeState = Math.NEGATIVE_INFINITY;
-		this.alertTextTimeState = Math.NEGATIVE_INFINITY;
 		if (this.alarmSound != null) {
 			this.alarmSound.stop();
 			this.alarmSound = null;
@@ -1385,15 +1383,15 @@ class MarbleWorld extends Scheduler {
 	function updateTexts() {
 		var helpTextTime = this.helpTextTimeState;
 		var alertTextTime = this.alertTextTimeState;
-		var helpTextCompletion = Math.pow(Util.clamp((this.timeState.currentAttemptTime - helpTextTime - 3), 0, 1), 2);
-		var alertTextCompletion = Math.pow(Util.clamp((this.timeState.currentAttemptTime - alertTextTime - 3), 0, 1), 2);
+		var helpTextCompletion = Math.pow(Util.clamp((this.timeState.timeSinceLoad - helpTextTime - 3), 0, 1), 2);
+		var alertTextCompletion = Math.pow(Util.clamp((this.timeState.timeSinceLoad - alertTextTime - 3), 0, 1), 2);
 		this.playGui.setHelpTextOpacity(1 - helpTextCompletion);
 		this.playGui.setAlertTextOpacity(1 - alertTextCompletion);
 	}
 
 	public function displayAlert(text:String) {
 		this.playGui.setAlertText(text);
-		this.alertTextTimeState = this.timeState.currentAttemptTime;
+		this.alertTextTimeState = this.timeState.timeSinceLoad;
 	}
 
 	public function displayHelp(text:String) {
@@ -1437,7 +1435,7 @@ class MarbleWorld extends Scheduler {
 			pos = text.indexOf("<func:", start);
 		}
 		this.playGui.setHelpText(text);
-		this.helpTextTimeState = this.timeState.currentAttemptTime;
+		this.helpTextTimeState = this.timeState.timeSinceLoad;
 	}
 
 	public function pickUpGem(gem:Gem) {
diff --git a/src/gui/GuiTextListCtrl.hx b/src/gui/GuiTextListCtrl.hx
index 6b86fc4d..adad28ca 100644
--- a/src/gui/GuiTextListCtrl.hx
+++ b/src/gui/GuiTextListCtrl.hx
@@ -102,7 +102,7 @@ class GuiTextListCtrl extends GuiControl {
 			this.flow.maxHeight = cast htr.extent.y;
 			this.flow.multiline = true;
 			this.flow.layout = Stack;
-			this.flow.overflow = FlowOverflow.Limit;
+			this.flow.overflow = FlowOverflow.Hidden;
 			if (scene2d.contains(this.flow))
 				scene2d.removeChild(this.flow);