remove tweaks config dialog

RibShark · Feb 22, 2024 · d2ee224 · d2ee224
1 parent 77a28c1
commit d2ee224
Show file tree

Hide file tree

Showing 14 changed files with 2 additions and 158 deletions.
diff --git a/GliFixVf/GliFixVf.vcxproj b/GliFixVf/GliFixVf.vcxproj
@@ -164,7 +164,6 @@
     <ClInclude Include="fix.h" />
     <ClInclude Include="imports.h" />
     <ClInclude Include="r2fn.h" />
-    <ClInclude Include="shared.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="config.c" />

diff --git a/GliFixVf/GliFixVf.vcxproj.filters b/GliFixVf/GliFixVf.vcxproj.filters
@@ -33,9 +33,6 @@
     <ClInclude Include="config.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="shared.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="fix.h">
       <Filter>Header Files</Filter>
     </ClInclude>

diff --git a/GliFixVf/config.c b/GliFixVf/config.c
@@ -2,7 +2,6 @@
 #include <shellapi.h>
 #include "config.h"
 #include "devinfo.h"
-#include "shared.h"
 
 
 #define C_MaxGlideModes 8

diff --git a/GliFixVf/config.h b/GliFixVf/config.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "framework.h"
-#include "shared.h"
 
 
 typedef struct tdstDisplayMode_

diff --git a/GliFixVf/shared.h b/GliFixVf/shared.h
diff --git a/R2FixCfg/R2FixCfg.vcxproj b/R2FixCfg/R2FixCfg.vcxproj
@@ -25,7 +25,6 @@
     <ClCompile Include="main.c" />
     <ClCompile Include="pad.c" />
     <ClCompile Include="paddlg.c" />
-    <ClCompile Include="tweaksdlg.c" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="config.h" />

diff --git a/R2FixCfg/R2FixCfg.vcxproj.filters b/R2FixCfg/R2FixCfg.vcxproj.filters
@@ -27,9 +27,6 @@
     <ClCompile Include="config.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="tweaksdlg.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="paddlg.c">
       <Filter>Source Files</Filter>
     </ClCompile>

diff --git a/R2FixCfg/Resource.rc b/R2FixCfg/Resource.rc
@@ -105,21 +105,6 @@ BEGIN
     LTEXT           "+  Largest recommended size for windowed mode",IDC_STATIC,6,180,161,8
 END
 
-IDD_TWEAKS DIALOGEX 0, 0, 254, 194
-STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_SYSMENU
-FONT 8, "MS Shell Dlg", 400, 0, 0x1
-BEGIN
-    LTEXT           "Warning: Tweaks and mods are not allowed in speedruns.",IDC_STATIC,12,6,186,8
-    LTEXT           "Enabling tweaks will display a small watermark in the lower left corner of the screen during gameplay.",IDC_STATIC,12,20,228,16
-    GROUPBOX        "Tweaks",IDC_STATIC,6,44,242,144
-    CONTROL         "Show coordinates",IDC_SHOWPOS,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,18,60,73,10
-    LTEXT           "(Not implemented yet)",IDC_STATIC,30,74,72,8
-    CONTROL         "Adjust luminosity with -/+ keys",IDC_LUMCONTROL,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,18,90,115,10
-    LTEXT           "(Not implemented yet)",IDC_STATIC,30,104,72,8
-    CONTROL         "Load all DLLs from ""Rayman 2\\Mods""",IDC_MODLOADER,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,120,135,10
-END
-
 IDD_PAD DIALOGEX 0, 0, 254, 194
 STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_SYSMENU
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
@@ -255,26 +240,6 @@ BEGIN
         HORZGUIDE, 124
     END
 
-    IDD_TWEAKS, DIALOG
-    BEGIN
-        LEFTMARGIN, 6
-        RIGHTMARGIN, 248
-        VERTGUIDE, 18
-        VERTGUIDE, 30
-        VERTGUIDE, 240
-        TOPMARGIN, 6
-        BOTTOMMARGIN, 188
-        HORZGUIDE, 14
-        HORZGUIDE, 20
-        HORZGUIDE, 36
-        HORZGUIDE, 44
-        HORZGUIDE, 60
-        HORZGUIDE, 74
-        HORZGUIDE, 90
-        HORZGUIDE, 104
-        HORZGUIDE, 120
-    END
-
     IDD_PAD, DIALOG
     BEGIN
         LEFTMARGIN, 6
@@ -313,11 +278,6 @@ BEGIN
     0
 END
 
-IDD_TWEAKS AFX_DIALOG_LAYOUT
-BEGIN
-    0
-END
-
 IDD_PAD AFX_DIALOG_LAYOUT
 BEGIN
     0

