Merge branch 'main' into feature/code-readibility-3

Author: phobos2077

.github/workflows/ci-build.yml

@@ -63,7 +63,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: os/android/app/.cxx
-          key: android-cmake-v1
+          key: android-cmake-v2
 
       - name: Setup signing config
         if: env.KEYSTORE_FILE_BASE64 != '' && env.KEYSTORE_PROPERTIES_FILE_BASE64 != ''
@@ -79,18 +79,22 @@ jobs:
         run: |
           cd os/android
           ./gradlew assembleDebug
-
+      
+      - name: Prepare artifacts
+        run: |
+          mkdir artifacts/
+          cp os/android/app/build/outputs/apk/debug/app-debug.apk artifacts/fallout2-ce-debug.apk
+      
       - name: Upload
         uses: actions/upload-artifact@v4
         with:
-          name: fallout2-ce-debug.apk
-          path: os/android/app/build/outputs/apk/debug/app-debug.apk
+          name: artifact-fallout2-ce-debug.apk
+          path:  artifacts/*
           retention-days: 7
 
   ios:
     name: iOS
-
-    runs-on: macos-12
+    runs-on: macos-14
 
     steps:
       - name: Clone
@@ -100,7 +104,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: build
-          key: ios-cmake-v2
+          key: ios-cmake-v4
 
       - name: Configure
         run: |
@@ -123,14 +127,17 @@ jobs:
 
       - name: Pack
         run: |
+          mkdir artifacts/
           cd build
           cpack -C RelWithDebInfo
-
+          cd ../
+          cp build/fallout2-ce.ipa artifacts/fallout2-ce.ipa
+      
       - name: Upload
         uses: actions/upload-artifact@v4
         with:
-          name: fallout2-ce.ipa
-          path:  build/fallout2-ce.ipa
+          name: artifact-fallout2-ce.ipa
+          path:  artifacts/*
           retention-days: 7
 
   linux:
@@ -167,7 +174,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: build
-          key: linux-${{ matrix.arch }}-cmake-v1
+          key: linux-${{ matrix.arch }}-cmake-v3
 
       - name: Configure (x86)
         if: matrix.arch == 'x86'
@@ -192,18 +199,22 @@ jobs:
             --build build \
             -j $(nproc) \
             # EOL
-
+      
+      - name: Prepare artifacts
+        run: |
+          mkdir artifacts/
+          cp build/fallout2-ce artifacts/fallout2-ce-linux-${{ matrix.arch }}
+      
       - name: Upload
         uses: actions/upload-artifact@v4
         with:
-          name: fallout2-ce-linux-${{ matrix.arch }}
-          path:  build/fallout2-ce
+          name: artifact-fallout2-ce-linux-${{ matrix.arch }}
+          path:  artifacts/*
           retention-days: 7
 
   macos:
     name: macOS
-
-    runs-on: macos-11
+    runs-on: macos-14
 
     steps:
       - name: Clone
@@ -213,7 +224,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: build
-          key: macos-cmake-v4
+          key: macos-cmake-v6
 
       - name: Configure
         run: |
@@ -233,14 +244,17 @@ jobs:
 
       - name: Pack
         run: |
+          mkdir artifacts/
           cd build
           cpack -C RelWithDebInfo
-
+          cd ../
+          cp "build/Fallout II Community Edition.dmg" "artifacts/Fallout II Community Edition.dmg"
+      
       - name: Upload
         uses: actions/upload-artifact@v4
         with:
-          name: fallout2-ce-macos.dmg
-          path:  build/Fallout II Community Edition.dmg
+          name: artifact-fallout2-ce-macos.dmg
+          path:  artifacts/*
           retention-days: 7
 
   windows:
@@ -265,7 +279,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: build
-          key: windows-${{ matrix.arch }}-cmake-v1
+          key: windows-${{ matrix.arch }}-cmake-v2
 
       - name: Configure
         run: |
@@ -281,10 +295,60 @@ jobs:
             --build build \
             --config RelWithDebInfo \
             # EOL
-
+      
+      - name: Prepare artifacts
+        run: |
+          mkdir artifacts/
+          cp build/RelWithDebInfo/fallout2-ce.exe artifacts/fallout2-ce-windows-${{ matrix.arch }}.exe
+      
       - name: Upload
         uses: actions/upload-artifact@v4
         with:
-          name: fallout2-ce-windows-${{ matrix.arch }}
-          path:  build/RelWithDebInfo/fallout2-ce.exe
+          name: artifact-fallout2-ce-windows-${{ matrix.arch }}
+          path:  artifacts/*
           retention-days: 7
+  
+  release:
+    name: Release Continuous build
+    runs-on: ubuntu-latest
+    needs: [android, ios, linux, macos, windows]
+    permissions: write-all
+    steps:
+      - name: Fetch artifacts
+        if: ${{ always() && github.ref == 'refs/heads/main' && github.event_name == 'push' }}
+        uses: actions/download-artifact@v4.1.7
+        with:
+          path: artifacts/
+
+      - name: Remove old release
+        if: ${{ always() && github.ref == 'refs/heads/main' && github.event_name == 'push' }}
+        uses: dev-drprasad/delete-tag-and-release@v0.2.1
+        with:
+          delete_release: true
+          tag_name: continious
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Repackage binaries and allow GitHub to process removed release for few seconds
+        if: ${{ always() && github.ref == 'refs/heads/main' && github.event_name == 'push' }}
+        continue-on-error: true
+        run: |
+          cd artifacts/
+          for i in artifact-*; do
+            mv "$i"/* .
+            rm -rf "$i"
+          done
+          ls -R .
+          cd ../
+          sleep 20s
+
+      - name: Upload new release
+        if: ${{ always() && github.ref == 'refs/heads/main' && github.event_name == 'push' }}
+        uses: softprops/action-gh-release@v0.1.15
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          files: artifacts/*
+          tag_name: continious
+          draft: false
+          prerelease: true
+          name: Fallout2-CE Continuous Build

.github/workflows/release.yml

@@ -59,7 +59,7 @@ jobs:
   ios:
     name: iOS
 
-    runs-on: macos-12
+    runs-on: macos-14
 
     steps:
       - name: Clone

.gitignore

@@ -391,3 +391,6 @@ FodyWeavers.xsd
 # CMake
 /out
 /build
+
+# versioning header
+src/platform/git_version.h

CMakeLists.txt

@@ -6,10 +6,10 @@ set(EXECUTABLE_NAME fallout2-ce)
 
 if(APPLE)
     if(IOS)
-        set(CMAKE_OSX_DEPLOYMENT_TARGET "11" CACHE STRING "")
+        set(CMAKE_OSX_DEPLOYMENT_TARGET "12" CACHE STRING "")
         set(CMAKE_OSX_ARCHITECTURES "arm64" CACHE STRING "")
     else()
-        set(CMAKE_OSX_DEPLOYMENT_TARGET "10.11" CACHE STRING "")
+        set(CMAKE_OSX_DEPLOYMENT_TARGET "10.13" CACHE STRING "")
         set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64" CACHE STRING "")
     endif()
 endif()
@@ -26,6 +26,9 @@ else()
     add_executable(${EXECUTABLE_NAME} WIN32 MACOSX_BUNDLE)
 endif()
 
+# Git Info
+include("cmake/gitver.cmake")
+
 target_sources(${EXECUTABLE_NAME} PUBLIC
     "src/actions.cc"
     "src/actions.h"
@@ -225,6 +228,8 @@ target_sources(${EXECUTABLE_NAME} PUBLIC
     "src/text_object.h"
     "src/tile.cc"
     "src/tile.h"
+    "src/tile_hires_stencil.cc"
+    "src/tile_hires_stencil.h"
     "src/trait_defs.h"
     "src/trait.cc"
     "src/trait.h"
@@ -361,8 +366,7 @@ if(APPLE)
 endif()
 
 add_subdirectory("third_party/fpattern")
-target_link_libraries(${EXECUTABLE_NAME} ${FPATTERN_LIBRARY})
-target_include_directories(${EXECUTABLE_NAME} PRIVATE ${FPATTERN_INCLUDE_DIR})
+target_link_libraries(${EXECUTABLE_NAME} fpattern::fpattern)
 
 if((NOT ${CMAKE_SYSTEM_NAME} MATCHES "Linux") AND (NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") AND (NOT ${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD"))
     add_subdirectory("third_party/zlib")

README.md

@@ -8,7 +8,7 @@ There is also [Fallout Community Edition](https://github.com/alexbatalov/fallout
 
 ## Installation
 
-You must own the game to play. Purchase your copy on [GOG](https://www.gog.com/game/fallout_2) or [Steam](https://store.steampowered.com/app/38410). Download latest [release](https://github.com/alexbatalov/fallout2-ce/releases) or build from source. You can also check latest [debug](https://github.com/alexbatalov/fallout2-ce/actions) build intended for testers.
+You must own the game to play. Purchase your copy on [GOG](https://www.gog.com/game/fallout_2), [Epic Games](https://store.epicgames.com/p/fallout-2) or [Steam](https://store.steampowered.com/app/38410). Download latest [release](https://github.com/alexbatalov/fallout2-ce/releases) or build from source. You can also check latest [debug](https://github.com/alexbatalov/fallout2-ce/actions) build intended for testers.
 
 ### Windows
 

cmake/gitver.cmake

@@ -0,0 +1,48 @@
+# Get author name
+execute_process(
+    COMMAND git log -1 --pretty=format:%an
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    OUTPUT_VARIABLE AUTHOR
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+
+# Get current branch
+execute_process(
+    COMMAND git branch --show-current
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    OUTPUT_VARIABLE BRANCH
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+
+# Get hash of the latest commit
+execute_process(
+    COMMAND git log --pretty=format:%h -n 1
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    OUTPUT_VARIABLE HASH
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+
+# Get last tag
+execute_process(
+    COMMAND git describe --tags --abbrev=0
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    OUTPUT_VARIABLE LATEST_TAG
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+
+# Get date of the latest commit
+execute_process(
+    COMMAND git log -1 --date=format:"%b %d %Y %H:%M:%S" --pretty=format:%cd
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    OUTPUT_VARIABLE DATE
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+
+# Define a variable for CI_BUILD
+set(CI_BUILD 0)
+
+# Create git_version.h file
+configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/platform/git_version.h.in
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/platform/git_version.h
+)

src/animation.h

@@ -92,7 +92,7 @@ typedef enum AnimationType {
     LAST_SF_DEATH_ANIM = ANIM_FALL_FRONT_BLOOD_SF,
 } AnimationType;
 
-#define FID_ANIM_TYPE(value) ((value)&0xFF0000) >> 16
+#define FID_ANIM_TYPE(value) ((value) & 0xFF0000) >> 16
 
 // Signature of animation callback accepting 2 parameters.
 typedef int(AnimationCallback)(void* a1, void* a2);

src/art.cc

@@ -525,7 +525,7 @@ int artCopyFileName(int objectType, int id, char* dest)
 {
     ArtListDescription* ptr;
 
-    if (objectType < OBJ_TYPE_ITEM && objectType >= OBJ_TYPE_COUNT) {
+    if (objectType < OBJ_TYPE_ITEM || objectType >= OBJ_TYPE_COUNT) {
         return -1;
     }
 
@@ -633,11 +633,11 @@ char* artBuildFilePath(int fid)
     v5 = (v2 & 0xF000) >> 12;
     type = FID_TYPE(v2);
 
-    if (v3 >= gArtListDescriptions[type].fileNamesLength) {
+    if (type < OBJ_TYPE_ITEM || type >= OBJ_TYPE_COUNT) {
         return nullptr;
     }
 
-    if (type < OBJ_TYPE_ITEM || type >= OBJ_TYPE_COUNT) {
+    if (v3 >= gArtListDescriptions[type].fileNamesLength) {
         return nullptr;
     }