From 68fe13898dbac8bf2f330d48a71ac2d8e2135b9c Mon Sep 17 00:00:00 2001 From: T1ti Date: Mon, 28 Feb 2022 22:48:41 +0100 Subject: [PATCH 1/2] fix spinboxes in map details --- .../ui/tools/MapCreationWizard/Ui/MapCreationWizard.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/noggit/ui/tools/MapCreationWizard/Ui/MapCreationWizard.cpp b/src/noggit/ui/tools/MapCreationWizard/Ui/MapCreationWizard.cpp index 99e02559..5ac2494d 100644 --- a/src/noggit/ui/tools/MapCreationWizard/Ui/MapCreationWizard.cpp +++ b/src/noggit/ui/tools/MapCreationWizard/Ui/MapCreationWizard.cpp @@ -148,6 +148,7 @@ MapCreationWizard::MapCreationWizard(std::shared_ptr pro _area_table_id = new QSpinBox(_map_settings); map_settings_layout->addRow("Area ID:",_area_table_id); + _area_table_id->setMaximum(INT32_MAX); _map_desc_alliance = new LocaleDBCEntry(_map_settings); map_settings_layout->addRow("Description (Alliance):",_map_desc_alliance); @@ -157,6 +158,7 @@ MapCreationWizard::MapCreationWizard(std::shared_ptr pro _loading_screen = new QSpinBox(_map_settings); map_settings_layout->addRow("Loading screen:",_loading_screen); + _loading_screen->setMaximum(INT32_MAX); _minimap_icon_scale = new QDoubleSpinBox(_map_settings); map_settings_layout->addRow("Minimap icon scale:",_minimap_icon_scale); @@ -166,12 +168,17 @@ MapCreationWizard::MapCreationWizard(std::shared_ptr pro _corpse_x = new QDoubleSpinBox(_map_settings); map_settings_layout->addRow("Corpse X:",_corpse_x); + _corpse_x->setMinimum(-17066.66656); // map size + _corpse_x->setMaximum(17066.66656); _corpse_y = new QDoubleSpinBox(_map_settings); map_settings_layout->addRow("Corpse Y:",_corpse_y); + _corpse_y->setMinimum(-17066.66656); // map size + _corpse_y->setMaximum(17066.66656); _time_of_day_override = new QSpinBox(_map_settings); _time_of_day_override->setMinimum(-1); + _time_of_day_override->setMaximum(2880); // Time Values from 0 to 2880 where each number represents a half minute from midnight to midnight _time_of_day_override->setValue(-1); map_settings_layout->addRow("Daytime override:",_time_of_day_override); @@ -190,9 +197,11 @@ MapCreationWizard::MapCreationWizard(std::shared_ptr pro map_settings_layout->addRow("Expansion:",_expansion_id); _raid_offset = new QSpinBox(_map_settings); + _raid_offset->setMaximum(INT32_MAX); map_settings_layout->addRow("Raid offset:",_raid_offset); _max_players = new QSpinBox(_map_settings); + _max_players->setMaximum(INT32_MAX); map_settings_layout->addRow("Max players:",_max_players); // Bottom row From 3f8c49cf174c5e1a1993a225c9af3024c46f6174 Mon Sep 17 00:00:00 2001 From: T1ti Date: Mon, 28 Feb 2022 23:51:00 +0100 Subject: [PATCH 2/2] fix --- .../ui/tools/MapCreationWizard/Ui/MapCreationWizard.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/noggit/ui/tools/MapCreationWizard/Ui/MapCreationWizard.cpp b/src/noggit/ui/tools/MapCreationWizard/Ui/MapCreationWizard.cpp index 5ac2494d..d296af29 100644 --- a/src/noggit/ui/tools/MapCreationWizard/Ui/MapCreationWizard.cpp +++ b/src/noggit/ui/tools/MapCreationWizard/Ui/MapCreationWizard.cpp @@ -148,7 +148,7 @@ MapCreationWizard::MapCreationWizard(std::shared_ptr pro _area_table_id = new QSpinBox(_map_settings); map_settings_layout->addRow("Area ID:",_area_table_id); - _area_table_id->setMaximum(INT32_MAX); + _area_table_id->setMaximum(std::numeric_limits::max()); _map_desc_alliance = new LocaleDBCEntry(_map_settings); map_settings_layout->addRow("Description (Alliance):",_map_desc_alliance); @@ -158,7 +158,7 @@ MapCreationWizard::MapCreationWizard(std::shared_ptr pro _loading_screen = new QSpinBox(_map_settings); map_settings_layout->addRow("Loading screen:",_loading_screen); - _loading_screen->setMaximum(INT32_MAX); + _loading_screen->setMaximum(std::numeric_limits::max()); _minimap_icon_scale = new QDoubleSpinBox(_map_settings); map_settings_layout->addRow("Minimap icon scale:",_minimap_icon_scale); @@ -197,11 +197,11 @@ MapCreationWizard::MapCreationWizard(std::shared_ptr pro map_settings_layout->addRow("Expansion:",_expansion_id); _raid_offset = new QSpinBox(_map_settings); - _raid_offset->setMaximum(INT32_MAX); + _raid_offset->setMaximum(std::numeric_limits::max()); map_settings_layout->addRow("Raid offset:",_raid_offset); _max_players = new QSpinBox(_map_settings); - _max_players->setMaximum(INT32_MAX); + _max_players->setMaximum(std::numeric_limits::max()); map_settings_layout->addRow("Max players:",_max_players); // Bottom row