backup/cnc-ddraw
1
0
Fork 0
mirror of https://github.com/FunkyFr3sh/cnc-ddraw.git synced 2025-03-26 02:19:24 +01:00
Code Issues Projects Releases Activity

remove new filter settings to keep config compatible with old cnc-ddraw build

Browse Source
This commit is contained in:
FunkyFr3sh 2023-09-02 23:22:04 +02:00
parent 971bcb3985
commit c9d5e1015c
1 changed files with 14 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
config/ConfigFormUnit.cpp
View File

@ -783,14 +783,6 @@ void __fastcall TConfigForm::FormCreate(TObject *Sender)
{ {
} }
if (ShaderCbx->Items->Count == 0) {
ShaderCbx->AddItem("Nearest neighbor", NULL);
ShaderCbx->AddItem("Bilinear", NULL);
ShaderCbx->AddItem("Bicubic", NULL);
ShaderCbx->AddItem("Lanczos", NULL);
ShaderCbx->AddItem("xBR-lv2", NULL);
}
auto shader = ini->ReadString("ddraw", "shader", "Bicubic"); auto shader = ini->ReadString("ddraw", "shader", "Bicubic");
ShaderCbx->ItemIndex = ShaderCbx->Items->IndexOf(shader); ShaderCbx->ItemIndex = ShaderCbx->Items->IndexOf(shader);
@ -799,22 +791,13 @@ void __fastcall TConfigForm::FormCreate(TObject *Sender)
ShaderCbx->ItemIndex = ShaderCbx->Items->Count - 1; ShaderCbx->ItemIndex = ShaderCbx->Items->Count - 1;
} }
int d3d9_filter = ini->ReadInteger("ddraw", "d3d9_filter", 2); bool d3d9_filter = GetBool(ini, "d3d9linear", true);
switch (d3d9_filter) { if (d3d9_filter) {
case 0:
ShaderD3DCbx->ItemIndex = 0;
break;
case 1:
ShaderD3DCbx->ItemIndex = 1; ShaderD3DCbx->ItemIndex = 1;
break; }
case 2: else {
default: ShaderD3DCbx->ItemIndex = 0;
ShaderD3DCbx->ItemIndex = 2;
break;
case 3:
ShaderD3DCbx->ItemIndex = 3;
break;
} }
Maxfps = ini->ReadInteger("ddraw", "maxfps", -1); Maxfps = ini->ReadInteger("ddraw", "maxfps", -1);
@ -991,7 +974,12 @@ void TConfigForm::SaveSettings()
ini->WriteString("ddraw", "shader", ShaderCbx->Text); ini->WriteString("ddraw", "shader", ShaderCbx->Text);
ini->WriteInteger("ddraw", "d3d9_filter", ShaderD3DCbx->ItemIndex); if (ShaderD3DCbx->ItemIndex == 0) {
ini->WriteString("ddraw", "d3d9linear", "false");
}
else {
ini->WriteString("ddraw", "d3d9linear", "true");
}
int maxfps = Maxfps == 0 ? -1 : Maxfps; int maxfps = Maxfps == 0 ? -1 : Maxfps;