[pull] develop from OpenRCT2:develop

.github/ISSUE_TEMPLATE/bug_report.md

@@ -11,7 +11,7 @@ assignees: ''
   Fill in the placeholders below. Delete any headings and placeholders that you do not fill in.
 -->
 **OS:** [e.g. Windows 10]
-**Version:** [e.g. 0.3.0]
+**Version:** [e.g. 0.3.2]
 **Commit/Build:** [e.g. 426e106]
 
 <!-- Explanation of the issue -->

.github/workflows/ci.yml

@@ -4,10 +4,11 @@ env:
   OPENRCT2_BUILD_SERVER: GitHub
   OPENRCT2_ORG_TOKEN: ${{ secrets.OPENRCT2_ORG_TOKEN }}
   BACKTRACE_IO_TOKEN: ${{ secrets.BACKTRACE_IO_TOKEN }}
-  OPENRCT2_VERSION: 0.3.0
+  OPENRCT2_VERSION: 0.3.2
 jobs:
   lint-commit:
     name: Lint Commit Message
+    if: github.event_name == 'pull_request'
     runs-on: ubuntu-latest
     env:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -24,7 +25,7 @@ jobs:
     name: Check code formatting
     runs-on: ubuntu-latest
     container:
-      image: openrct2/openrct2-build:0.2.4-format
+      image: openrct2/openrct2-build:0.3.1-format
     steps:
       - name: Checkout
         uses: actions/checkout@v1
@@ -80,7 +81,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [check-code-formatting]
     container:
-      image: openrct2/openrct2-build:0.2.4-mingw
+      image: openrct2/openrct2-build:0.3.1-mingw
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -90,6 +91,26 @@ jobs:
           mkdir bin && cd bin
           cmake .. -G Ninja -DCMAKE_TOOLCHAIN_FILE=../CMakeLists_mingw.txt -DCMAKE_BUILD_TYPE=MinSizeRel -DDISABLE_IPO=on -DFORCE32=on -DBUILD_SHARED_LIBS=ON -DENABLE_SCRIPTING=OFF
           ninja -k0
+  windows-mingw-nt51:
+    name: Windows (win32, WinNT5.1) using mingw
+    runs-on: ubuntu-latest
+    needs: [check-code-formatting]
+    container:
+      image: openrct2/openrct2-build:0.3.1-mingw
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Build OpenRCT2
+        run: |
+          sudo su
+          mkdir bin && cd bin
+          cmake .. -G Ninja -DCMAKE_TOOLCHAIN_FILE=../CMakeLists_mingw.txt -DCMAKE_BUILD_TYPE=MinSizeRel -DDISABLE_IPO=on -DDISABLE_HTTP=Off -DFORCE32=on -DENABLE_SCRIPTING=ON -DCMAKE_CXX_FLAGS="-Wno-error=cast-function-type -Wno-error=unused-function" -DSTATIC=on -DMINGW_TARGET_NT5_1=ON
+          ninja -k0
+      - name: Upload artifacts (CI)
+        uses: actions/upload-artifact@v2-preview
+        with:
+          name: "OpenRCT2-NT5.1"
+          path: bin/openrct2.exe
   macos:
     name: macOS
     runs-on: macos-latest
@@ -124,7 +145,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [check-code-formatting]
     container:
-      image: openrct2/openrct2-build:0.2.4-bionic
+      image: openrct2/openrct2-build:0.3.1-bionic
     steps:
       - name: Checkout
         uses: actions/checkout@v1
@@ -159,7 +180,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [check-code-formatting]
     container:
-      image: openrct2/openrct2-build:0.2.4-bionic32
+      image: openrct2/openrct2-build:0.3.1-bionic32
     steps:
       - name: Checkout
         uses: actions/checkout@v1
@@ -199,7 +220,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [check-code-formatting]
     container:
-      image: openrct2/openrct2-build:0.2.4-bionic
+      image: openrct2/openrct2-build:0.3.1-bionic
     steps:
       - name: Checkout
         uses: actions/checkout@v1
@@ -208,7 +229,7 @@ jobs:
         run: . scripts/setenv -q && get-discord-rpc
       - name: Build OpenRCT2
         shell: bash
-        run: . scripts/setenv -q && build -DCMAKE_BUILD_TYPE=Release -DAPPIMAGE=ON
+        run: . scripts/setenv -q && build -DCMAKE_BUILD_TYPE=Release -DAPPIMAGE=ON -DOPENRCT2_USE_CCACHE=off
       - name: Build AppImage
         shell: bash
         run: . scripts/setenv -q && build-appimage
@@ -257,19 +278,19 @@ jobs:
     runs-on: ubuntu-latest
     needs: [check-code-formatting]
     container:
-      image: openrct2/openrct2-build:0.2.4-bionic
+      image: openrct2/openrct2-build:0.3.1-bionic
     steps:
       - name: Checkout
         uses: actions/checkout@v1
       - name: Build OpenRCT2
         shell: bash
