More fiddlin'

obsidian-level-maker · Jun 8, 2024 · 2cd261e · 2cd261e
1 parent 921e284
commit 2cd261e
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 11 deletions.
diff --git a/source_files/obsidian_main/m_addons.cc b/source_files/obsidian_main/m_addons.cc
@@ -181,6 +181,8 @@ void VFS_ScanForPresets() {
         }
     }
 
+    PHYSFS_freeList(got_names);
+
     if (all_presets.size() == 0) {
         LogPrintf("DONE (none found)\n");
     } else {
@@ -229,6 +231,8 @@ void VFS_ScanForAddons() {
         }
     }
 
+    PHYSFS_freeList(got_names);
+
     if (all_addons.size() == 0) {
         LogPrintf("DONE (none found)\n");
     } else {

diff --git a/source_files/obsidian_main/m_lua.cc b/source_files/obsidian_main/m_lua.cc
@@ -343,12 +343,6 @@ static bool scan_dir_process_name(const std::string &name,
     return false; /* NOT REACHED */
 }
 
-struct scan_dir_nocase_CMP {
-    inline bool operator()(std::string_view A, std::string_view B) const {
-        return StringCompare(A, B) < 0;
-    }
-};
-
 // LUA: scan_directory(dir, match) --> list
 //
 // Note: 'match' parameter must be of the form "*" or "*.xxx"
@@ -385,10 +379,6 @@ int gui_scan_directory(lua_State *L) {
 
     PHYSFS_freeList(got_names);
 
-    // sort into alphabetical order [ Note: not unicode aware ]
-
-    std::sort(list.begin(), list.end(), scan_dir_nocase_CMP());
-
     // create the list of filenames / dirnames
 
     lua_newtable(L);

diff --git a/source_files/obsidian_main/m_lua.h b/source_files/obsidian_main/m_lua.h
@@ -22,6 +22,7 @@
 #ifndef __SCRIPTING_HEADER__
 #define __SCRIPTING_HEADER__
 
+#include <stdint.h>
 #include <string>
 #include <vector>
 

diff --git a/source_files/obsidian_main/main.cc b/source_files/obsidian_main/main.cc
@@ -352,7 +352,7 @@ void Determine_WorkingPath() {
 #ifdef _WIN32
     home_dir = PHYSFS_getBaseDir();
 #else
-    home_dir = PHYSFS_getUserDir();
+    home_dir = PHYSFS_getPrefDir(NULL, "Obsidian Level Maker");
 #endif
 }
 

diff --git a/source_files/obsidian_main/sys_debug.cc b/source_files/obsidian_main/sys_debug.cc
@@ -19,6 +19,7 @@
 //
 //------------------------------------------------------------------------
 
+#include <ctime>
 #include <fstream>
 #include <iostream>
 #include "headers.h"