From 7c6db1640a63de9442ec9f8a11dc40f21c27ecc4 Mon Sep 17 00:00:00 2001
From: VoxelTek <53562267+VoxelTek@users.noreply.github.com>
Date: Wed, 13 Aug 2025 17:03:31 +1000
Subject: [PATCH] Fix debug, improve `isle-config`
---
CONFIG/AboutDlg.cpp | 3 ---
CONFIG/MainDlg.cpp | 34 +++++++++++++++++-----------------
CONFIG/res/about.ui | 9 ++++++---
ISLE/isleapp.cpp | 8 ++++----
ISLE/isleapp.h | 2 +-
ISLE/isledebug.cpp | 4 ++--
6 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/CONFIG/AboutDlg.cpp b/CONFIG/AboutDlg.cpp
index a853ee52..651b382b 100644
--- a/CONFIG/AboutDlg.cpp
+++ b/CONFIG/AboutDlg.cpp
@@ -7,12 +7,9 @@
DECOMP_SIZE_ASSERT(CDialog, 0x60)
DECOMP_SIZE_ASSERT(CAboutDialog, 0x60)
-// FIXME: disable dialog resizing
-
// FUNCTION: CONFIG 0x00403c20
CAboutDialog::CAboutDialog() : QDialog()
{
m_ui = new Ui::AboutDialog;
m_ui->setupUi(this);
- layout()->setSizeConstraint(QLayout::SetFixedSize);
}
diff --git a/CONFIG/MainDlg.cpp b/CONFIG/MainDlg.cpp
index a1a07cf9..73a85ab3 100644
--- a/CONFIG/MainDlg.cpp
+++ b/CONFIG/MainDlg.cpp
@@ -505,14 +505,15 @@ void CMainDialog::SelectDataPathDialog()
QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks
);
- QDir data_dir = QDir(data_path);
-
- if (data_dir.exists()) {
- currentConfigApp->m_cd_path = data_dir.absolutePath().toStdString();
- data_dir.cd(QString("DATA"));
- data_dir.cd(QString("disk"));
- currentConfigApp->m_base_path = data_dir.absolutePath().toStdString();
- m_modified = true;
+ if (!data_path.isEmpty()) {
+ QDir data_dir = QDir(data_path);
+ if (data_dir.exists()) {
+ currentConfigApp->m_cd_path = data_dir.absolutePath().toStdString();
+ data_dir.cd(QString("DATA"));
+ data_dir.cd(QString("disk"));
+ currentConfigApp->m_base_path = data_dir.absolutePath().toStdString();
+ m_modified = true;
+ }
}
UpdateInterface();
}
@@ -527,11 +528,12 @@ void CMainDialog::SelectSavePathDialog()
QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks
);
- QDir save_dir = QDir(save_path);
-
- if (save_dir.exists()) {
- currentConfigApp->m_save_path = save_dir.absolutePath().toStdString();
- m_modified = true;
+ if (!save_path.isEmpty()) {
+ QDir save_dir = QDir(save_path);
+ if (save_dir.exists()) {
+ currentConfigApp->m_save_path = save_dir.absolutePath().toStdString();
+ m_modified = true;
+ }
}
UpdateInterface();
}
@@ -547,13 +549,11 @@ void CMainDialog::DataPathEdited()
currentConfigApp->m_base_path = data_dir.absolutePath().toStdString();
m_modified = true;
}
-
UpdateInterface();
}
void CMainDialog::SavePathEdited()
{
-
QDir save_dir = QDir(m_ui->savePath->text());
if (save_dir.exists()) {
@@ -606,7 +606,7 @@ void CMainDialog::SelectTexturePathDialog()
QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks
);
- if (data_path.exists(texture_path)) {
+ if (!texture_path.isEmpty() && data_path.exists(texture_path)) {
texture_path = data_path.relativeFilePath(texture_path);
texture_path.prepend(QDir::separator());
currentConfigApp->m_texture_path = texture_path.toStdString();
@@ -623,7 +623,7 @@ void CMainDialog::TexturePathEdited()
if (texture_path.startsWith(QDir::separator())) {
texture_path.remove(0, 1);
}
- if (data_path.exists(texture_path)) {
+ if (data_path.exists(data_path.absoluteFilePath(texture_path))) {
texture_path = data_path.relativeFilePath(texture_path);
texture_path.prepend(QDir::separator());
currentConfigApp->m_texture_path = texture_path.toStdString();
diff --git a/CONFIG/res/about.ui b/CONFIG/res/about.ui
index a716ebc8..ce51ea2a 100644
--- a/CONFIG/res/about.ui
+++ b/CONFIG/res/about.ui
@@ -14,6 +14,9 @@
About Configure LEGO© Island
+
+ QLayout::SizeConstraint::SetFixedSize
+
-
@@ -36,14 +39,14 @@
-
- Configure LEGO Island Version 1.0
+ Configure LEGO Island Version 2.0
-
- Copyright © 1997 mindscape
+ Copyright © 2025
@@ -53,7 +56,7 @@
-
- QDialogButtonBox::Ok
+ QDialogButtonBox::StandardButton::Ok
diff --git a/ISLE/isleapp.cpp b/ISLE/isleapp.cpp
index 1ccc90a8..f2205937 100644
--- a/ISLE/isleapp.cpp
+++ b/ISLE/isleapp.cpp
@@ -1391,12 +1391,12 @@ SDL_AppResult IsleApp::ParseArguments(int argc, char** argv)
consumed = 1;
}
else if (strcmp(argv[i], "--help") == 0) {
- DisplayArgumentHelp();
+ DisplayArgumentHelp(argv[0]);
return SDL_APP_SUCCESS;
}
if (consumed <= 0) {
SDL_Log("Invalid argument(s): %s", argv[i]);
- DisplayArgumentHelp();
+ DisplayArgumentHelp(argv[0]);
return SDL_APP_FAILURE;
}
}
@@ -1404,9 +1404,9 @@ SDL_AppResult IsleApp::ParseArguments(int argc, char** argv)
return SDL_APP_CONTINUE;
}
-void IsleApp::DisplayArgumentHelp()
+void IsleApp::DisplayArgumentHelp(char* execName)
{
- SDL_Log("Usage: isle [options]");
+ SDL_Log("Usage: %s [options]", execName);
SDL_Log("Options:");
SDL_Log(" --ini Set custom path to .ini config");
#ifdef ISLE_DEBUG
diff --git a/ISLE/isleapp.h b/ISLE/isleapp.h
index 66e8e6e1..4d8f811f 100644
--- a/ISLE/isleapp.h
+++ b/ISLE/isleapp.h
@@ -99,7 +99,7 @@ class IsleApp {
const CursorBitmap* m_cursorCurrentBitmap;
char* m_mediaPath;
MxFloat m_cursorSensitivity;
- void DisplayArgumentHelp();
+ void DisplayArgumentHelp(char* execName);
char* m_iniPath;
MxFloat m_maxLod;
diff --git a/ISLE/isledebug.cpp b/ISLE/isledebug.cpp
index 2eca3421..ab3433a5 100644
--- a/ISLE/isledebug.cpp
+++ b/ISLE/isledebug.cpp
@@ -68,10 +68,10 @@ class DebugViewer {
static void InsideBuildingManager()
{
auto buildingManager = Lego()->GetBuildingManager();
- ImGui::Text("nextVariant: %d", buildingManager->m_nextVariant);
+ ImGui::Text("nextVariant: %u", buildingManager->m_nextVariant);
ImGui::Text("m_boundariesDetermined: %d", buildingManager->m_boundariesDetermined);
ImGui::Text("m_hideAfterAnimation: %d", buildingManager->m_hideAfterAnimation);
- ImGui::Text("#Animated Entries", buildingManager->m_numEntries);
+ ImGui::Text("#Animated Entries: %d", buildingManager->m_numEntries);
if (buildingManager->m_numEntries) {
if (ImGui::BeginTable("Animated Entries", 6, ImGuiTableFlags_Borders)) {
ImGui::TableSetupColumn("ROI Name");