From 8775f9c1453390fbdda2c011a44c0b6ec8eda685 Mon Sep 17 00:00:00 2001
From: Agent X <44549182+AgentXLP@users.noreply.github.com>
Date: Thu, 13 Mar 2025 00:42:04 -0400
Subject: [PATCH] Fix lighting

---
 src/pc/gfx/gfx_pc.c      |  8 ++++----
 src/pc/network/network.c | 30 +++++++++++++-----------------
 2 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/src/pc/gfx/gfx_pc.c b/src/pc/gfx/gfx_pc.c
index d5c1614f9..53eafcc3c 100644
--- a/src/pc/gfx/gfx_pc.c
+++ b/src/pc/gfx/gfx_pc.c
@@ -187,10 +187,10 @@ static f32 sDepthZAdd = 0;
 static f32 sDepthZMult = 1;
 static f32 sDepthZSub = 0;
 
-Vec3f gLightingDir;
-Color gLightingColor[2] = { { 255, 255, 255 }, { 255, 255, 255 } };
-Color gVertexColor = { 255, 255, 255 };
-Color gFogColor = { 255, 255, 255 };
+Vec3f gLightingDir = { 0.0f, 0.0f, 0.0f };
+Color gLightingColor[2] = { { 0xFF, 0xFF, 0xFF }, { 0xFF, 0xFF, 0xFF } };
+Color gVertexColor = { 0xFF, 0xFF, 0xFF };
+Color gFogColor = { 0xFF, 0xFF, 0xFF };
 f32 gFogIntensity = 1;
 
 // 4x4 pink-black checkerboard texture to indicate missing textures
diff --git a/src/pc/network/network.c b/src/pc/network/network.c
index e6f2d741f..70f571537 100644
--- a/src/pc/network/network.c
+++ b/src/pc/network/network.c
@@ -630,6 +630,12 @@ void network_update(void) {
     }
 }
 
+static inline void color_set(Color color, u8 r, u8 g, u8 b) {
+    color[0] = r;
+    color[1] = g;
+    color[2] = b;
+}
+
 void network_shutdown(bool sendLeaving, bool exiting, bool popup, bool reconnecting) {
     smlua_call_event_hooks(HOOK_ON_EXIT);
 
@@ -674,23 +680,13 @@ void network_shutdown(bool sendLeaving, bool exiting, bool popup, bool reconnect
     gCurrActStarNum = 0;
     gCurrActNum = 0;
     gCurrCreditsEntry = NULL;
-    vec3f_set(gLightingDir, 0xFF, 0xFF, 0xFF);
-    gLightingColor[0][0] = 255;
-    gLightingColor[0][1] = 255;
-    gLightingColor[0][2] = 255;
-    gLightingColor[1][0] = 255;
-    gLightingColor[1][1] = 255;
-    gLightingColor[1][2] = 255;
-    gVertexColor[0] = 255;
-    gVertexColor[1] = 255;
-    gVertexColor[2] = 255;
-    gSkyboxColor[0] = 255;
-    gSkyboxColor[1] = 255;
-    gSkyboxColor[2] = 255;
-    gFogColor[0] = 255;
-    gFogColor[1] = 255;
-    gFogColor[2] = 255;
-    gFogIntensity = 1;
+    vec3f_set(gLightingDir, 0, 0, 0);
+    color_set(gLightingColor[0], 0xFF, 0xFF, 0xFF);
+    color_set(gLightingColor[1], 0xFF, 0xFF, 0xFF);
+    color_set(gVertexColor, 0xFF, 0xFF, 0xFF);
+    color_set(gSkyboxColor, 0xFF, 0xFF, 0xFF);
+    color_set(gFogColor, 0xFF, 0xFF, 0xFF);
+    gFogIntensity = 1.0f;
     gOverrideBackground = -1;
     gOverrideEnvFx = ENVFX_MODE_NO_OVERRIDE;
     gRomhackCameraAllowCentering = TRUE;