diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index c3c18de..752ba42 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -90,7 +90,7 @@ jobs: ios: name: iOS - runs-on: macos-12 + runs-on: macos-13 steps: - name: Clone @@ -204,7 +204,7 @@ jobs: macos: name: macOS - runs-on: macos-11 + runs-on: macos-13 steps: - name: Clone diff --git a/CMakeLists.txt b/CMakeLists.txt index bd50a9e..b9b0aa6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,10 +6,10 @@ set(EXECUTABLE_NAME fallout-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() diff --git a/src/game/anim.h b/src/game/anim.h index 13b4de4..f8a9a7c 100644 --- a/src/game/anim.h +++ b/src/game/anim.h @@ -91,7 +91,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*, void*); diff --git a/src/game/object_types.h b/src/game/object_types.h index 66a6de9..a9376dd 100644 --- a/src/game/object_types.h +++ b/src/game/object_types.h @@ -29,7 +29,7 @@ enum { OBJ_TYPE_COUNT, }; -#define FID_TYPE(value) ((value)&0xF000000) >> 24 +#define FID_TYPE(value) ((value) & 0xF000000) >> 24 #define PID_TYPE(value) (value) >> 24 #define SID_TYPE(value) (value) >> 24