Merge pull request #267 from thobbsinteractive/merge-of-dev-to-master

Merge of dev to master

.github/workflows/linux64bit.yml

@@ -30,6 +30,8 @@ jobs:
         libpng-dev libpng++-dev \
         libz-dev libgtest-dev \
         libboost-system-dev \
+        libspdlog-dev \
+        rapidjson-dev \
         -o APT::Immediate-Configure=0
         
     - name: cmake release

.github/workflows/msbuild.yml

@@ -26,32 +26,15 @@ jobs:
         fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
     - name: Add MSBuild to PATH
       uses: microsoft/setup-msbuild@v1
+
+    - name: Restore vcpkg packages
+      working-directory: ${{env.GITHUB_WORKSPACE}}
+      run: vcpkg integrate install
 
     - name: Restore NuGet packages
       working-directory: ${{env.GITHUB_WORKSPACE}}
       run: nuget restore remc2.sln
 
-    - name: Build libpng dependency ${{matrix.BUILD_CONFIGURATION}} ${{matrix.BUILD_PLATFORM}}
-      working-directory: ${{env.GITHUB_WORKSPACE}}
-      run: msbuild /m /p:Configuration=${{matrix.BUILD_CONFIGURATION}} /p:PlatformTarget=${{matrix.BUILD_PLATFORM}} /p:Platform=${{matrix.BUILD_PLATFORM}} ${{env.SOLUTION_FILE_PATH}}/libpng2/libpng-master/projects/vstudio2017/vstudio.sln
-
-
-    - name: Build sdl2 static dependency ${{matrix.BUILD_CONFIGURATION}} ${{matrix.BUILD_PLATFORM}}
-      working-directory: ${{env.GITHUB_WORKSPACE}}
-      run: msbuild /m /p:Configuration=${{matrix.BUILD_CONFIGURATION}} /p:PlatformTarget=${{matrix.BUILD_PLATFORM}} /p:Platform=${{matrix.BUILD_PLATFORM}} ${{env.SOLUTION_FILE_PATH}}/sdl2/VisualC/SDL.sln
-
-    - name: Build libogg static dependency ${{matrix.BUILD_CONFIGURATION}} ${{matrix.BUILD_PLATFORM}}
-      working-directory: ${{env.GITHUB_WORKSPACE}}
-      run: msbuild /m /p:Configuration=${{matrix.BUILD_CONFIGURATION}} /p:PlatformTarget=${{matrix.BUILD_PLATFORM}} /p:Platform=${{matrix.BUILD_PLATFORM}} ${{env.SOLUTION_FILE_PATH}}/libogg/win32/VS2015/libogg_static.sln
-
-    - name: Build libvorbis static dependency ${{matrix.BUILD_CONFIGURATION}} ${{matrix.BUILD_PLATFORM}}
-      working-directory: ${{env.GITHUB_WORKSPACE}}
-      run: msbuild /m /p:Configuration=${{matrix.BUILD_CONFIGURATION}} /p:PlatformTarget=${{matrix.BUILD_PLATFORM}} /p:Platform=${{matrix.BUILD_PLATFORM}} ${{env.SOLUTION_FILE_PATH}}/libvorbis/win32/VS2010/vorbis_static.sln
-
-    - name: Build sdl_mixer static dependency ${{matrix.BUILD_CONFIGURATION}} ${{matrix.BUILD_PLATFORM}}
-      working-directory: ${{env.GITHUB_WORKSPACE}}
-      run: msbuild /m /p:Configuration=${{matrix.BUILD_CONFIGURATION}} /p:PlatformTarget=${{matrix.BUILD_PLATFORM}} /p:Platform=${{matrix.BUILD_PLATFORM}} ${{env.SOLUTION_FILE_PATH}}/sdl2_mixer/VisualC/SDL_mixer.sln
-
     - name: Build ${{matrix.BUILD_CONFIGURATION}} ${{matrix.BUILD_PLATFORM}}
       working-directory: ${{env.GITHUB_WORKSPACE}}
       run: msbuild /m /p:Configuration=${{matrix.BUILD_CONFIGURATION}} /p:PlatformTarget=${{matrix.BUILD_PLATFORM}} /p:Platform=${{matrix.BUILD_PLATFORM}} ${{env.SOLUTION_FILE_PATH}}/remc2.sln

.gitignore

@@ -49,6 +49,7 @@ remc2-test/Debug
 **/music-ogg
 **/config.ini
 **/BufferOut
+**/vcpkg_installed
 /build*
 flatpak/build-dir
 .flatpak*
@@ -247,3 +248,4 @@ tags
 /libvorbis/win32/VS2010/Win32/Debug/libvorbis_static.lib
 /libvorbis/win32/VS2010/x64/Debug/libvorbisfile_static.lib
 /libvorbis/win32/VS2010/x64/Debug/libvorbis_static.lib
