From 8db5722174b05fdcfa3af58fb4273788d85d0a55 Mon Sep 17 00:00:00 2001
From: Dethrace Labs <78985374+dethrace-labs@users.noreply.github.com>
Date: Mon, 1 Sep 2025 08:29:12 +1200
Subject: [PATCH] ProcessModelFaceMaterials

---
 lib/BRender-v1.3.2             | 2 +-
 src/DETHRACE/common/graphics.c | 8 ++++----
 src/DETHRACE/common/loading.c  | 2 ++
 src/DETHRACE/common/options.c  | 1 -
 src/DETHRACE/common/world.c    | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/lib/BRender-v1.3.2 b/lib/BRender-v1.3.2
index d237e6f3..92567fdf 160000
--- a/lib/BRender-v1.3.2
+++ b/lib/BRender-v1.3.2
@@ -1 +1 @@
-Subproject commit d237e6f3f267f19ae0dc6b1098106f3b5ea5ebcf
+Subproject commit 92567fdf399e38382314dbf05370c5832adad73c
diff --git a/src/DETHRACE/common/graphics.c b/src/DETHRACE/common/graphics.c
index a3bf716d..0a7a4287 100644
--- a/src/DETHRACE/common/graphics.c
+++ b/src/DETHRACE/common/graphics.c
@@ -810,10 +810,10 @@ void SetIntegerMapRenders(void) {
     gMap_render_width_i = ((int)gMap_render_width) & ~3;
     gMap_render_height_i = ((int)gMap_render_height) & ~1;
     if (gReal_graf_data_index != 0) {
-        gMap_render_x_i = 2 * gMap_render_x_i;
-        gMap_render_y_i = 2 * gMap_render_y_i + HIRES_Y_OFFSET;
-        gMap_render_width_i = 2 * gMap_render_width_i;
-        gMap_render_height_i = 2 * gMap_render_height_i;
+        gMap_render_x_i *= 2;
+        gMap_render_y_i = (gMap_render_y_i * 2) + HIRES_Y_OFFSET;
+        gMap_render_width_i *= 2;
+        gMap_render_height_i *= 2;
     }
 }
 
diff --git a/src/DETHRACE/common/loading.c b/src/DETHRACE/common/loading.c
index 4dbc6367..5178efb4 100644
--- a/src/DETHRACE/common/loading.c
+++ b/src/DETHRACE/common/loading.c
@@ -83,8 +83,10 @@ tHeadup_info gHeadup_image_info[] = {
 #endif
 };
 
+// GLOBAL: CARM95 0x0050A4E8
 char* gYour_car_names[2][6];
 
+// GLOBAL: CARM95 0x0050A518
 char* gDrivable_car_names[6];
 
 // GLOBAL: CARM95 0x0050a530
diff --git a/src/DETHRACE/common/options.c b/src/DETHRACE/common/options.c
index adad421a..9408eed3 100644
--- a/src/DETHRACE/common/options.c
+++ b/src/DETHRACE/common/options.c
@@ -1340,7 +1340,6 @@ int MouseyClickBastard(int* pCurrent_choice, int* pCurrent_mode, int pX_offset,
                 break;
             }
         }
-        return 0;
     } else {
         KeyAssignGoAhead(pCurrent_choice, pCurrent_mode);
     }
diff --git a/src/DETHRACE/common/world.c b/src/DETHRACE/common/world.c
index c2333c19..9c706dd2 100644
--- a/src/DETHRACE/common/world.c
+++ b/src/DETHRACE/common/world.c
@@ -792,8 +792,8 @@ void ProcessModelFaceMaterials(br_model* pModel, tPMFMCB pCallback) {
         if (pModel->faces[f].material != NULL) {
             possible_mat = (*pCallback)(pModel, f);
             if (possible_mat != NULL) {
-                pModel->faces[f].material = possible_mat;
                 new_mat = possible_mat;
+                pModel->faces[f].material = new_mat;
             }
         }
     }