From cf3b6f5ac2ed8fb3c54e34de146d379b16043470 Mon Sep 17 00:00:00 2001
From: RandomityGuy <31925790+RandomityGuy@users.noreply.github.com>
Date: Sat, 12 Nov 2022 19:46:54 +0530
Subject: [PATCH] some more bugfixes and speedups

---
 src/CameraController.hx          | 3 ---
 src/Mission.hx                   | 8 ++++++++
 src/MissionList.hx               | 2 +-
 src/collision/CollisionEntity.hx | 2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/CameraController.hx b/src/CameraController.hx
index 0f87b04f..a4e675fa 100644
--- a/src/CameraController.hx
+++ b/src/CameraController.hx
@@ -36,9 +36,6 @@ class CameraController extends Object {
 	var marble:Marble;
 	var level:MarbleWorld;
 
-	var view:Matrix;
-	var projection:Matrix;
-
 	public var Position:Vector;
 	public var Direction:Vector;
 	public var Up:Vector;
diff --git a/src/Mission.hx b/src/Mission.hx
index a77d6ecc..6d8d6d82 100644
--- a/src/Mission.hx
+++ b/src/Mission.hx
@@ -95,6 +95,14 @@ class Mission {
 	}
 
 	public function getDifPath(rawElementPath:String) {
+		if (StringTools.contains(rawElementPath, "$usermods")) {
+			rawElementPath = rawElementPath.split("@").slice(1).map(x -> {
+				var a = StringTools.trim(x);
+				a = Util.unescape(a.substr(1, a.length - 2));
+				return a;
+			}).join('');
+		}
+		var fname = rawElementPath.substring(rawElementPath.lastIndexOf('/') + 1);
 		rawElementPath = rawElementPath.toLowerCase();
 		var path = StringTools.replace(rawElementPath.substring(rawElementPath.indexOf('data/')), "\"", "");
 		if (StringTools.contains(path, 'interiors_mbg/'))
diff --git a/src/MissionList.hx b/src/MissionList.hx
index 96044f55..01d40204 100644
--- a/src/MissionList.hx
+++ b/src/MissionList.hx
@@ -46,7 +46,7 @@ class MissionList {
 		beginnerMissions = parseDifficulty("beginner");
 		intermediateMissions = parseDifficulty("intermediate");
 		advancedMissions = parseDifficulty("advanced");
-		customMissions = parseDifficulty("custom");
+		customMissions = parseDifficulty("expert");
 
 		// parseCLAList();
 
diff --git a/src/collision/CollisionEntity.hx b/src/collision/CollisionEntity.hx
index b6674e70..1fe92fbb 100644
--- a/src/collision/CollisionEntity.hx
+++ b/src/collision/CollisionEntity.hx
@@ -61,7 +61,7 @@ class CollisionEntity implements IOctreeObject {
 	}
 
 	public function setTransform(transform:Matrix) {
-		if (this.transform == transform)
+		if (this.transform.equal(transform))
 			return;
 		this.transform.load(transform);
 		this.invTransform = transform.getInverse();