| Index: cfgmgr/cfgmgr.cpp |
| — | — | @@ -67,7 +67,7 @@ |
| 68 | 68 | }
|
| 69 | 69 |
|
| 70 | 70 |
|
| 71 | | -bool ReadBool(HKEY hKey, bool &mask, LPTSTR value)
|
| | 71 | +bool ReadBool(HKEY hKey, bool original, bool &mask, LPTSTR value)
|
| 72 | 72 | {
|
| 73 | 73 | DWORD dwOut;
|
| 74 | 74 | DWORD sizeout = 4;
|
| — | — | @@ -82,11 +82,11 @@ |
| 83 | 83 | else
|
| 84 | 84 | {
|
| 85 | 85 | mask = false;
|
| 86 | | - return false;
|
| | 86 | + return original;
|
| 87 | 87 | }
|
| 88 | 88 | }
|
| 89 | 89 |
|
| 90 | | -DWORD ReadDWORD(HKEY hKey, DWORD &mask, LPTSTR value)
|
| | 90 | +DWORD ReadDWORD(HKEY hKey, DWORD original, DWORD &mask, LPTSTR value)
|
| 91 | 91 | {
|
| 92 | 92 | DWORD dwOut;
|
| 93 | 93 | DWORD sizeout = 4;
|
| — | — | @@ -100,7 +100,7 @@ |
| 101 | 101 | else
|
| 102 | 102 | {
|
| 103 | 103 | mask = 0;
|
| 104 | | - return 0;
|
| | 104 | + return original;
|
| 105 | 105 | }
|
| 106 | 106 | }
|
| 107 | 107 |
|
| — | — | @@ -126,22 +126,22 @@ |
| 127 | 127 | LONG error;
|
| 128 | 128 | DWORD regmultisz = REG_MULTI_SZ;
|
| 129 | 129 | DWORD sizeout=4;
|
| 130 | | - cfg->scaler = ReadDWORD(hKey,cfgmask->scaler,_T("ScalingMode"));
|
| 131 | | - cfg->colormode = ReadBool(hKey,cfgmask->colormode,_T("ChangeColorDepth"));
|
| 132 | | - cfg->scalingfilter = ReadDWORD(hKey,cfgmask->scalingfilter,_T("ScalingFilter"));
|
| 133 | | - cfg->texfilter = ReadDWORD(hKey,cfgmask->texfilter,_T("TextureFilter"));
|
| 134 | | - cfg->anisotropic = ReadDWORD(hKey,cfgmask->anisotropic,_T("AnisotropicFiltering"));
|
| 135 | | - cfg->msaa = ReadDWORD(hKey,cfgmask->msaa,_T("Antialiasing"));
|
| 136 | | - cfg->aspect = ReadDWORD(hKey,cfgmask->aspect,_T("AdjustAspectRatio"));
|
| 137 | | - cfg->highres = ReadBool(hKey,cfgmask->highres,_T("AdjustPrimaryResolution"));
|
| | 130 | + cfg->scaler = ReadDWORD(hKey,cfg->scaler,cfgmask->scaler,_T("ScalingMode"));
|
| | 131 | + cfg->colormode = ReadBool(hKey,cfg->colormode,cfgmask->colormode,_T("ChangeColorDepth"));
|
| | 132 | + cfg->scalingfilter = ReadDWORD(hKey,cfg->scalingfilter,cfgmask->scalingfilter,_T("ScalingFilter"));
|
| | 133 | + cfg->texfilter = ReadDWORD(hKey,cfg->texfilter,cfgmask->texfilter,_T("TextureFilter"));
|
| | 134 | + cfg->anisotropic = ReadDWORD(hKey,cfg->anisotropic,cfgmask->anisotropic,_T("AnisotropicFiltering"));
|
| | 135 | + cfg->msaa = ReadDWORD(hKey,cfg->msaa,cfgmask->msaa,_T("Antialiasing"));
|
| | 136 | + cfg->aspect = ReadDWORD(hKey,cfg->aspect,cfgmask->aspect,_T("AdjustAspectRatio"));
|
| | 137 | + cfg->highres = ReadBool(hKey,cfg->highres,cfgmask->highres,_T("AdjustPrimaryResolution"));
|
| 138 | 138 | ReadPath(hKey,cfg->shaderfile,cfgmask->shaderfile,_T("ShaderFile"));
|
| 139 | | - cfg->SortModes = ReadDWORD(hKey,cfgmask->SortModes,_T("SortModes"));
|
| 140 | | - cfg->AllColorDepths = ReadBool(hKey,cfgmask->AllColorDepths,_T("AllColorDepths"));
|
| 141 | | - cfg->ExtraModes = ReadBool(hKey,cfgmask->ExtraModes,_T("ExtraModes"));
|
| 142 | | - cfg->vsync = ReadDWORD(hKey,cfgmask->vsync,_T("VSync"));
|
| 143 | | - cfg->audio3d = ReadBool(hKey,cfgmask->audio3d,_T("Use3DAudio"));
|
| 144 | | - cfg->audioglobal = ReadBool(hKey,cfgmask->audioglobal,_T("GlobalAudio"));
|
| 145 | | - cfg->inputglobal = ReadBool(hKey,cfgmask->inputglobal,_T("GlobalInput"));
|
| | 139 | + cfg->SortModes = ReadDWORD(hKey,cfg->SortModes,cfgmask->SortModes,_T("SortModes"));
|
| | 140 | + cfg->AllColorDepths = ReadBool(hKey,cfg->AllColorDepths,cfgmask->AllColorDepths,_T("AllColorDepths"));
|
| | 141 | + cfg->ExtraModes = ReadBool(hKey,cfg->ExtraModes,cfgmask->ExtraModes,_T("ExtraModes"));
|
| | 142 | + cfg->vsync = ReadDWORD(hKey,cfg->vsync,cfgmask->vsync,_T("VSync"));
|
| | 143 | + cfg->audio3d = ReadBool(hKey,cfg->audio3d,cfgmask->audio3d,_T("Use3DAudio"));
|
| | 144 | + cfg->audioglobal = ReadBool(hKey,cfg->audioglobal,cfgmask->audioglobal,_T("GlobalAudio"));
|
| | 145 | + cfg->inputglobal = ReadBool(hKey,cfg->inputglobal,cfgmask->inputglobal,_T("GlobalInput"));
|
| 146 | 146 | if(!global && dll)
|
| 147 | 147 | {
|
| 148 | 148 | LPTSTR paths;
|