diff --git a/R2FixCfg/config.c b/R2FixCfg/config.c
@@ -10,8 +10,6 @@
 BOOL g_bFixState = FALSE;
 BOOL g_bFixPrevState = FALSE;
 
-tdeTweaks g_eTweaks = e_TWK_NoTweaks;
-
 tdstDisplayMode g_stCurrentMode = { 0 };
 tdeRefRate g_eRefRate = e_RR_Full;
 BOOL g_bForceVsync = FALSE;
@@ -76,9 +74,6 @@ void fn_vReadUbiIni( void )
 		g_stCurrentMode.dwWidth = dwWidth;
 		g_stCurrentMode.dwHeight = dwHeight;
 	}
-
-	// Tweaks
-	g_eTweaks = GetPrivateProfileInt("Ray2Fix", "Tweaks", 0, szUbiPath);
 }
 
 void fn_vReadDegeIni( void )
@@ -130,9 +125,8 @@ void fn_vWriteUbiIni( void )
 	sprintf_s(szBuffer, sizeof(szBuffer), "1 - %i x %i x 16", g_stCurrentMode.dwWidth, g_stCurrentMode.dwHeight);
 	WritePrivateProfileString("Rayman2", "GLI_Mode", szBuffer, szUbiPath);
 
-	// Tweaks
-	sprintf_s(szBuffer, sizeof(szBuffer), "%i", g_eTweaks);
-	WritePrivateProfileString("Ray2Fix", "Tweaks", szBuffer, szUbiPath);
+	// Tweaks - removed
+	WritePrivateProfileString("Ray2Fix", "Tweaks", "0", szUbiPath);
 
 	// Refresh rate
 	sprintf_s(szBuffer, sizeof(szBuffer), "%i", (g_eRefRate == e_RR_Half));

diff --git a/R2FixCfg/config.h b/R2FixCfg/config.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "framework.h"
-#include "../GliFixVf/shared.h"
 #include "display.h"
 
 
@@ -36,8 +35,6 @@ tdeVerifyErr;
 extern BOOL g_bFixState;
 extern BOOL g_bFixPrevState;
 
-extern tdeTweaks g_eTweaks;
-
 extern tdstDisplayMode g_stCurrentMode;
 extern tdeRefRate g_eRefRate;
 extern BOOL g_bForceVsync;

diff --git a/R2FixCfg/dialogs.h b/R2FixCfg/dialogs.h
@@ -7,7 +7,6 @@ typedef enum tdeTabID_
 {
 	e_TAB_General,
 	e_TAB_Pad,
-	e_TAB_Tweaks,
 	e_NbTab
 }
 tdeTabID;
@@ -23,4 +22,3 @@ tdstTabInfo;
 
 BOOL CALLBACK DLG_fn_bProc_General( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam );
 BOOL CALLBACK DLG_fn_bProc_Pad( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam );
-BOOL CALLBACK DLG_fn_bProc_Tweaks( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam );
diff --git a/R2FixCfg/main.c b/R2FixCfg/main.c
@@ -19,7 +19,6 @@ HWND a_hTabs[e_NbTab];
 tdstTabInfo a_stTabs[e_NbTab] = {
 	[e_TAB_General] = { IDD_GENERAL, "General", DLG_fn_bProc_General },
 	[e_TAB_Pad] = { IDD_PAD, "Gamepad", DLG_fn_bProc_Pad },
-	[e_TAB_Tweaks] = { IDD_TWEAKS, "Tweaks", DLG_fn_bProc_Tweaks }
 };
 
 

diff --git a/R2FixCfg/resource.h b/R2FixCfg/resource.h
@@ -8,7 +8,6 @@
 #define IDS_FLAVORTEXT                  105
 #define IDS_GREETING                    106
 #define IDD_GENERAL                     106
-#define IDD_TWEAKS                      107
 #define IDS_U_ENABLED                   107
 #define IDS_U_DISABLED                  108
 #define IDD_PAD                         108
@@ -46,9 +45,6 @@
 #define IDC_REFRATE_LABEL               1022
 #define IDC_FSMODE_WND                  1023
 #define IDC_FSMODE_FS                   1024
-#define IDC_MODLOADER                   1025
-#define IDC_SHOWPOS                     1026
-#define IDC_LUMCONTROL                  1027
 #define IDC_RESX                        1029
 #define IDC_RESY                        1030
 #define IDC_RES_LABEL                   1031

diff --git a/R2FixCfg/tweaksdlg.c b/R2FixCfg/tweaksdlg.c