Merge branch 'develop' into adv-beta

DFHack · Dec 1, 2024 · ed940b6 · ed940b6
2 parents 89c5b11 + cc6d735
commit ed940b6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/.github/workflows/steam-deploy.yml b/.github/workflows/steam-deploy.yml
@@ -74,13 +74,15 @@ jobs:
           rm ${name}-depot.tar.bz2
           cd ..
         done
+    - name: Get short SHA of commit
+      run: echo "SHORT_SHA=`echo ${{ github.sha }} | cut -c1-8`" >>$GITHUB_ENV
     - name: Steam deploy
       uses: game-ci/steam-deploy@v3
       with:
         username: ${{ secrets.STEAM_USERNAME }}
         configVdf: ${{ secrets.STEAM_CONFIG_VDF}}
         appId: 2346660
-        buildDescription: ${{ github.event.inputs && github.event.inputs.version || github.ref_name }}
+        buildDescription: ${{ github.event.inputs && github.event.inputs.version || github.ref_name }} (${{ env.SHORT_SHA }})
         rootPath: .
         depot1Path: common-depot
         depot2Path: win64-depot

diff --git a/library/xml b/library/xml
diff --git a/plugins/infinite-sky.cpp b/plugins/infinite-sky.cpp
@@ -233,12 +233,14 @@ struct infinitesky_options {
 };
 static const struct_field_info infinitesky_options_fields[] = {
     {struct_field_info::PRIMITIVE, "help", offsetof(infinitesky_options, help), &df::identity_traits<bool>::identity, 0, 0},
-    {struct_field_info::PRIMITIVE, "n", offsetof(infinitesky_options, n), &df::identity_traits<int32_t>::identity, 0, 0}
+    {struct_field_info::PRIMITIVE, "n", offsetof(infinitesky_options, n), &df::identity_traits<int32_t>::identity, 0, 0},
+    {struct_field_info::END}
 };
 struct_identity infinitesky_options::_identity{sizeof(infinitesky_options), &df::allocator_fn<infinitesky_options>, NULL, "infinitesky_options", NULL, infinitesky_options_fields};
 
 command_result infiniteSky(color_ostream &out,
                            std::vector<std::string> &parameters) {
+    CoreSuspender suspend;
     if (!Core::getInstance().isMapLoaded() || !World::isFortressMode()) {
         out.printerr("Cannot run %s without a loaded fort.\n", plugin_name);
         return CR_FAILURE;

diff --git a/plugins/luasocket.cpp b/plugins/luasocket.cpp
@@ -103,7 +103,7 @@ static int lua_server_accept(int id,bool fail_on_timeout)
     CActiveSocket* sock=cur_server.socket->Accept();
     if(!sock)
     {
-        handle_error(sock->GetSocketError(),!fail_on_timeout);
+        handle_error(cur_server.socket->GetSocketError(),!fail_on_timeout);
         return 0;
     }
     else