diff --git a/CONFIG/MainDlg.cpp b/CONFIG/MainDlg.cpp
index e2c526f6..828395bd 100644
--- a/CONFIG/MainDlg.cpp
+++ b/CONFIG/MainDlg.cpp
@@ -59,6 +59,7 @@ CMainDialog::CMainDialog(QWidget* pParent) : QDialog(pParent)
connect(m_ui->sound3DCheckBox, &QCheckBox::toggled, this, &CMainDialog::OnCheckbox3DSound);
connect(m_ui->joystickCheckBox, &QCheckBox::toggled, this, &CMainDialog::OnCheckboxJoystick);
connect(m_ui->fullscreenCheckBox, &QCheckBox::toggled, this, &CMainDialog::OnCheckboxFullscreen);
+ connect(m_ui->transitionTypeComboBox, &QComboBox::currentIndexChanged, this, &CMainDialog::TransitionTypeChanged);
connect(m_ui->okButton, &QPushButton::clicked, this, &CMainDialog::accept);
connect(m_ui->cancelButton, &QPushButton::clicked, this, &CMainDialog::reject);
connect(m_ui->launchButton, &QPushButton::clicked, this, &CMainDialog::launch);
@@ -212,6 +213,7 @@ void CMainDialog::UpdateInterface()
m_ui->joystickCheckBox->setChecked(currentConfigApp->m_use_joystick);
m_ui->musicCheckBox->setChecked(currentConfigApp->m_music);
m_ui->fullscreenCheckBox->setChecked(currentConfigApp->m_full_screen);
+ m_ui->transitionTypeComboBox->setCurrentIndex(currentConfigApp->m_transition_type);
m_ui->dataPath->setText(QString::fromStdString(currentConfigApp->m_cd_path));
m_ui->savePath->setText(QString::fromStdString(currentConfigApp->m_save_path));
}
@@ -296,6 +298,13 @@ void CMainDialog::OnCheckboxFullscreen(bool checked)
UpdateInterface();
}
+void CMainDialog::TransitionTypeChanged(int index)
+{
+ currentConfigApp->m_transition_type = index;
+ m_modified = true;
+ UpdateInterface();
+}
+
void CMainDialog::SelectDataPathDialog()
{
QString data_path = QString::fromStdString(currentConfigApp->m_cd_path);
diff --git a/CONFIG/MainDlg.h b/CONFIG/MainDlg.h
index 372a1156..72062486 100644
--- a/CONFIG/MainDlg.h
+++ b/CONFIG/MainDlg.h
@@ -43,6 +43,7 @@ private slots:
void OnCheckboxJoystick(bool checked);
void OnCheckboxMusic(bool checked);
void OnCheckboxFullscreen(bool checked);
+ void TransitionTypeChanged(int index);
void accept() override;
void reject() override;
void launch();
diff --git a/CONFIG/config.cpp b/CONFIG/config.cpp
index 9030ae67..b4435298 100644
--- a/CONFIG/config.cpp
+++ b/CONFIG/config.cpp
@@ -70,6 +70,7 @@ bool CConfigApp::InitInstance()
m_driver = NULL;
m_device = NULL;
m_full_screen = TRUE;
+ m_transition_type = 3; // 3: Mosaic
m_wide_view_angle = TRUE;
m_use_joystick = TRUE;
m_music = TRUE;
@@ -153,6 +154,7 @@ bool CConfigApp::ReadRegisterSettings()
m_display_bit_depth = iniparser_getint(dict, "isle:Display Bit Depth", -1);
m_flip_surfaces = iniparser_getboolean(dict, "isle:Flip Surfaces", m_flip_surfaces);
m_full_screen = iniparser_getboolean(dict, "isle:Full Screen", m_full_screen);
+ m_transition_type = iniparser_getint(dict, "isle:Transition Type", m_transition_type);
m_3d_video_ram = iniparser_getboolean(dict, "isle:Back Buffers in Video RAM", m_3d_video_ram);
m_wide_view_angle = iniparser_getboolean(dict, "isle:Wide View Angle", m_wide_view_angle);
m_3d_sound = iniparser_getboolean(dict, "isle:3DSound", m_3d_sound);
@@ -308,6 +310,8 @@ void CConfigApp::WriteRegisterSettings() const
SetIniBool(dict, "isle:Full Screen", m_full_screen);
SetIniBool(dict, "isle:Wide View Angle", m_wide_view_angle);
+ SetIniInt(dict, "isle:Transition Type", m_transition_type);
+
SetIniBool(dict, "isle:3DSound", m_3d_sound);
SetIniBool(dict, "isle:Music", m_music);
diff --git a/CONFIG/config.h b/CONFIG/config.h
index a621655a..dffc2b6c 100644
--- a/CONFIG/config.h
+++ b/CONFIG/config.h
@@ -65,6 +65,7 @@ public:
int m_display_bit_depth;
bool m_flip_surfaces;
bool m_full_screen;
+ int m_transition_type;
bool m_3d_video_ram;
bool m_wide_view_angle;
bool m_3d_sound;
diff --git a/CONFIG/res/maindialog.ui b/CONFIG/res/maindialog.ui
index c2d429ae..66e2b52e 100644
--- a/CONFIG/res/maindialog.ui
+++ b/CONFIG/res/maindialog.ui
@@ -57,7 +57,7 @@
false
- Qt::AlignCenter
+ Qt::AlignmentFlag::AlignCenter
@@ -129,10 +129,10 @@
Save Path:
- Qt::PlainText
+ Qt::TextFormat::PlainText
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+ Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter
@@ -162,10 +162,10 @@
Data Path:
- Qt::PlainText
+ Qt::TextFormat::PlainText
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+ Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter
@@ -241,7 +241,7 @@
Maximum LOD
- Qt::AlignCenter
+ Qt::AlignmentFlag::AlignCenter
-
@@ -262,10 +262,10 @@
false
- Qt::Horizontal
+ Qt::Orientation::Horizontal
- QSlider::TicksBothSides
+ QSlider::TickPosition::TicksBothSides
10
@@ -316,7 +316,7 @@
Maximum Actors (5..40)
- Qt::AlignCenter
+ Qt::AlignmentFlag::AlignCenter
-
@@ -340,10 +340,10 @@
false
- Qt::Horizontal
+ Qt::Orientation::Horizontal
- QSlider::TicksBothSides
+ QSlider::TickPosition::TicksBothSides
5
@@ -402,6 +402,61 @@
+ -
+
+
+ Transition Type
+
+
+
+ -
+
+
+ Sets the transition effect to be used in game.
+
+
+ Idle - Broken
+
+
+
+
+
-
+
+ Idle - Broken
+
+
+ -
+
+ No Animation
+
+
+ -
+
+ Dissolve
+
+
+ -
+
+ Mosaic
+
+
+ -
+
+ Wipe Down
+
+
+ -
+
+ Windows
+
+
+ -
+
+ Unknown - Broken
+
+
+
+
-
@@ -417,7 +472,7 @@
- Qt::AlignCenter
+ Qt::AlignmentFlag::AlignCenter
false
@@ -453,7 +508,7 @@
Direct 3D Devices
- Qt::AlignCenter
+ Qt::AlignmentFlag::AlignCenter
@@ -475,13 +530,13 @@
- QAbstractItemView::NoEditTriggers
+ QAbstractItemView::EditTrigger::NoEditTriggers
true
- QAbstractItemView::SelectRows
+ QAbstractItemView::SelectionBehavior::SelectRows