Merge branch 'develop' into sdl_console

Author: dhthwy

.gitattributes

@@ -0,0 +1 @@
+docs/changelog.txt merge=union

CMakeLists.txt

@@ -8,7 +8,7 @@ project(dfhack)
 
 # set up versioning.
 set(DF_VERSION "50.14")
-set(DFHACK_RELEASE "r1.1")
+set(DFHACK_RELEASE "r2")
 set(DFHACK_PRERELEASE FALSE)
 
 set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}")

data/init/dfhack.tools.init

@@ -7,7 +7,6 @@
 # Enable system services
 enable buildingplan
 enable burrow
-enable faststart
 enable logistics
 enable overlay
 enable preserve-rooms

depends/lua/include/dfhack_llimits.h

@@ -60,6 +60,7 @@ struct lua_extra_state {
       pthread_mutexattr_init(&attr); \
       pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); \
       pthread_mutex_init(luai_mutex(L), &attr); \
+      pthread_mutexattr_destroy(&attr); \
    } while (0)
 #define luai_userstateclose(L) do { \
       lua_unlock(L); \

docs/about/Removed.rst

@@ -153,6 +153,13 @@ embark-tools
 Replaced by `gui/embark-anywhere`. Other functionality was replaced by the DF
 v50 UI.
 
+.. _faststart:
+
+faststart
+=========
+Sped up the initial DF load sequence. Removed since Bay 12 rewrote the startup
+sequence and it is now sufficiently fast on its own.
+
 .. _fix-armory:
 
 fix-armory

docs/changelog.txt

@@ -51,6 +51,24 @@ Template for new versions:
 
 # Future
 
+## New Tools
+
+## New Features
+
+## Fixes
+
+## Misc Improvements
+
+## Documentation
+
+## API
+
+## Lua
+
+## Removed
+
+# 50.14-r2
+
 ## New Tools
 - `infinite-sky`: (reinstated, renamed from ``infiniteSky``) automatically create new z-levels of sky to build in
 - `forceequip`: (reinstated) forcibly move items into a unit's inventory
@@ -59,7 +77,7 @@ Template for new versions:
 - `tweak`: ``realistic-melting``: change melting return for inorganic armor parts, shields, weapons, trap components and tools to stop smelters from creating metal, bring melt return for adamantine in line with other metals to ~95% of forging cost. wear reduces melt return by 10% per level
 
 ## Fixes
-- Fix mouse clicks bleeding through DFHack windows when clicking in the space between the frame and the window content in resizable windows
+- Fix mouse clicks bleeding through resizable DFHack windows when clicking in the space between the frame and the window content
 - `autobutcher`: don't run a scanning and marking cycle on the first tick of a fortress to allow for all custom configuration to be set first
 - `nestboxes`: don't consider eggs to be infertile just because the mother has left the nest; eggs can still hatch in this situation
 - `timestream`: adjust the incubation counter on fertile eggs so they hatch at the expected time
@@ -75,12 +93,14 @@ Template for new versions:
 - Quickfort blueprint library: ``aquifer_tap`` blueprint now designated at priority 3 and marks the stairway tile below the tap in "blueprint" mode to prevent drips while the drainage pipe is being prepared
 - `preserve-rooms`: automatically release room reservations for captured squad members. we were kidding ourselves with our optimistic kept reservations. they're unlikely to come back : ((
 - `buildingplan`: add value info to item selection dialog (effectively ungrouping items with different values) and add sorting by value
-- `timestream`: reduce CPU utilization
-- `fix/occupancy`: additionally handle the case where tile occupancy doesn't reflect the actual existence of a building
+- `timestream`: improve FPS by a further 10%
+- `fix/occupancy`: additionally handle the case where tile building occupancy needs to be set instead of cleared
+- `orders`: ``orders sort`` now moves orders that are tied to a specific workshop to the top of the list in the global manager orders screen
+- `gui/pathable`: make wagon path to depot representation more robust
 
 ## Documentation
 - Dreamfort: add link to Dreamfort tutorial youtube series: https://www.youtube.com/playlist?list=PLzXx9JcB9oXxmrtkO1y8ZXzBCFEZrKxve
