Merge branch 'development' into merge-of-dev-to-master

.github/workflows/linux64bit.yml

@@ -13,10 +13,10 @@ env:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
           submodules: recursive
 
@@ -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
+        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-6.1.0.4477-linux-x64/bin/sonar-scanner -Dsonar.host.url=https://sonarcloud.io

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)
 
 
 ################################################################################

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]

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"),

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(

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(

remc2/CMakeLists.txt

@@ -214,6 +214,7 @@ if (UNIX)
         findfirst
         ADLMIDI_static
         Boost::system
+		fmt::fmt
     )
     target_link_directories(${PROJECT_NAME} PUBLIC
     )

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