-        run: . scripts/setenv && build -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=Debug -DDISABLE_NETWORK=ON -DDISABLE_HTTP_TWITCH=ON -DDISABLE_OPENGL=ON
+        run: . scripts/setenv && build -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=Debug -DDISABLE_NETWORK=ON -DDISABLE_HTTP=ON -DDISABLE_OPENGL=ON
   android:
     name: Android
     runs-on: ubuntu-latest
     needs: [check-code-formatting]
     container:
-      image: openrct2/openrct2-build:0.2.4-android
+      image: openrct2/openrct2-build:0.3.1-android
     steps:
       - name: Checkout
         uses: actions/checkout@v1

.vscode/c_cpp_properties.json

@@ -6,7 +6,7 @@
                 "/usr/include",
                 "/usr/local/include",
                 "${workspaceRoot}",
-                "${workspaceRoot}/src"
+                "${workspaceRoot}/src/**"
             ],
             "defines": [],
             "intelliSenseMode": "clang-x64",

CMakeLists.txt

@@ -41,11 +41,11 @@ set(CMAKE_MACOSX_RPATH 1)
 set(TITLE_SEQUENCE_URL  "https://github.com/OpenRCT2/title-sequences/releases/download/v0.1.2c/title-sequences.zip")
 set(TITLE_SEQUENCE_SHA1 "304d13a126c15bf2c86ff13b81a2f2cc1856ac8d")
 
-set(OBJECTS_URL  "https://github.com/OpenRCT2/objects/releases/download/v1.0.16/objects.zip")
-set(OBJECTS_SHA1 "ea8be00a7ab5a1e9369277f8f59f487bc588eb6a")
+set(OBJECTS_URL  "https://github.com/OpenRCT2/objects/releases/download/v1.0.20/objects.zip")
+set(OBJECTS_SHA1 "151424d24b1d49a167932b58319bedaa6ec368e9")
 
-set(REPLAYS_URL  "https://github.com/OpenRCT2/replays/releases/download/v0.0.17/replays.zip")
-set(REPLAYS_SHA1 "8DD6D8DBDB1EA50ABCB3A1FB55D2800E13486F44")
+set(REPLAYS_URL  "https://github.com/OpenRCT2/replays/releases/download/v0.0.23/replays.zip")
+set(REPLAYS_SHA1 "AC67B93731B6246A31D9A8B01A6CA12AE98AE0D1")
 
 option(FORCE32 "Force 32-bit build. It will add `-m32` to compiler flags.")
 option(WITH_TESTS "Build tests")
@@ -67,6 +67,9 @@ option(DISABLE_NETWORK "Disable multiplayer functionality. Mainly for testing.")
 option(DISABLE_TTF "Disable support for TTF provided by freetype2.")
 option(ENABLE_LIGHTFX "Enable lighting effects." ON)
 option(ENABLE_SCRIPTING "Enable script / plugin support." ON)
+if (MINGW)
+    option(MINGW_TARGET_NT5_1 "Use only NT5.1 APIs and libraries." OFF)
+endif ()
 
 option(DISABLE_GUI "Don't build GUI. (Headless only.)")
 
@@ -76,6 +79,13 @@ if (FORCE32)
     set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${TARGET_M}")
 endif ()
 
+if (MINGW_TARGET_NT5_1)
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_WIN32_WINNT=0x501")
+	if (STATIC)
+	    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DCURL_STATICLIB=1 -DZIP_STATIC=1 -static")
+	endif ()
+endif ()
+
 if (PORTABLE OR WIN32)
     set(CMAKE_INSTALL_LIBDIR "${CMAKE_INSTALL_BINDIR}")
     set(CMAKE_INSTALL_RPATH "$ORIGIN")
@@ -222,6 +232,7 @@ else ()
     ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS CXX_WARN_LOGICAL_OP -Wlogical-op)
     ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS CXX_WARN_RANGE_LOOP_ANALYSIS -Wrange-loop-analysis)
     ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS CXX_WARN_TAUTOLOGICAL_ZERO_COMPARE -Wtautological-unsigned-zero-compare)
+    ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS CXX_WARN_OLD_STYLE_CAST -Wold-style-cast)
     ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS CXX_WNO_CLOBBERED -Wno-clobbered)
     # Disabled due to problems compiling OpenSSL on macOS.
     # ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS CXX_WARN_DOCUMENTATION -Wdocumentation)
@@ -279,6 +290,10 @@ if (CXX_WARN_SUGGEST_FINAL_METHODS)
    add_definitions(-D__WARN_SUGGEST_FINAL_METHODS__)
 endif ()
 
+if (MINGW)
+   add_definitions(-fstack-protector-strong)
+endif ()
+
 # Include sub-projects
 include("${ROOT_DIR}/src/openrct2/CMakeLists.txt" NO_POLICY_SCOPE)
 include("${ROOT_DIR}/src/openrct2-cli/CMakeLists.txt" NO_POLICY_SCOPE)

CMakeLists_mingw.txt

@@ -23,5 +23,3 @@ SET(CMAKE_FIND_ROOT_PATH ${TARGET_ENVIRONMENT})
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-
-# INCLUDE_DIRECTORIES(${ORCTLIBS_INCLUDE} ${JANSSON_INCLUDE})