Remove obsolete video options, other changes

`Draw 3D to Video Memory` and `Flip Video Memory Pages` were removed from the config tool, and `Use Joystick` is set to True by default (when no prior config exists)
This commit is contained in:
VoxelTek 2025-06-19 11:01:19 +10:00
parent e705e3270a
commit 96ceb11210
4 changed files with 2 additions and 79 deletions

View File

@ -17,10 +17,6 @@
DECOMP_SIZE_ASSERT(CDialog, 0x60) DECOMP_SIZE_ASSERT(CDialog, 0x60)
DECOMP_SIZE_ASSERT(CMainDialog, 0x70) DECOMP_SIZE_ASSERT(CMainDialog, 0x70)
// FIXME: disable dialog resizing
// FIXME: advanced mode should resize dialog, ignoring advanced controls
// FIXME: list widget should have less rows
// FUNCTION: CONFIG 0x00403d50 // FUNCTION: CONFIG 0x00403d50
CMainDialog::CMainDialog(QWidget* pParent) : QDialog(pParent) CMainDialog::CMainDialog(QWidget* pParent) : QDialog(pParent)
{ {
@ -58,8 +54,6 @@ CMainDialog::CMainDialog(QWidget* pParent) : QDialog(pParent)
); );
connect(m_ui->devicesList, &QListWidget::currentRowChanged, this, &CMainDialog::OnList3DevicesSelectionChanged); connect(m_ui->devicesList, &QListWidget::currentRowChanged, this, &CMainDialog::OnList3DevicesSelectionChanged);
connect(m_ui->musicCheckBox, &QCheckBox::toggled, this, &CMainDialog::OnCheckboxMusic); connect(m_ui->musicCheckBox, &QCheckBox::toggled, this, &CMainDialog::OnCheckboxMusic);
connect(m_ui->videomemoryCheckBox, &QCheckBox::toggled, this, &CMainDialog::OnCheckbox3DVideoMemory);
connect(m_ui->flipVideoMemoryPagesCheckBox, &QCheckBox::toggled, this, &CMainDialog::OnCheckboxFlipVideoMemPages);
connect(m_ui->sound3DCheckBox, &QCheckBox::toggled, this, &CMainDialog::OnCheckbox3DSound); connect(m_ui->sound3DCheckBox, &QCheckBox::toggled, this, &CMainDialog::OnCheckbox3DSound);
connect(m_ui->joystickCheckBox, &QCheckBox::toggled, this, &CMainDialog::OnCheckboxJoystick); connect(m_ui->joystickCheckBox, &QCheckBox::toggled, this, &CMainDialog::OnCheckboxJoystick);
connect(m_ui->okButton, &QPushButton::clicked, this, &CMainDialog::accept); connect(m_ui->okButton, &QPushButton::clicked, this, &CMainDialog::accept);
@ -139,8 +133,6 @@ void CMainDialog::OnList3DevicesSelectionChanged(int selected)
if (currentConfigApp->GetHardwareDeviceColorModel() == D3DCOLOR_NONE) { if (currentConfigApp->GetHardwareDeviceColorModel() == D3DCOLOR_NONE) {
currentConfigApp->m_3d_video_ram = FALSE; currentConfigApp->m_3d_video_ram = FALSE;
currentConfigApp->m_flip_surfaces = FALSE; currentConfigApp->m_flip_surfaces = FALSE;
m_ui->videomemoryCheckBox->setChecked(currentConfigApp->m_3d_video_ram);
m_ui->flipVideoMemoryPagesCheckBox->setChecked(currentConfigApp->m_flip_surfaces);
} }
m_modified = true; m_modified = true;
UpdateInterface(); UpdateInterface();
@ -164,11 +156,6 @@ void CMainDialog::accept()
void CMainDialog::UpdateInterface() void CMainDialog::UpdateInterface()
{ {
currentConfigApp->ValidateSettings(); currentConfigApp->ValidateSettings();
m_ui->videomemoryCheckBox->setEnabled(
!currentConfigApp->m_flip_surfaces && currentConfigApp->GetHardwareDeviceColorModel() == D3DCOLOR_NONE
);
m_ui->flipVideoMemoryPagesCheckBox->setChecked(currentConfigApp->m_flip_surfaces);
m_ui->videomemoryCheckBox->setChecked(currentConfigApp->m_3d_video_ram);
bool full_screen = currentConfigApp->m_full_screen; bool full_screen = currentConfigApp->m_full_screen;
currentConfigApp->AdjustDisplayBitDepthBasedOnRenderStatus(); currentConfigApp->AdjustDisplayBitDepthBasedOnRenderStatus();
if (!full_screen) { if (!full_screen) {
@ -208,22 +195,6 @@ void CMainDialog::OnCheckbox3DSound(bool checked)
UpdateInterface(); UpdateInterface();
} }
// FUNCTION: CONFIG 0x00404610
void CMainDialog::OnCheckbox3DVideoMemory(bool checked)
{
currentConfigApp->m_3d_video_ram = checked;
m_modified = true;
UpdateInterface();
}
// FUNCTION: CONFIG 0x004046a0
void CMainDialog::OnCheckboxFlipVideoMemPages(bool checked)
{
currentConfigApp->m_flip_surfaces = checked;
m_modified = true;
UpdateInterface();
}
// FUNCTION: CONFIG 0x004046d0 // FUNCTION: CONFIG 0x004046d0
void CMainDialog::OnRadiobuttonModelLowQuality(bool checked) void CMainDialog::OnRadiobuttonModelLowQuality(bool checked)
{ {

View File

@ -34,8 +34,6 @@ class CMainDialog : public QDialog {
private slots: private slots:
void OnList3DevicesSelectionChanged(int row); void OnList3DevicesSelectionChanged(int row);
void OnCheckbox3DSound(bool checked); void OnCheckbox3DSound(bool checked);
void OnCheckbox3DVideoMemory(bool checked);
void OnCheckboxFlipVideoMemPages(bool checked);
void OnRadiobuttonModelLowQuality(bool checked); void OnRadiobuttonModelLowQuality(bool checked);
void OnRadiobuttonModelMediumQuality(bool checked); void OnRadiobuttonModelMediumQuality(bool checked);
void OnRadiobuttonModelHighQuality(bool checked); void OnRadiobuttonModelHighQuality(bool checked);

View File

@ -63,7 +63,7 @@ bool CConfigApp::InitInstance()
m_device = NULL; m_device = NULL;
m_full_screen = TRUE; m_full_screen = TRUE;
m_wide_view_angle = TRUE; m_wide_view_angle = TRUE;
m_use_joystick = FALSE; m_use_joystick = TRUE;
m_music = TRUE; m_music = TRUE;
m_flip_surfaces = FALSE; m_flip_surfaces = FALSE;
m_3d_video_ram = FALSE; m_3d_video_ram = FALSE;

View File

@ -482,7 +482,7 @@
<number>6</number> <number>6</number>
</property> </property>
<property name="bottomMargin"> <property name="bottomMargin">
<number>0</number> <number>6</number>
</property> </property>
<item> <item>
<widget class="QLabel" name="direct3DDevicesLabel"> <widget class="QLabel" name="direct3DDevicesLabel">
@ -534,50 +534,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QWidget" name="D3DCheckboxWidget" native="true">
<property name="minimumSize">
<size>
<width>0</width>
<height>25</height>
</size>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>6</number>
</property>
<item>
<widget class="QCheckBox" name="flipVideoMemoryPagesCheckBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Flip Video Memory Pages</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="videomemoryCheckBox">
<property name="text">
<string>Draw 3D to Video Memory</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
@ -644,8 +600,6 @@
<tabstop>musicCheckBox</tabstop> <tabstop>musicCheckBox</tabstop>
<tabstop>joystickCheckBox</tabstop> <tabstop>joystickCheckBox</tabstop>
<tabstop>devicesList</tabstop> <tabstop>devicesList</tabstop>
<tabstop>flipVideoMemoryPagesCheckBox</tabstop>
<tabstop>videomemoryCheckBox</tabstop>
<tabstop>okButton</tabstop> <tabstop>okButton</tabstop>
<tabstop>cancelButton</tabstop> <tabstop>cancelButton</tabstop>
</tabstops> </tabstops>