Bump LUS (#625)

HarbourMasters · Jun 1, 2024 · 78f0525 · 78f0525
1 parent a3add60
commit 78f0525
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 5 deletions.
diff --git a/CMake/lus-cvars.cmake b/CMake/lus-cvars.cmake
@@ -1,6 +1,5 @@
 set(CVAR_VSYNC_ENABLED "${CVAR_PREFIX_SETTING}.VsyncEnabled" CACHE STRING "")
 set(CVAR_Z_FIGHTING_MODE "${CVAR_PREFIX_SETTING}.ZFightingMode" CACHE STRING "")
-set(CVAR_DISABLE_CLOSE_COLOR_WRAP "${CVAR_PREFIX_SETTING}.DisableCloseColorWrap" CACHE STRING "")
 set(CVAR_NEW_FILE_DROPPED "${CVAR_PREFIX_GENERAL}.NewFileDropped" CACHE STRING "")
 set(CVAR_DROPPED_FILE "${CVAR_PREFIX_GENERAL}.DroppedFile" CACHE STRING "")
 set(CVAR_INTERNAL_RESOLUTION "${CVAR_PREFIX_SETTING}.InternalResolution" CACHE STRING "")

diff --git a/libultraship b/libultraship
diff --git a/mm/2s2h/BenPort.cpp b/mm/2s2h/BenPort.cpp
@@ -493,9 +493,6 @@ extern "C" void InitOTR() {
         CVarClear("gLetItSnow");
     }
 
-    // BENTODO Once we have a proper fix for the color cominber, remove this
-    CVarRegisterInteger(CVAR_DISABLE_CLOSE_COLOR_WRAP, 1);
-
     srand(now);
 #ifdef ENABLE_CROWD_CONTROL
     CrowdControl::Instance = new CrowdControl();
+0 −2		cmake/cvars.cmake
+18 −6		src/graphic/Fast3D/gfx_direct3d_common.cpp
+18 −6		src/graphic/Fast3D/gfx_metal_shader.cpp
+21 −6		src/graphic/Fast3D/gfx_opengl.cpp