Obsidian unstable -> stable

modules/ui_arch.lua

@@ -73,6 +73,13 @@ function UI_ARCH.setup(self)
       end
     end
   end
+  if type(float_size) == "string" then -- Use upper bound for Mix It Up, Progressive, and Episodic level sizes
+    SEED_W = PARAM.float_level_upper_bound
+    SEED_H = PARAM.float_level_upper_bound
+  else
+    SEED_W = PARAM.float_size
+    SEED_H = PARAM.float_size
+  end
 end
 
 OB_MODULES["ui_arch"] =

scripts/grower.lua

@@ -1014,8 +1014,8 @@ function Grower_decide_extents()
     LEVEL.has_streets = false
   end
 
-  assert(int(LEVEL.map_W) < SEED_W)
-  assert(int(LEVEL.map_H) < SEED_H)
+  assert(int(LEVEL.map_W) <= SEED_W)
+  assert(int(LEVEL.map_H) <= SEED_H)
 
   local map_x1 = 1 + int((SEED_W - LEVEL.map_W) / 2)
   local map_y1 = 1 + int((SEED_H - LEVEL.map_H) / 2)

scripts/level.lua

@@ -254,8 +254,8 @@ function Episode_determine_map_sizes()
       H = W
     end
 
-    assert(W + 4 <= SEED_W)
-    assert(H + 4 <= SEED_H)
+    assert(W <= SEED_W)
+    assert(H <= SEED_H)
 
     LEV.map_W = W
     LEV.map_H = H

source_files/fltk_src/CMake/options.cmake

@@ -331,7 +331,7 @@ option (OPTION_USE_SYSTEM_ZLIB "use system zlib" ON)
 
 if (OPTION_USE_SYSTEM_ZLIB AND NOT MSYS)
   include (FindZLIB)
-endif (OPTION_USE_SYSTEM_ZLIB)
+endif (OPTION_USE_SYSTEM_ZLIB AND NOT MSYS)
 
 if (ZLIB_FOUND)
   set (FLTK_ZLIB_LIBRARIES ${ZLIB_LIBRARIES})

source_files/obsidian_src/m_dialog.cc

@@ -282,9 +282,7 @@ std::filesystem::path DLG_OutputFilename(const char *ext, const char *preset) {
         src_name.replace_extension(ext);
 
         // check if exists, ask for confirmation
-        std::ifstream fp{src_name};
-        if (fp) {
-            fp.close();
+        if (std::filesystem::exists(src_name)) {
             if (!fl_choice("%s", fl_cancel, fl_ok, NULL,
                            Fl_Native_File_Chooser::file_exists_message)) {
                 return "";  // cancelled

source_files/obsidian_src/main.cc

@@ -266,8 +266,8 @@ void Determine_InstallDir(const char *argv0) {
         install_dir.clear();
     }
 
-    if (Verify_InstallDir(GetExecutablePath())) {
-        install_dir = GetExecutablePath();
+    if (Verify_InstallDir(std::filesystem::current_path().c_str())) {
+        install_dir = std::filesystem::current_path();
     }
 #endif
 

source_files/obsidian_src/ui_widgets.cc

@@ -608,6 +608,26 @@ UI_ModuleDropDown::UI_ModuleDropDown(int x, int y, int w, int h)
 
 UI_ModuleDropDown::~UI_ModuleDropDown() {}
 
+int UI_ModuleDropDown::handle(int event) {
+  switch (event) {
+  case FL_RELEASE:
+    if (box()) {
+        if (value()) {
+            copy_label("  ");
+            redraw();
+            copy_label("@-2line");
+        } else {
+            copy_label(" ");
+            redraw();
+            copy_label("@-2+");
+        }
+        redraw();
+    }
+  default:
+    return Fl_Button::handle(event);
+  }
+}
+
 // Custom draw function to use the checkmark style regardless of box type and
 // respect custom colors
 void UI_ModuleDropDown::draw() {
@@ -619,13 +639,6 @@ void UI_ModuleDropDown::draw() {
 
     draw_box(FL_FLAT_BOX, x() + dx, y() + dy, W, W, WINDOW_BG);
     lx = dx + W + 2;
-    copy_label("  ");
-    redraw();
-    if (value()) {
-        copy_label("@-2line");
-    } else {
-        copy_label("@-2+");
-    }
     draw_label(x() + lx, y(), w() - lx - bx, h());
 }
 

source_files/obsidian_src/ui_widgets.h

@@ -282,6 +282,8 @@ class UI_ModuleDropDown : public Fl_Check_Button {
 
    private:
     void draw();
+
+    int handle(int event);
 };
 
 #endif /* __UI_WIDGETS_H__ */