From 0aeb2789ea59548bc4b5d45764149e7c903d191b Mon Sep 17 00:00:00 2001 From: Timothy Hobbs Date: Thu, 4 Jul 2024 22:26:01 +0200 Subject: [PATCH 01/14] fix: remove change that was culling sprite on the left too much (cherry picked from commit d9b7ffaa759c165ed5775b847c2579043e33fea9) --- remc2/engine/GameRenderHD.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/remc2/engine/GameRenderHD.cpp b/remc2/engine/GameRenderHD.cpp index 93dd8125c..ee97df8c9 100644 --- a/remc2/engine/GameRenderHD.cpp +++ b/remc2/engine/GameRenderHD.cpp @@ -4303,7 +4303,7 @@ void GameRenderHD::DrawSprite_41BD3(uint32 a1) for (i = v159; i; i--) { v133 = v165[1]; - if ((v133 > 0) && (*v165 > 0)) + if (v133 > 0) { //adress 2237d3 From 056136f1fb27d0f89bc7a6db38865c8cfa25acd6 Mon Sep 17 00:00:00 2001 From: Timothy Hobbs Date: Wed, 17 Jul 2024 21:58:27 +0200 Subject: [PATCH 02/14] fix: attempted to update sonar scan version --- .github/workflows/linux64bit.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/linux64bit.yml b/.github/workflows/linux64bit.yml index 8d74a1047..0899c79da 100644 --- a/.github/workflows/linux64bit.yml +++ b/.github/workflows/linux64bit.yml @@ -61,6 +61,6 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} run: | - curl -L -O https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.4.0.2170-linux.zip - unzip sonar-scanner-cli-4.4.0.2170-linux.zip - sonar-scanner-4.4.0.2170-linux/bin/sonar-scanner -Dsonar.host.url=https://sonarcloud.io \ No newline at end of file + curl -L -O https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-6.1.0.4477-linux.zip + unzip sonar-scanner-cli-6.1.0.4477-linux.zip + sonar-scanner-cli-6.1.0.4477-linux/bin/sonar-scanner -Dsonar.host.url=https://sonarcloud.io \ No newline at end of file From 916eaff665fd8d1b13ba7db339d6eb8287a1c4da Mon Sep 17 00:00:00 2001 From: Timothy Hobbs Date: Wed, 17 Jul 2024 22:19:46 +0200 Subject: [PATCH 03/14] fix: update of Ubuntu for github workflow --- .github/workflows/linux64bit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linux64bit.yml b/.github/workflows/linux64bit.yml index 0899c79da..5fe711051 100644 --- a/.github/workflows/linux64bit.yml +++ b/.github/workflows/linux64bit.yml @@ -13,7 +13,7 @@ env: jobs: build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 From ed6109fb670d8866558f4b46b94cfe452ba3c576 Mon Sep 17 00:00:00 2001 From: Timothy Hobbs Date: Wed, 17 Jul 2024 22:26:55 +0200 Subject: [PATCH 04/14] temp: test comments --- .github/workflows/linux64bit.yml | 40 ++++++++++++++++---------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/linux64bit.yml b/.github/workflows/linux64bit.yml index 5fe711051..cd69036af 100644 --- a/.github/workflows/linux64bit.yml +++ b/.github/workflows/linux64bit.yml @@ -34,26 +34,26 @@ jobs: rapidjson-dev \ -o APT::Immediate-Configure=0 - - name: cmake release - run: | - cd ${{ github.workspace }} - mkdir build_release - cd build_release - cmake -DCMAKE_BUILD_TYPE=Release -DUSE_64_BIT=True -DUNIT_TESTS=True -DGITHUB_CI_COMPATIBILITY_PATH="${{env.GITHUB_CI_COMPATIBILITY_PATH}}" .. - - - name: make release - run: | - cd ${{ github.workspace }} - cd build_release - curl -L -O https://sonarcloud.io/static/cpp/build-wrapper-linux-x86.zip - unzip -o build-wrapper-linux-x86.zip - build-wrapper-linux-x86/build-wrapper-linux-x86-64 --out-dir build_wrapper_output make - - - name: run unit tests - run: | - cd ${{ github.workspace }} - cd build_release/remc2-unit-test - ./remc2-unit-test + #- name: cmake release + # run: | + # cd ${{ github.workspace }} + # mkdir build_release + # cd build_release + # cmake -DCMAKE_BUILD_TYPE=Release -DUSE_64_BIT=True -DUNIT_TESTS=True -DGITHUB_CI_COMPATIBILITY_PATH="${{env.GITHUB_CI_COMPATIBILITY_PATH}}" .. + # + #- name: make release + # run: | + # cd ${{ github.workspace }} + # cd build_release + # curl -L -O https://sonarcloud.io/static/cpp/build-wrapper-linux-x86.zip + # unzip -o build-wrapper-linux-x86.zip + # build-wrapper-linux-x86/build-wrapper-linux-x86-64 --out-dir build_wrapper_output make + # + #- name: run unit tests + # run: | + # cd ${{ github.workspace }} + # cd build_release/remc2-unit-test + # ./remc2-unit-test - name: sonarcloud scan if: github.repository_owner == 'thobbsinteractive' From 9b81c15bfc7101d836e3fa69c1b9645b542682f5 Mon Sep 17 00:00:00 2001 From: Timothy Hobbs Date: Wed, 17 Jul 2024 22:35:21 +0200 Subject: [PATCH 05/14] fix: corrected sonar-scanner path --- .github/workflows/linux64bit.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/linux64bit.yml b/.github/workflows/linux64bit.yml index cd69036af..d98510082 100644 --- a/.github/workflows/linux64bit.yml +++ b/.github/workflows/linux64bit.yml @@ -61,6 +61,6 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} run: | - curl -L -O https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-6.1.0.4477-linux.zip - unzip sonar-scanner-cli-6.1.0.4477-linux.zip - sonar-scanner-cli-6.1.0.4477-linux/bin/sonar-scanner -Dsonar.host.url=https://sonarcloud.io \ No newline at end of file + curl -L -O https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-6.1.0.4477-linux-x64.zip + unzip sonar-scanner-cli-6.1.0.4477-linux-x64.zip + sonar-scanner-cli-6.1.0.4477-linux-x64/bin/sonar-scanner -Dsonar.host.url=https://sonarcloud.io \ No newline at end of file From 8af255869c8acd36c69c64bd218b8afc4fc873bd Mon Sep 17 00:00:00 2001 From: Timothy Hobbs Date: Wed, 17 Jul 2024 22:41:08 +0200 Subject: [PATCH 06/14] fix: removed comments --- .github/workflows/linux64bit.yml | 40 ++++++++++++++++---------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/linux64bit.yml b/.github/workflows/linux64bit.yml index d98510082..a3795ec7d 100644 --- a/.github/workflows/linux64bit.yml +++ b/.github/workflows/linux64bit.yml @@ -34,26 +34,26 @@ jobs: rapidjson-dev \ -o APT::Immediate-Configure=0 - #- name: cmake release - # run: | - # cd ${{ github.workspace }} - # mkdir build_release - # cd build_release - # cmake -DCMAKE_BUILD_TYPE=Release -DUSE_64_BIT=True -DUNIT_TESTS=True -DGITHUB_CI_COMPATIBILITY_PATH="${{env.GITHUB_CI_COMPATIBILITY_PATH}}" .. - # - #- name: make release - # run: | - # cd ${{ github.workspace }} - # cd build_release - # curl -L -O https://sonarcloud.io/static/cpp/build-wrapper-linux-x86.zip - # unzip -o build-wrapper-linux-x86.zip - # build-wrapper-linux-x86/build-wrapper-linux-x86-64 --out-dir build_wrapper_output make - # - #- name: run unit tests - # run: | - # cd ${{ github.workspace }} - # cd build_release/remc2-unit-test - # ./remc2-unit-test + - name: cmake release + run: | + cd ${{ github.workspace }} + mkdir build_release + cd build_release + cmake -DCMAKE_BUILD_TYPE=Release -DUSE_64_BIT=True -DUNIT_TESTS=True -DGITHUB_CI_COMPATIBILITY_PATH="${{env.GITHUB_CI_COMPATIBILITY_PATH}}" .. + + - name: make release + run: | + cd ${{ github.workspace }} + cd build_release + curl -L -O https://sonarcloud.io/static/cpp/build-wrapper-linux-x86.zip + unzip -o build-wrapper-linux-x86.zip + build-wrapper-linux-x86/build-wrapper-linux-x86-64 --out-dir build_wrapper_output make + + - name: run unit tests + run: | + cd ${{ github.workspace }} + cd build_release/remc2-unit-test + ./remc2-unit-test - name: sonarcloud scan if: github.repository_owner == 'thobbsinteractive' From 3aa7a47803574d702c32869de9eadc73e5bd1b83 Mon Sep 17 00:00:00 2001 From: Timothy Hobbs Date: Fri, 19 Jul 2024 20:12:01 +0200 Subject: [PATCH 07/14] fix: updated linux build to use ubutu-runners group and latest checkout and node-version --- .github/workflows/linux64bit.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/linux64bit.yml b/.github/workflows/linux64bit.yml index a3795ec7d..9e8d46eb0 100644 --- a/.github/workflows/linux64bit.yml +++ b/.github/workflows/linux64bit.yml @@ -13,11 +13,13 @@ env: jobs: build: - runs-on: ubuntu-22.04 + runs-on: + group: ubuntu-runners steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: + node-version: '20' submodules: recursive - name: install dependencies From 8b1c4863cc3bb506d8b6d825adaa23ddb8e41ffe Mon Sep 17 00:00:00 2001 From: Timothy Hobbs Date: Fri, 19 Jul 2024 20:14:00 +0200 Subject: [PATCH 08/14] fix: hopefully fixed script --- .github/workflows/linux64bit.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/linux64bit.yml b/.github/workflows/linux64bit.yml index 9e8d46eb0..6ed57610b 100644 --- a/.github/workflows/linux64bit.yml +++ b/.github/workflows/linux64bit.yml @@ -19,7 +19,6 @@ jobs: steps: - uses: actions/checkout@v4 with: - node-version: '20' submodules: recursive - name: install dependencies From 0f082f86baa50d0448a402302525a873e4b4a1f0 Mon Sep 17 00:00:00 2001 From: Timothy Hobbs Date: Fri, 19 Jul 2024 20:17:08 +0200 Subject: [PATCH 09/14] fix: another fix to linux build script --- .github/workflows/linux64bit.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/linux64bit.yml b/.github/workflows/linux64bit.yml index 6ed57610b..5e7f0bf20 100644 --- a/.github/workflows/linux64bit.yml +++ b/.github/workflows/linux64bit.yml @@ -13,12 +13,12 @@ env: jobs: build: - runs-on: - group: ubuntu-runners + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 with: + node-version: '20' submodules: recursive - name: install dependencies From fb7744714c0d42840ec44aa2885bcfe4e051918c Mon Sep 17 00:00:00 2001 From: Timothy Hobbs Date: Fri, 19 Jul 2024 20:19:14 +0200 Subject: [PATCH 10/14] fix: removed node version as it is not needed --- .github/workflows/linux64bit.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/linux64bit.yml b/.github/workflows/linux64bit.yml index 5e7f0bf20..3da2fbd8f 100644 --- a/.github/workflows/linux64bit.yml +++ b/.github/workflows/linux64bit.yml @@ -18,7 +18,6 @@ jobs: steps: - uses: actions/checkout@v4 with: - node-version: '20' submodules: recursive - name: install dependencies From 2cd9d23057415993adcfe7057973e2876878d44d Mon Sep 17 00:00:00 2001 From: Timothy Hobbs Date: Sat, 20 Jul 2024 11:55:22 +0200 Subject: [PATCH 11/14] fix: Link against fmt for spdlog on Linux --- CMakeLists.txt | 1 + remc2/CMakeLists.txt | 1 + 2 files changed, 2 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 21f3e3b46..043a047eb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,6 +25,7 @@ find_package(SDL2_ttf REQUIRED) find_package(SDL2_image REQUIRED) find_package(PNG REQUIRED) find_package(Boost REQUIRED system) +find_package(fmt REQUIRED) ################################################################################ diff --git a/remc2/CMakeLists.txt b/remc2/CMakeLists.txt index e5b6af2ce..c9997d4f6 100644 --- a/remc2/CMakeLists.txt +++ b/remc2/CMakeLists.txt @@ -214,6 +214,7 @@ if (UNIX) findfirst ADLMIDI_static Boost::system + fmt::fmt ) target_link_directories(${PROJECT_NAME} PUBLIC ) From 9695aac63f3df864ce84306bf9e091e55dc9f396 Mon Sep 17 00:00:00 2001 From: Timothy Hobbs Date: Sat, 20 Jul 2024 16:42:21 +0200 Subject: [PATCH 12/14] fix: added fmt to unit test and regression test builds --- remc2-regression-test/CMakeLists.txt | 1 + remc2-unit-test/CMakeLists.txt | 1 + 2 files changed, 2 insertions(+) diff --git a/remc2-regression-test/CMakeLists.txt b/remc2-regression-test/CMakeLists.txt index d86c89884..a89970ee7 100644 --- a/remc2-regression-test/CMakeLists.txt +++ b/remc2-regression-test/CMakeLists.txt @@ -120,6 +120,7 @@ target_link_libraries(${PROJECT_NAME} PUBLIC findfirst ADLMIDI_static Boost::system + fmt::fmt ) add_compile_definitions(COMPILE_FOR_64BIT) gtest_add_tests( diff --git a/remc2-unit-test/CMakeLists.txt b/remc2-unit-test/CMakeLists.txt index 15bc15e30..c5488e5ea 100644 --- a/remc2-unit-test/CMakeLists.txt +++ b/remc2-unit-test/CMakeLists.txt @@ -128,6 +128,7 @@ target_link_libraries(${PROJECT_NAME} PUBLIC findfirst ADLMIDI_static Boost::system + fmt::fmt ) add_compile_definitions(COMPILE_FOR_64BIT) gtest_add_tests( From 33c242c4010ace3c78663cefcd57026f04d24373 Mon Sep 17 00:00:00 2001 From: Timothy Hobbs Date: Sun, 21 Jul 2024 21:54:48 +0200 Subject: [PATCH 13/14] fix: fixed sonar-scanner path --- .github/workflows/linux64bit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linux64bit.yml b/.github/workflows/linux64bit.yml index 3da2fbd8f..7583ee409 100644 --- a/.github/workflows/linux64bit.yml +++ b/.github/workflows/linux64bit.yml @@ -63,4 +63,4 @@ jobs: run: | curl -L -O https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-6.1.0.4477-linux-x64.zip unzip sonar-scanner-cli-6.1.0.4477-linux-x64.zip - sonar-scanner-cli-6.1.0.4477-linux-x64/bin/sonar-scanner -Dsonar.host.url=https://sonarcloud.io \ No newline at end of file + sonar-scanner-6.1.0.4477-linux-x64/bin/sonar-scanner -Dsonar.host.url=https://sonarcloud.io \ No newline at end of file From 6816eea8ab5cce0577ea11d8afd6727ba98734c8 Mon Sep 17 00:00:00 2001 From: Timothy Hobbs Date: Mon, 22 Jul 2024 21:48:48 +0200 Subject: [PATCH 14/14] fix: fixed msi --- config.ini | 2 +- remc2-installer/Program.cs | 24 ++++++++++++++++++++---- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/config.ini b/config.ini index 9a28ceccb..045e5f68a 100644 --- a/config.ini +++ b/config.ini @@ -11,7 +11,7 @@ skipintro = true hqsound = true ; sound is transfered from 11025,8bit,mono to 44000,16bit,stereo oggmusic = true ; using AWE32 record of MIDI music, for this function is hqsound auto enabled oggmusicFolder = music-ogg ; directory with music, you can rewrite with own music too. Path is relative to .exe -oggmusicalternative = true ; use original and alternative sound tracks +oggmusicalternative = false ; use original and alternative sound tracks fixspeedsound = false ; set true when sounds play double speed [graphics] diff --git a/remc2-installer/Program.cs b/remc2-installer/Program.cs index 1319b7e4a..c9fe0a47d 100644 --- a/remc2-installer/Program.cs +++ b/remc2-installer/Program.cs @@ -65,18 +65,34 @@ static void Main() } }, #if WIN64 - new File(@"..\x64\Release\libfreetype-6.dll"), - new File(@"..\x64\Release\libpng16-16.dll"), + new File(@"..\x64\Release\brotlicommon.dll"), + new File(@"..\x64\Release\brotlidec.dll"), + new File(@"..\x64\Release\bz2.dll"), + new File(@"..\x64\Release\fmt.dll"), + new File(@"..\x64\Release\freetype.dll"), + new File(@"..\x64\Release\libpng16.dll"), + new File(@"..\x64\Release\ogg.dll"), new File(@"..\x64\Release\SDL2.dll"), new File(@"..\x64\Release\SDL2_image.dll"), + new File(@"..\x64\Release\SDL2_mixer.dll"), new File(@"..\x64\Release\SDL2_ttf.dll"), + new File(@"..\x64\Release\vorbis.dll"), + new File(@"..\x64\Release\vorbisfile.dll"), new File(@"..\x64\Release\zlib1.dll"), #else - new File(@"..\Release\libfreetype-6.dll"), - new File(@"..\Release\libpng16-16.dll"), + new File(@"..\Release\brotlicommon.dll"), + new File(@"..\Release\brotlidec.dll"), + new File(@"..\Release\bz2.dll"), + new File(@"..\Release\fmt.dll"), + new File(@"..\Release\freetype.dll"), + new File(@"..\Release\libpng16.dll"), + new File(@"..\Release\ogg.dll"), new File(@"..\Release\SDL2.dll"), new File(@"..\Release\SDL2_image.dll"), + new File(@"..\Release\SDL2_mixer.dll"), new File(@"..\Release\SDL2_ttf.dll"), + new File(@"..\Release\vorbis.dll"), + new File(@"..\Release\vorbisfile.dll"), new File(@"..\Release\zlib1.dll"), #endif new File(@"Extract.bat"),