This commit is contained in:
Garrett Cox 2024-05-31 19:50:36 -05:00 committed by GitHub
parent a3add6092b
commit 78f0525ec0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 1 additions and 5 deletions

View File

@ -1,6 +1,5 @@
set(CVAR_VSYNC_ENABLED "${CVAR_PREFIX_SETTING}.VsyncEnabled" CACHE STRING "") set(CVAR_VSYNC_ENABLED "${CVAR_PREFIX_SETTING}.VsyncEnabled" CACHE STRING "")
set(CVAR_Z_FIGHTING_MODE "${CVAR_PREFIX_SETTING}.ZFightingMode" 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_NEW_FILE_DROPPED "${CVAR_PREFIX_GENERAL}.NewFileDropped" CACHE STRING "")
set(CVAR_DROPPED_FILE "${CVAR_PREFIX_GENERAL}.DroppedFile" CACHE STRING "") set(CVAR_DROPPED_FILE "${CVAR_PREFIX_GENERAL}.DroppedFile" CACHE STRING "")
set(CVAR_INTERNAL_RESOLUTION "${CVAR_PREFIX_SETTING}.InternalResolution" CACHE STRING "") set(CVAR_INTERNAL_RESOLUTION "${CVAR_PREFIX_SETTING}.InternalResolution" CACHE STRING "")

@ -1 +1 @@
Subproject commit 94b755b77c0c0f566686c9d23fa4c15e23473a0c Subproject commit d8703fbeee5105312439d123a23758795e124cf4

View File

@ -493,9 +493,6 @@ extern "C" void InitOTR() {
CVarClear("gLetItSnow"); CVarClear("gLetItSnow");
} }
// BENTODO Once we have a proper fix for the color cominber, remove this
CVarRegisterInteger(CVAR_DISABLE_CLOSE_COLOR_WRAP, 1);
srand(now); srand(now);
#ifdef ENABLE_CROWD_CONTROL #ifdef ENABLE_CROWD_CONTROL
CrowdControl::Instance = new CrowdControl(); CrowdControl::Instance = new CrowdControl();