-- The error message that comes up if there is a version mismatch between DF and the installed DFHack now informs you which DF versions are supported by the installed version of DFHack
+- The error message that comes up if there is a version mismatch between DF and DFHack now informs you which DF versions are supported by the installed version of DFHack
 
 ## API
 - ``DFHack::Units``: new function ``setPathGoal``
@@ -92,6 +112,7 @@ Template for new versions:
 
 ## Removed
 - UI focus strings for squad panel flows combined into a single tree: ``dwarfmode/SquadEquipment`` -> ``dwarfmode/Squads/Equipment``, ``dwarfmode/SquadSchedule`` -> ``dwarfmode/Squads/Schedule``
+- `faststart`: removed since the vanilla startup sequence is now sufficiently fast
 
 # 50.14-r1
 

docs/plugins/faststart.rst

@@ -1669,9 +1669,11 @@ bool Core::InitMainThread() {
     // to faciliate the linux symbol discovery process (which runs without any symbols)
     // or if --skip-size-check is discovered on the command line
 
-    if (df::global::global_table && df::global::game &&
-        df::global::game->command_line.original.find("--skip-size-check") == std::string::npos)
+    if (!df::global::global_table || !df::global::game ||
+        df::global::game->command_line.original.find("--skip-size-check") != std::string::npos)
     {
+        std::cerr << "Skipping structure size verification check." << std::endl;
+    } else {
         std::stringstream msg;
         bool gt_error = false;
         static const std::map<const std::string, const size_t> sizechecks{
@@ -1700,6 +1702,8 @@ bool Core::InitMainThread() {
             errorstate = true;
             return false;
         }
+
+        std::cerr << "Structure size verification check passed." << std::endl;
     }
 
     perf_counters.reset();

library/Core.cpp

@@ -11,19 +11,25 @@ DFhackCExport const int32_t dfhooks_priority = 100;
 // and the main event loop is initiated
 DFhackCExport void dfhooks_init() {
     if (getenv("DFHACK_DISABLE")) {
-        fprintf(stdout, "dfhack: DFHACK_DISABLE detected in environment; disabling\n");
+        fprintf(stderr, "dfhack: DFHACK_DISABLE detected in environment; disabling\n");
         disabled = true;
         return;
     }
 
     // we need to init DF globals before we can check the commandline
-    if (!DFHack::Core::getInstance().InitMainThread() || !df::global::game)
+    if (!DFHack::Core::getInstance().InitMainThread() || !df::global::game) {
+        disabled = true;
         return;
+    }
+
     const std::string & cmdline = df::global::game->command_line.original;
     if (cmdline.find("--disable-dfhack") != std::string::npos) {
-        fprintf(stdout, "dfhack: --disable-dfhack specified on commandline; disabling\n");
+        fprintf(stderr, "dfhack: --disable-dfhack specified on commandline; disabling\n");
         disabled = true;
+        return;
     }
+
+    fprintf(stderr, "DFHack pre-init successful.\n");
 }
 
 // called from the main thread after the main event loops exits

library/Hooks.cpp

@@ -22,16 +22,24 @@ using std::vector;
 static DFLibrary *g_sdl_handle = nullptr;
 static DFLibrary *g_sdl_image_handle = nullptr;
 static const vector<string> SDL_LIBS {
-    "SDL2.dll",
+#ifdef WIN32
+    "SDL2.dll"
+#elif defined(_DARWIN)
     "SDL.framework/Versions/A/SDL",
-    "SDL.framework/SDL",
+    "SDL.framework/SDL"
+#else
     "libSDL2-2.0.so.0"
+#endif
 };
 static const vector<string> SDL_IMAGE_LIBS {
-    "SDL2_image.dll",
+#ifdef WIN32
+    "SDL2_image.dll"
+#elif defined(_DARWIN)
     "SDL_image.framework/Versions/A/SDL_image",
-    "SDL_image.framework/SDL_image",
+    "SDL_image.framework/SDL_image"
+#else
     "libSDL2_image-2.0.so.0"
+#endif
 };
 
 SDL_Surface * (*g_IMG_Load)(const char *) = nullptr;