diff --git a/CMake/lus-cvars.cmake b/CMake/lus-cvars.cmake index a16c257dd..0859f98ff 100644 --- 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 index 94b755b77..d8703fbee 160000 --- a/libultraship +++ b/libultraship @@ -1 +1 @@ -Subproject commit 94b755b77c0c0f566686c9d23fa4c15e23473a0c +Subproject commit d8703fbeee5105312439d123a23758795e124cf4 diff --git a/mm/2s2h/BenPort.cpp b/mm/2s2h/BenPort.cpp index 0a04728de..15dc9ef65 100644 --- 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();