From 91da303bf888edbd1b19794135097f8575beec25 Mon Sep 17 00:00:00 2001 From: Elisha Riedlinger Date: Fri, 28 Oct 2022 15:14:14 -0700 Subject: [PATCH] Update code to prepare for release --- Common/Settings.cpp | 5 +++++ Common/Settings.h | 3 ++- Common/Settings.ini | 5 +---- Launcher/config.xml | 14 ++------------ Launcher/config_es.xml | 14 ++------------ Resources/BuildNo.rc | 2 +- Wrappers/d3d8to9.cpp | 2 +- Wrappers/d3d9/d3d9wrapper.cpp | 2 +- Wrappers/d3d9/d3d9wrapper.h | 2 +- 9 files changed, 16 insertions(+), 33 deletions(-) diff --git a/Common/Settings.cpp b/Common/Settings.cpp index b04b79d0..913ba6d8 100644 --- a/Common/Settings.cpp +++ b/Common/Settings.cpp @@ -247,6 +247,11 @@ void Parse(char* str, NV NameValueCallback, void* lpParam) void UpdateConfigDefaults() { + // Temporaroly disable settings + CRTShader = 0; + EnableDebugOverlay = 0; + EnableInfoOverlay = 0; + // Set CRT shader switch (CRTShader) { diff --git a/Common/Settings.h b/Common/Settings.h index 39ba3fe5..e6d785bd 100644 --- a/Common/Settings.h +++ b/Common/Settings.h @@ -95,7 +95,7 @@ visit(SpecificSoundLoopFix, true) \ visit(SpecularFix, true) \ visit(SteamCrashFix, true) \ - visit(UnlockJapLang, true) \ + visit(UnlockJapLang, false) \ visit(UseBestGraphics, true) \ visit(UseCustomExeStr, true) \ visit(UseCustomFonts, true) \ @@ -168,6 +168,7 @@ visit(AnisotropicFiltering) \ visit(AntiAliasing) \ visit(AudioFadeOutDelayMS) \ + visit(CRTShader) \ visit(CustomFontCharHeight) \ visit(CustomFontCharWidth) \ visit(CustomFontCol) \ diff --git a/Common/Settings.ini b/Common/Settings.ini index bac1fa41..8b873431 100644 --- a/Common/Settings.ini +++ b/Common/Settings.ini @@ -48,9 +48,6 @@ RestoreBrightnessSelector = 1 ; Enables subpixel morphological anti-aliasing (SMAA). Note: It is recommended to disable this if using GPU-based anti-aliasing. EnableSMAA = 0 -; Enables shaders that simulate what the game would look like on a CRT television. These shaders look more accurate at lower resolutions. For the best CRT nostalgic experience, play the game in a 4:3 aspect ratio. Note: It is not recommended to enable this option if you are streaming the game, as the CRT effect may not display correctly to your viewers. It is also not recommended to enable this option if you have a low-end computer system. -CRTShader = 0 - [Images] ; Allows higher quality, upscaled images to be used. Must be enabled if using the project's Image Enhancement Pack. EnableTexAddrHack = 1 @@ -149,7 +146,7 @@ MainMenuTitlePerLang = 1 UseCustomExeStr = 1 ; Restores the ability to select Japanese as a language option through the game's Options menu. Note: It is recommended to keep this disabled for now, as not all Japanese characters are currently supported. -UnlockJapLang = 1 +UnlockJapLang = 0 [Menu Fixes] ; Fixes the mouse hitboxes for the game's main menu selections for the North American version 1.1 executable. diff --git a/Launcher/config.xml b/Launcher/config.xml index e9eae554..d173f4ad 100644 --- a/Launcher/config.xml +++ b/Launcher/config.xml @@ -152,16 +152,6 @@ - - Simulate a CRT Screen - Enables shaders that simulate what the game would look like on a CRT television. These shaders look more accurate at lower resolutions. For the best CRT nostalgic experience, play the game in a 4:3 aspect ratio. Note: It is not recommended to enable this option if you are streaming the game, as the CRT effect may not display correctly to your viewers. It is also not recommended to enable this option if you have a low-end computer system. - - 0 - 1 - 2 - - - @@ -494,8 +484,8 @@ Unlock Japanese language option Restores the ability to select Japanese as a language option through the game's Options menu. Note: It is recommended to keep this disabled for now, as not all Japanese characters are currently supported. - 0 - 1 + 0 + 1 diff --git a/Launcher/config_es.xml b/Launcher/config_es.xml index 6b6cd5df..ee8c18eb 100644 --- a/Launcher/config_es.xml +++ b/Launcher/config_es.xml @@ -152,16 +152,6 @@ - - Simulate a CRT Screen - Enables shaders that simulate what the game would look like on a CRT television. These shaders look more accurate at lower resolutions. For the best CRT nostalgic experience, play the game in a 4:3 aspect ratio. Note: It is not recommended to enable this option if you are streaming the game, as the CRT effect may not display correctly to your viewers. It is also not recommended to enable this option if you have a low-end computer system. - - 0 - 1 - 2 - - - @@ -494,8 +484,8 @@ Desbloquear la opción del idioma japonés Restaura la capacidad de seleccionar el idioma japonés en el menú de Opciones del juego. Nota: actualmente se recomienda mantener esta opción desactivada, ya que no todos los caracteres japoneses están soportados. - 0 - 1 + 0 + 1 diff --git a/Resources/BuildNo.rc b/Resources/BuildNo.rc index ff345e33..d6afc550 100644 --- a/Resources/BuildNo.rc +++ b/Resources/BuildNo.rc @@ -1 +1 @@ -#define BUILD_NUMBER 2024 +#define BUILD_NUMBER 2025 diff --git a/Wrappers/d3d8to9.cpp b/Wrappers/d3d8to9.cpp index f74ef6f5..ca277ea9 100644 --- a/Wrappers/d3d8to9.cpp +++ b/Wrappers/d3d8to9.cpp @@ -68,7 +68,7 @@ void EnableD3d8to9() } else { - p_Direct3DCreate9 = rs_Direct3DCreate9; + p_Direct3DCreate9 = Direct3DCreate9Wrapper; } } diff --git a/Wrappers/d3d9/d3d9wrapper.cpp b/Wrappers/d3d9/d3d9wrapper.cpp index d2ce11b3..0aa9a84e 100644 --- a/Wrappers/d3d9/d3d9wrapper.cpp +++ b/Wrappers/d3d9/d3d9wrapper.cpp @@ -21,7 +21,7 @@ Direct3DCreate9Proc m_pDirect3DCreate9 = nullptr; -IDirect3D9 *WINAPI rs_Direct3DCreate9(UINT SDKVersion) +IDirect3D9 *WINAPI Direct3DCreate9Wrapper(UINT SDKVersion) { if (!m_pDirect3DCreate9) { diff --git a/Wrappers/d3d9/d3d9wrapper.h b/Wrappers/d3d9/d3d9wrapper.h index c673bac1..906f48db 100644 --- a/Wrappers/d3d9/d3d9wrapper.h +++ b/Wrappers/d3d9/d3d9wrapper.h @@ -15,7 +15,7 @@ class m_IDirect3DSwapChain9; typedef IDirect3D9 *(WINAPI *Direct3DCreate9Proc)(UINT); -IDirect3D9 *WINAPI rs_Direct3DCreate9(UINT SDKVersion); +IDirect3D9 *WINAPI Direct3DCreate9Wrapper(UINT SDKVersion); #include "IDirect3D9.h" #include "IDirect3DDevice9.h"