From ee9c802cd1af791d4482cc1944c280be08fc918e Mon Sep 17 00:00:00 2001
From: Dethrace Labs <78985374+dethrace-labs@users.noreply.github.com>
Date: Wed, 10 Sep 2025 12:13:02 +1200
Subject: [PATCH] FindNonCarsCB 92% matching

---
 src/DETHRACE/common/brucetrk.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/DETHRACE/common/brucetrk.c b/src/DETHRACE/common/brucetrk.c
index 444a6159..167ec9b6 100644
--- a/src/DETHRACE/common/brucetrk.c
+++ b/src/DETHRACE/common/brucetrk.c
@@ -168,18 +168,22 @@ br_uintptr_t FindNonCarsCB(br_actor* pActor, tTrack_spec* pTrack_spec) {
     br_scalar r3;
 
     if (pActor->identifier != NULL && pActor->identifier[0] == '&' && pActor->identifier[1] >= '0' && pActor->identifier[1] <= '9') {
-        i = (pActor->identifier[4] - '0') * 1000 + (pActor->identifier[5] - '0') * 100 + (pActor->identifier[6] - '0') * 10 + (pActor->identifier[7] - '0');
+
+        i = ((pActor->identifier[5] - '0') * 100)
+            + ((pActor->identifier[6] - '0') * 10)
+            + pActor->identifier[7] - '0'
+            + ((pActor->identifier[4] - '0') * 1000);
         if (i < 0 || pTrack_spec->ampersand_digits <= i) {
             return 1;
         }
-        r1 = BR_SQR3(pActor->t.t.mat.m[0][0], pActor->t.t.mat.m[0][1], pActor->t.t.mat.m[0][2]);
-        r2 = BR_SQR3(pActor->t.t.mat.m[1][0], pActor->t.t.mat.m[1][1], pActor->t.t.mat.m[1][2]);
-        r3 = BR_SQR3(pActor->t.t.mat.m[2][0], pActor->t.t.mat.m[2][1], pActor->t.t.mat.m[2][2]);
-        if (r1 < .999f || r2 < .999f || r3 < .999f) {
+        r1 = BR_SQR3(pActor->t.t.mat.m[0][2], pActor->t.t.mat.m[0][1], pActor->t.t.mat.m[0][0]);
+        r2 = BR_SQR3(pActor->t.t.mat.m[1][2], pActor->t.t.mat.m[1][0], pActor->t.t.mat.m[1][1]);
+        r3 = BR_SQR3(pActor->t.t.mat.m[2][2], pActor->t.t.mat.m[2][0], pActor->t.t.mat.m[2][1]);
+        if (r1 < .999 || r2 < .999 || r3 < .999) {
             dr_dprintf("non car was scaled down %s", pActor->identifier);
             pActor->t.t.translate.t.v[0] += 2000.f;
         }
-        if (r1 > 1.001f || r2 > 1.001f || r3 > 1.001f) {
+        if (r1 > 1.001 || r2 > 1.001 || r3 > 1.001) {
             r1 = 1.f / sqrt(r1);
             r2 = 1.f / sqrt(r2);
             r3 = 1.f / sqrt(r3);