+remc2-editor/log-editor.txt

Install Guide.txt

@@ -1,10 +1,11 @@
 -- Install Guide for GOG Edition --
 1. Purchase a copy of Magic Carpet 2 from GOG here: https://www.gog.com/game/magic_carpet_2_the_netherworlds
-2. Install the Game.
-3. Extract the contents of this Zip Archive to your Game Directory, 
-4. In the "Extract" folder run extract-GOG-CD.bat. The CD Data will now be copied to a directory called "CD_Files"
-5. Run remc2.exe
-6. Any errors will be output to "log.txt"
+2. Install the Game
+3. Extract the contents of this Zip Archive to your Game Directory E.g. "C:\Program Files (x86)\GOG Galaxy\Games\Magic Carpet 2"
+4. Edit the config.ini file. Change "gameFolder = NETHERW" to "gameFolder = GAME/NETHERW"
+5. In the "Extract" folder run extract-GOG-CD.bat. The CD Data will now be copied to a directory called "CD_Files"
+6. Run "remc2.exe"
+7. Any errors will be output to "log.txt"
 
 Original Source Code is Copyright 1995 Bullfrog Productions
 

README.md

@@ -6,7 +6,7 @@ Tomas has done amazing work, not only reverse engineering this code but updating
 ## Download the latest Alpha Here (now with MSI Installer)! ##
 https://github.com/thobbsinteractive/magic-carpet-2-hd/releases/latest
 
-### Install Guide for GOG Edition ###
+### Install Guide for GOG Edition or from Magic Carpet CD ###
 #### Windows ####
 - 1: Purchase a copy of Magic Carpet 2 from GOG here: https://www.gog.com/game/magic_carpet_2_the_netherworlds
 - 2: Install the Game.
@@ -22,6 +22,9 @@ To jump to a selected Level use:</br>
 To run a level you have created using the editor:</br>
 --custom_level "[Path to .mc2 file]"</br>
 
+## For more information on Magic Carpet 2 ##
+Moburma has been tirelessly working to document cut levels, level data structures and missing graphics at: https://tcrf.net/Magic_Carpet_2:_The_Netherworlds
+
 ## My intention is to make a patch for Magic Carpet 1 and 2 (GOG editions) that initially will:
 - Add more screen resolution options
 - Increase draw distance
@@ -40,20 +43,15 @@ To run a level you have created using the editor:</br>
 ## Steps: to build and run this code
 
 ### Windows:
-- 1: Pull the development branch
-- 2: You can build either x64 or 32 bit versions
-- 3: Open the Solution file "\libpng2\libpng-master\projects\vstudio2017\vstudio.sln" and build it in your prefered config (x64, x86). This builds the libpn2 library
-- 4: Open the Solution file "\sdl2\VisualC\SDL.sln" and build it in your prefered config (x64, x86). This builds the SDL2 library
-- 5: Open the Solution file "\sdl2_mixer\VisualC\SDL_mixer.sln" and build it in your prefered config (x64, x86). This builds the SDL_Mixer library
-- 6: Open the Solution file "\libogg\win32\VS2015\libogg_static.sln" and build it in your prefered config (x64, x86). This builds the libogg library
-- 7: Open the Solution file "\libvorbis\win32\VS2010\vorbis_static.sln" and build it in your prefered config (x64, x86). This builds the vorbis library
-- 8: Close that solution and open "remc2.sln" in your prefered config (x64, x86).
-- 9: Build the code
-- 10: Purchase a copy of Magic Carpet 2 from GOG here: https://www.gog.com/game/magic_carpet_2_the_netherworlds
-- 11: Install the Game. Copy the "NETHERW" directory to "remc2\Debug\GAME" Folder
-- 12: Copy the "Extract" folder to your Game Directory, run extract-GOG-CD.bat. The CD Data will now be copied to a directory called "CD_Files" in the "Extract" directory
-- 13: Move "CD_Files" directory into the "remc2\Debug" Folder
-- 14: Run
+- 1: Install the latest version of Visual Studio 2022 Community. Ensure you install [vcpkg](https://devblogs.microsoft.com/cppblog/vcpkg-is-now-included-with-visual-studio/)
+- 2: Pull the development branch
+- 3: Open "remc2.sln", you can build either x64 or 32 bit versions
+- 4: Build the code
+- 5: Purchase a copy of Magic Carpet 2 from GOG here: https://www.gog.com/game/magic_carpet_2_the_netherworlds
+- 6: Install the Game. Copy the "NETHERW" directory to "remc2\Debug\" Folder
+- 7: Copy the "Extract" folder to your Game Directory, run extract-GOG-CD.bat. The CD Data will now be copied to a directory called "CD_Files" in the "Extract" directory
+- 8: Move "CD_Files" directory into the "remc2\Debug" Folder
+- 9: Run
 
 ### Linux: