From 0e56a7336b9231745258a9defb11c4ab7eebcdfc Mon Sep 17 00:00:00 2001
From: AirDog46 <vladcioata2004@gmail.com>
Date: Sun, 18 May 2025 12:55:53 +0300
Subject: [PATCH] Changed memory calculation and fixed gc not being reenabled
 after death

---
 source/GameOverState.hx    |  4 ----
 source/GameOverSubstate.hx |  5 +++++
 source/KadeEngineData.hx   |  3 ++-
 source/Memory.hx           | 14 +++++++++-----
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/source/GameOverState.hx b/source/GameOverState.hx
index f73fe7a..373fc5c 100644
--- a/source/GameOverState.hx
+++ b/source/GameOverState.hx
@@ -23,10 +23,6 @@ class GameOverState extends FlxTransitionableState
 
 	override function create()
 	{
-		if (!FlxG.save.data.GC) {
-			Gc.enable(true);
-			trace("Player died. We can reenable the garbage collector");
-		}
 		var loser:FlxSprite = new FlxSprite(100, 100);
 		var loseTex = Paths.getSparrowAtlas('lose');
 		loser.frames = loseTex;
diff --git a/source/GameOverSubstate.hx b/source/GameOverSubstate.hx
index 182ce8c..5f66fa4 100644
--- a/source/GameOverSubstate.hx
+++ b/source/GameOverSubstate.hx
@@ -1,5 +1,6 @@
 package;
 
+import cpp.vm.Gc;
 import flixel.FlxG;
 import flixel.FlxObject;
 import flixel.FlxSubState;
@@ -16,6 +17,10 @@ class GameOverSubstate extends MusicBeatSubstate
 
 	public function new(x:Float, y:Float)
 	{
+		if (!FlxG.save.data.GC) {
+			Gc.enable(true);
+			trace("Player died. We can reenable the garbage collector");
+		}
 		var daStage = PlayState.curStage;
 		var daBf:String = '';
 		switch (PlayState.SONG.player1)
diff --git a/source/KadeEngineData.hx b/source/KadeEngineData.hx
index e11e04e..aafc103 100644
--- a/source/KadeEngineData.hx
+++ b/source/KadeEngineData.hx
@@ -50,7 +50,8 @@ class KadeEngineData
 			FlxG.save.data.fpsCap = 120;*/
 
 		if (FlxG.save.data.fpsCap > 1000 || FlxG.save.data.fpsCap < 60)
-			FlxG.save.data.fpsCap = 120; // baby proof so you can't hard lock ur copy of kade engine
+			//FlxG.save.data.fpsCap = 120; // baby proof so you can't hard lock ur copy of kade engine
+			trace("nerd");
 		
 		if (FlxG.save.data.scrollSpeed == null)
 			FlxG.save.data.scrollSpeed = 1;
diff --git a/source/Memory.hx b/source/Memory.hx
index f7c7ed5..cab6a52 100644
--- a/source/Memory.hx
+++ b/source/Memory.hx
@@ -8,8 +8,8 @@ import openfl.text.TextField;
 import openfl.Lib;
 
 class Memory extends TextField {
-    private var overCounter = 0;
-    private var isOver = false;
+    //private var overCounter = 0;
+    //private var isOver = false;
 
 	@:noCompletion private var cacheCount:Int;
 	@:noCompletion private var currentTime:Float;
@@ -20,13 +20,14 @@ class Memory extends TextField {
 
         this.x = x;
         this.y = y;
+        this.width = 150;
 
         defaultTextFormat = new TextFormat("_sans", 12, color);
         text = "Memory: ";
 
 		addEventListener(Event.ENTER_FRAME, function(e)
 		{
-			var usedMemory:Float = Gc.memUsage();
+			/*var usedMemory:Float = Gc.memUsage();
             if (Gc.memUsage() < 0 && !isOver)
             {
                 isOver = true;
@@ -38,8 +39,11 @@ class Memory extends TextField {
             }
             if (isOver) {
                 usedMemory = 2147483647+(2147483647-(Math.abs(Gc.memUsage()))); // funny math to represent values over 2GB
-            }
-            text = "Memory: " + FlxStringUtil.formatBytes(usedMemory + 4294967296*overCounter);
+            }*/
+            text = "Memory: " + FlxStringUtil.formatBytes(/*usedMemory + 4294967296*overCounter*/ Gc.memInfo64(0));
+            /*for (i in 0...4) {
+                text += "\nMemory info " + i + ": " + FlxStringUtil.formatBytes(Gc.memInfo64(i));
+            }*/
 		});
     }
 }
\ No newline at end of file