Update code to prepare for release

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)
 	{

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) \

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. 

Launcher/config.xml

@@ -152,16 +152,6 @@
         </Choices>
       </Feature>
 
-      <Feature name="CRTShader">
-        <Title>Simulate a CRT Screen</Title>
-        <Description>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.&#x0a;&#x0a;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.</Description>
-        <Choices type="list">
-          <Value name="Disabled" default="true">0</Value>
-          <Value name="Enabled">1</Value>
-          <Value name="Enabled with Curvature">2</Value>
-        </Choices>
-      </Feature>
-
     </Section>
 
   </Tab>
@@ -494,8 +484,8 @@
         <Title>Unlock Japanese language option</Title>
         <Description>Restores the ability to select Japanese as a language option through the game's Options menu.&#x0a;&#x0a;Note: It is recommended to keep this disabled for now, as not all Japanese characters are currently supported.</Description>
         <Choices type="check">
-          <Value name="Disable">0</Value>
-          <Value name="Enable" default="true">1</Value>
+          <Value name="Disable" default="true">0</Value>
+          <Value name="Enable">1</Value>
         </Choices>
       </Feature>
 

Launcher/config_es.xml

@@ -152,16 +152,6 @@
         </Choices>
       </Feature>
 
-      <Feature name="CRTShader">
-        <Title>Simulate a CRT Screen</Title>
-        <Description>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.&#x0a;&#x0a;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.</Description>
-        <Choices type="list">
-          <Value name="Disabled" default="true">0</Value>
-          <Value name="Enabled">1</Value>
-          <Value name="Enabled with Curvature">2</Value>
-        </Choices>
-      </Feature>
-
     </Section>
 
   </Tab>
@@ -494,8 +484,8 @@
         <Title>Desbloquear la opción del idioma japonés</Title>
         <Description>Restaura la capacidad de seleccionar el idioma japonés en el menú de Opciones del juego.&#x0a;&#x0a;Nota: actualmente se recomienda mantener esta opción desactivada, ya que no todos los caracteres japoneses están soportados.</Description>
         <Choices type="check">
-          <Value name="Desactivado">0</Value>
-          <Value name="Activado" default="true">1</Value>
+          <Value name="Desactivado" default="true">0</Value>
+          <Value name="Activado">1</Value>
         </Choices>
       </Feature>
 

Resources/BuildNo.rc

@@ -1 +1 @@
-#define BUILD_NUMBER 2024 
+#define BUILD_NUMBER 2025 

Wrappers/d3d8to9.cpp

@@ -68,7 +68,7 @@ void EnableD3d8to9()
 	}
 	else
 	{
-		p_Direct3DCreate9 = rs_Direct3DCreate9;
+		p_Direct3DCreate9 = Direct3DCreate9Wrapper;
 	}
 }
 

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)
 	{

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"