Apply clang-format to submitted files

Use github.head_ref
Merge 153710bb48 into 6f321c7882
2026-07-27 16:47:11 -07:00 · 2025-04-25 17:36:36 +00:00 · 2025-04-25 20:36:14 +03:00 · 2025-04-25 17:32:26 +00:00 · 2025-04-25 20:32:01 +03:00 · 2025-04-25 20:30:34 +03:00
224 changed files with 20276 additions and 13710 deletions
@@ -1,2 +1,3 @@
 BasedOnStyle: WebKit
 AllowShortIfStatementsOnASingleLine: WithoutElse
+FixNamespaceComments: true
@@ -7,6 +7,7 @@
 *.java text eol=lf
 *.json text eol=lf
 *.md text eol=lf
+*.mm text eol=lf
 *.plist text eol=lf
 *.pro text eol=lf
 *.properties text eol=lf
@@ -17,17 +17,17 @@ jobs:

    steps:
      - name: Clone
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4

      - name: Setup Java
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
        with:
          distribution: temurin
          java-version: 11
          cache: gradle

      - name: Cache cmake build
-        uses: actions/cache@v3
+        uses: actions/cache@v4
        with:
          path: os/android/app/.cxx
          key: android-cmake-v1
@@ -51,7 +51,7 @@ jobs:
        run: |
          cd os/android/app/build/outputs/apk/release
          cp app-release.apk fallout2-ce-android.apk
-          gh release upload ${{ github.ref_name }} fallout2-ce-android.apk
+          gh release upload ${{ github.event.release.tag_name }} fallout2-ce-android.apk
          rm fallout2-ce-android.apk
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -59,14 +59,14 @@ jobs:
  ios:
    name: iOS

-    runs-on: macos-11
+    runs-on: macos-14

    steps:
      - name: Clone
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4

      - name: Cache cmake build
-        uses: actions/cache@v3
+        uses: actions/cache@v4
        with:
          path: build
          key: ios-cmake-v1
@@ -75,25 +75,31 @@ jobs:
        run: |
          cmake \
            -B build \
-            -D CMAKE_BUILD_TYPE=RelWithDebInfo \
            -D CMAKE_TOOLCHAIN_FILE=cmake/toolchain/ios.toolchain.cmake \
            -D ENABLE_BITCODE=0 \
            -D PLATFORM=OS64 \
+            -G Xcode \
+            -D CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY='' \
            # EOL

      - name: Build
        run: |
          cmake \
            --build build \
+            --config RelWithDebInfo \
            -j $(sysctl -n hw.physicalcpu) \
-            --target package \
            # EOL

+      - name: Pack
+        run: |
+          cd build
+          cpack -C RelWithDebInfo
+
      - name: Upload
        run: |
          cd build
-          cp fallout2-ce.zip fallout2-ce-ios.ipa
-          gh release upload ${{ github.ref_name }} fallout2-ce-ios.ipa
+          cp fallout2-ce.ipa fallout2-ce-ios.ipa
+          gh release upload ${{ github.event.release.tag_name }} fallout2-ce-ios.ipa
          rm fallout2-ce-ios.ipa
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -112,7 +118,7 @@ jobs:

    steps:
      - name: Clone
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4

      - name: Dependencies (x86)
        if: matrix.arch == 'x86'
@@ -129,7 +135,7 @@ jobs:
          sudo apt install libsdl2-dev zlib1g-dev

      - name: Cache cmake build
-        uses: actions/cache@v3
+        uses: actions/cache@v4
        with:
          path: build
          key: linux-${{ matrix.arch }}-cmake-v1
@@ -162,7 +168,7 @@ jobs:
        run: |
          cd build
          tar -czvf fallout2-ce-linux-${{ matrix.arch }}.tar.gz fallout2-ce
-          gh release upload ${{ github.ref_name }} fallout2-ce-linux-${{ matrix.arch }}.tar.gz
+          gh release upload ${{ github.event.release.tag_name }} fallout2-ce-linux-${{ matrix.arch }}.tar.gz
          rm fallout2-ce-linux-${{ matrix.arch }}.tar.gz
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -174,16 +180,16 @@ jobs:

    steps:
      - name: Clone
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4

      - name: Import code signing certificates
-        uses: apple-actions/import-codesign-certs@v1
+        uses: apple-actions/import-codesign-certs@v2
        with:
          p12-file-base64: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_P12_FILE_BASE64 }}
          p12-password: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_P12_PASSWORD }}

      - name: Cache cmake build
-        uses: actions/cache@v3
+        uses: actions/cache@v4
        with:
          path: build
          key: macos-cmake-v3
@@ -192,41 +198,44 @@ jobs:
        run: |
          cmake \
            -B build \
-            -D CMAKE_BUILD_TYPE=RelWithDebInfo \
-            -D CPACK_BUNDLE_APPLE_CERT_APP="${{ secrets.APPLE_DEVELOPER_CERTIFICATE_IDENTITY }}" \
+            -G Xcode \
+            -D CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY="${{ secrets.APPLE_DEVELOPER_CERTIFICATE_IDENTITY }}" \
+            -D CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_INJECT_BASE_ENTITLEMENTS="NO" \
+            -D CMAKE_XCODE_ATTRIBUTE_OTHER_CODE_SIGN_FLAGS="--options=runtime --timestamp" \
            # EOL

      - name: Build
        run: |
          cmake \
            --build build \
+            --config RelWithDebInfo \
            -j $(sysctl -n hw.physicalcpu) \
-            --target package \
            # EOL

+      - name: Pack
+        run: |
+          cd build
+          cpack -C RelWithDebInfo
+
      - name: Notarize
        run: |
-          brew install mitchellh/gon/gon
-          cat << EOF > config.json
-          {
-            "notarize": {
-              "path": "build/fallout2-ce.dmg",
-              "bundle_id": "$(/usr/libexec/PlistBuddy -c "Print :CFBundleIdentifier" build/fallout2-ce.app/Contents/Info.plist)",
-              "staple": true
-            }
-          }
-          EOF
-          gon config.json
-          rm config.json
-        env:
-          AC_USERNAME: ${{ secrets.APPLE_DEVELOPER_AC_USERNAME }}
-          AC_PASSWORD: ${{ secrets.APPLE_DEVELOPER_AC_PASSWORD }}
+          xcrun notarytool submit \
+            "build/Fallout II Community Edition.dmg" \
+            --apple-id "${{ secrets.APPLE_DEVELOPER_AC_USERNAME }}" \
+            --team-id "${{ secrets.APPLE_DEVELOPER_AC_TEAM }}" \
+            --password "${{ secrets.APPLE_DEVELOPER_AC_PASSWORD }}" \
+            --wait
+
+      - name: Staple
+        run: |
+          xcrun stapler staple \
+            "build/Fallout II Community Edition.dmg"

      - name: Upload
        run: |
          cd build
-          cp fallout2-ce.dmg fallout2-ce-macos.dmg
-          gh release upload ${{ github.ref_name }} fallout2-ce-macos.dmg
+          cp "Fallout II Community Edition.dmg" fallout2-ce-macos.dmg
+          gh release upload ${{ github.event.release.tag_name }} fallout2-ce-macos.dmg
          rm fallout2-ce-macos.dmg
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -247,10 +256,10 @@ jobs:

    steps:
      - name: Clone
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4

      - name: Cache cmake build
-        uses: actions/cache@v3
+        uses: actions/cache@v4
        with:
          path: build
          key: windows-${{ matrix.arch }}-cmake-v1
@@ -274,7 +283,7 @@ jobs:
        run: |
          cd build/RelWithDebInfo
          7z a fallout2-ce-windows-${{ matrix.arch }}.zip fallout2-ce.exe
-          gh release upload ${{ github.ref_name }} fallout2-ce-windows-${{ matrix.arch }}.zip
+          gh release upload ${{ github.event.release.tag_name }} fallout2-ce-windows-${{ matrix.arch }}.zip
          rm fallout2-ce-windows-${{ matrix.arch }}.zip
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -9,6 +9,7 @@
 *.user
 *.userosscache
 *.sln.docstates
+.DS_Store

 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs
@@ -388,6 +389,13 @@ FodyWeavers.xsd
 .idea/
 *.sln.iml

+# VSCode
+.vscode
+
 # CMake
 /out
 /build
+
+# versioning header
+src/platform/git_version.h
+CMakeUserPresets.json
@@ -4,12 +4,12 @@ set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)

 set(EXECUTABLE_NAME fallout2-ce)

-if (APPLE)
+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()
@@ -20,12 +20,17 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED YES)
 set(CMAKE_CXX_EXTENSIONS NO)

-if (ANDROID)
+option(FALLOUT_VENDORED "Use vendored third-party libraries" ON)
+
+if(ANDROID)
    add_library(${EXECUTABLE_NAME} SHARED)
 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"
@@ -140,6 +145,8 @@ target_sources(${EXECUTABLE_NAME} PUBLIC
    "src/loadsave.h"
    "src/main.cc"
    "src/main.h"
+    "src/mainmenu.cc"
+    "src/mainmenu.h"
    "src/map_defs.h"
    "src/map.cc"
    "src/map.h"
@@ -150,8 +157,6 @@ target_sources(${EXECUTABLE_NAME} PUBLIC
    "src/memory.h"
    "src/message.cc"
    "src/message.h"
-    "src/mmx.cc"
-    "src/mmx.h"
    "src/mouse_manager.cc"
    "src/mouse_manager.h"
    "src/mouse.cc"
@@ -197,8 +202,6 @@ target_sources(${EXECUTABLE_NAME} PUBLIC
    "src/scripts.h"
    "src/select_file_list.cc"
    "src/select_file_list.h"
-    "src/selfrun.cc"
-    "src/selfrun.h"
    "src/skill_defs.h"
    "src/skill.cc"
    "src/skill.h"
@@ -225,11 +228,11 @@ 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"
-    "src/vcr.cc"
-    "src/vcr.h"
    "src/version.cc"
    "src/version.h"
    "src/widget.cc"
@@ -253,22 +256,40 @@ target_sources(${EXECUTABLE_NAME} PUBLIC
 target_sources(${EXECUTABLE_NAME} PUBLIC
    "src/audio_engine.cc"
    "src/audio_engine.h"
+    "src/delay.cc"
+    "src/delay.h"
    "src/fps_limiter.cc"
    "src/fps_limiter.h"
    "src/platform_compat.cc"
    "src/platform_compat.h"
    "src/pointer_registry.cc"
    "src/pointer_registry.h"
+    "src/preferences.cc"
+    "src/preferences.h"
    "src/settings.cc"
    "src/settings.h"
    "src/sfall_config.cc"
    "src/sfall_config.h"
+    "src/sfall_ext.cc"
+    "src/sfall_ext.h"
    "src/sfall_global_vars.cc"
    "src/sfall_global_vars.h"
+    "src/sfall_global_scripts.cc"
+    "src/sfall_global_scripts.h"
+    "src/sfall_ini.cc"
+    "src/sfall_ini.h"
+    "src/sfall_kb_helpers.cc"
+    "src/sfall_kb_helpers.h"
    "src/sfall_lists.cc"
    "src/sfall_lists.h"
+    "src/sfall_metarules.cc"
+    "src/sfall_metarules.h"
    "src/sfall_opcodes.cc"
    "src/sfall_opcodes.h"
+    "src/sfall_arrays.cc"
+    "src/sfall_arrays.h"
+    "src/touch.cc"
+    "src/touch.h"
 )

 if(IOS)
@@ -282,11 +303,8 @@ if(WIN32)
    target_compile_definitions(${EXECUTABLE_NAME} PUBLIC
        _CRT_SECURE_NO_WARNINGS
        _CRT_NONSTDC_NO_WARNINGS
-    )
-else()
-    target_compile_definitions(${EXECUTABLE_NAME} PRIVATE
-        $<$<CONFIG:Debug>:_DEBUG>
-        $<$<CONFIG:RelWithDebInfo>:_DEBUG>
+        NOMINMAX
+        WIN32_LEAN_AND_MEAN
    )
 endif()

@@ -296,7 +314,7 @@ if(WIN32)
    )
 endif()

-if (WIN32)
+if(WIN32)
    target_sources(${EXECUTABLE_NAME} PUBLIC
        "os/windows/fallout2-ce.ico"
        "os/windows/fallout2-ce.rc"
@@ -304,37 +322,106 @@ if (WIN32)
 endif()

 if(APPLE)
-    target_sources(${EXECUTABLE_NAME} PUBLIC "os/macos/fallout2-ce.icns")
-    set_source_files_properties("os/macos/fallout2-ce.icns" PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
-
    if(IOS)
-        target_sources(${EXECUTABLE_NAME} PUBLIC "os/ios/LaunchScreen.storyboard")
-        set_source_files_properties("os/ios/LaunchScreen.storyboard" PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
-        set_target_properties(${EXECUTABLE_NAME} PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_SOURCE_DIR}/os/ios/Info.plist")
-        set_target_properties(${EXECUTABLE_NAME} PROPERTIES XCODE_ATTRIBUTE_TARGETED_DEVICE_FAMILY "1,2")
+        set(RESOURCES
+            "os/ios/AppIcon.xcassets"
+            "os/ios/LaunchScreen.storyboard"
+        )
+
+        target_sources(${EXECUTABLE_NAME} PUBLIC ${RESOURCES})
+        set_source_files_properties(${RESOURCES} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
+
+        set_target_properties(${EXECUTABLE_NAME} PROPERTIES
+            MACOSX_BUNDLE_INFO_PLIST "${CMAKE_SOURCE_DIR}/os/ios/Info.plist"
+            XCODE_ATTRIBUTE_ASSETCATALOG_COMPILER_APPICON_NAME "AppIcon"
+            XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "com.alexbatalov.fallout2-ce"
+            XCODE_ATTRIBUTE_TARGETED_DEVICE_FAMILY "1,2"
+        )
+
+        set(MACOSX_BUNDLE_BUNDLE_NAME "${EXECUTABLE_NAME}")
+        set(MACOSX_BUNDLE_DISPLAY_NAME "Fallout 2")
    else()
-        set_target_properties(${EXECUTABLE_NAME} PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_SOURCE_DIR}/os/macos/Info.plist")
+        set(RESOURCES
+            "os/macos/fallout2-ce.icns"
+        )
+
+        target_sources(${EXECUTABLE_NAME} PUBLIC ${RESOURCES})
+        set_source_files_properties(${RESOURCES} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
+
+        set_target_properties(${EXECUTABLE_NAME} PROPERTIES
+            OUTPUT_NAME "Fallout II Community Edition"
+            MACOSX_BUNDLE_INFO_PLIST "${CMAKE_SOURCE_DIR}/os/macos/Info.plist"
+            XCODE_ATTRIBUTE_EXECUTABLE_NAME "${EXECUTABLE_NAME}"
+            XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "com.alexbatalov.fallout2-ce"
+        )
+
+        set(MACOSX_BUNDLE_ICON_FILE "fallout2-ce.icns")
+        set(MACOSX_BUNDLE_BUNDLE_NAME "Fallout II: Community Edition")
+        set(MACOSX_BUNDLE_DISPLAY_NAME "Fallout II")
    endif()

    set(MACOSX_BUNDLE_GUI_IDENTIFIER "com.alexbatalov.fallout2-ce")
-    set(MACOSX_BUNDLE_BUNDLE_NAME "${EXECUTABLE_NAME}")
-    set(MACOSX_BUNDLE_ICON_FILE "fallout2-ce.icns")
-    set(MACOSX_BUNDLE_DISPLAY_NAME "Fallout 2")
-    set(MACOSX_BUNDLE_SHORT_VERSION_STRING "1.2.0")
-    set(MACOSX_BUNDLE_BUNDLE_VERSION "1.2.0")
+    set(MACOSX_BUNDLE_SHORT_VERSION_STRING "1.3.0")
+    set(MACOSX_BUNDLE_BUNDLE_VERSION "1.3.0")
 endif()

+if((NOT ${CMAKE_SYSTEM_NAME} MATCHES "Emscripten"))
+    if(FALLOUT_VENDORED)
+        add_subdirectory("third_party/zlib")
+        add_subdirectory("third_party/sdl2")
+    else()
+        find_package(ZLIB)
+        find_package(SDL2)
+    endif()
+else()
+    set( CMAKE_C_FLAGS                      "${CMAKE_C_FLAGS} \
+                                            --use-port=sdl2 \
+                                            --use-port=sdl2_mixer \
+                                            --use-port=zlib" )
+    set( CMAKE_CXX_FLAGS                    "${CMAKE_CXX_FLAGS} \
+                                            --use-port=sdl2 \
+                                            --use-port=sdl2_mixer \
+                                            --use-port=zlib \
+                                            -std=c++17" )
+
+
+    set( CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g")
+    set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g")
+
+    set( CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O1")
+    set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O1")
+
+    if(OPTION_WASM_64)
+        target_link_options( ${EXECUTABLE_NAME} PRIVATE "-sMEMORY64" )
+        set( CMAKE_C_FLAGS                      "${CMAKE_C_FLAGS} -sMEMORY64" )
+        set( CMAKE_CXX_FLAGS                    "${CMAKE_CXX_FLAGS} -sMEMORY64" )
+        add_compile_options( -sMEMORY64 )
+    endif()
+
+    if(OPTION_WASM_JSPI)
+        target_link_options( ${EXECUTABLE_NAME} PRIVATE "-sJSPI" )
+    else()
+        target_link_options( ${EXECUTABLE_NAME} PRIVATE "-sASYNCIFY" )
+        target_link_options( ${EXECUTABLE_NAME} PRIVATE "-sASYNCIFY_STACK_SIZE=20480" )
+    endif()
+
+    target_link_options( ${EXECUTABLE_NAME} PRIVATE "-sENVIRONMENT=web" )
+    target_link_options( ${EXECUTABLE_NAME} PRIVATE "-sALLOW_MEMORY_GROWTH" )
+    target_link_options( ${EXECUTABLE_NAME} PRIVATE "-MEMORY_GROWTH_LINEAR_STEP=32mb" )
+    target_link_options( ${EXECUTABLE_NAME} PRIVATE "-sNO_DISABLE_EXCEPTION_CATCHING" )
+    target_link_options( ${EXECUTABLE_NAME} PRIVATE "-lidbfs.js" )
+    target_link_options( ${EXECUTABLE_NAME} PRIVATE "-sCASE_INSENSITIVE_FS" )
+    target_link_options( ${EXECUTABLE_NAME} PRIVATE "-sMODULARIZE" )
+    target_link_options( ${EXECUTABLE_NAME} PRIVATE "-sEXPORTED_RUNTIME_METHODS=callMain,addRunDependency,removeRunDependency" )
+    target_link_options( ${EXECUTABLE_NAME} PRIVATE "-sEXPORT_ALL" )
+    target_link_options( ${EXECUTABLE_NAME} PRIVATE "-sEXPORT_NAME=fallout2ce" )
+    target_link_options( ${EXECUTABLE_NAME} PRIVATE "-sEXIT_RUNTIME" )
+    target_link_options( ${EXECUTABLE_NAME} PRIVATE "$<$<CONFIG:DEBUG>:-g>" )
+endif()
+
+
 add_subdirectory("third_party/fpattern")
-target_link_libraries(${EXECUTABLE_NAME} ${FPATTERN_LIBRARY})
-target_include_directories(${EXECUTABLE_NAME} PRIVATE ${FPATTERN_INCLUDE_DIR})
-
-if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-    add_subdirectory("third_party/zlib")
-    add_subdirectory("third_party/sdl2")
-else()
-    find_package(ZLIB)
-    find_package(SDL2)
-endif()
+target_link_libraries(${EXECUTABLE_NAME} fpattern::fpattern)

 target_link_libraries(${EXECUTABLE_NAME} ${ZLIB_LIBRARIES})
 target_include_directories(${EXECUTABLE_NAME} PRIVATE ${ZLIB_INCLUDE_DIRS})
@@ -349,24 +436,13 @@ if(APPLE)
        set(CPACK_GENERATOR "ZIP")
        set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY OFF)
        set(CPACK_PACKAGE_FILE_NAME "fallout2-ce")
+        set(CPACK_ARCHIVE_FILE_EXTENSION "ipa")
    else()
        install(TARGETS ${EXECUTABLE_NAME} DESTINATION .)
-        install(CODE "
-            include(BundleUtilities)
-            fixup_bundle(${CMAKE_BINARY_DIR}/${MACOSX_BUNDLE_BUNDLE_NAME}.app \"\" \"\")
-            "
-            COMPONENT Runtime)
-
-        if (CPACK_BUNDLE_APPLE_CERT_APP)
-            install(CODE "
-                execute_process(COMMAND codesign --deep --force --options runtime --sign \"${CPACK_BUNDLE_APPLE_CERT_APP}\" ${CMAKE_BINARY_DIR}/${MACOSX_BUNDLE_BUNDLE_NAME}.app)
-                "
-                COMPONENT Runtime)
-        endif()

        set(CPACK_GENERATOR "DragNDrop")
        set(CPACK_DMG_DISABLE_APPLICATIONS_SYMLINK ON)
-        set(CPACK_PACKAGE_FILE_NAME "fallout2-ce")
+        set(CPACK_PACKAGE_FILE_NAME "Fallout II Community Edition")
    endif()

    include(CPack)
@@ -0,0 +1,205 @@
+{
+    "version": 6,
+    "cmakeMinimumRequired": {
+        "major": 3,
+        "minor": 19,
+        "patch": 0
+    },
+    "configurePresets": [
+        {
+            "name": "base",
+            "hidden": true,
+            "binaryDir": "${sourceDir}/out/build/${presetName}"
+        },
+        {
+            "name": "windows-base",
+            "hidden": true,
+            "inherits": [
+                "base"
+            ],
+            "condition": {
+                "type": "equals",
+                "lhs": "${hostSystemName}",
+                "rhs": "Windows"
+            }
+        },
+        {
+            "name": "windows-x86",
+            "inherits": [
+                "windows-base"
+            ],
+            "generator": "Visual Studio 16 2019",
+            "architecture": "Win32",
+            "cacheVariables": {
+                "CMAKE_GENERATOR_TOOLSET": "v141_xp",
+                "CMAKE_C_FLAGS": "/D_WIN32_WINNT=0x0501",
+                "CMAKE_CXX_FLAGS": "/D_WIN32_WINNT=0x0501",
+                "CMAKE_MSVC_RUNTIME_LIBRARY": "MultiThreaded$<$<CONFIG:Debug>:Debug>"
+            }
+        },
+        {
+            "name": "windows-x64",
+            "inherits": [
+                "windows-base"
+            ],
+            "generator": "Visual Studio 16 2019",
+            "architecture": "x64",
+            "cacheVariables": {
+                "CMAKE_MSVC_RUNTIME_LIBRARY": "MultiThreaded$<$<CONFIG:Debug>:Debug>"
+            }
+        },
+        {
+            "name": "linux-base",
+            "hidden": true,
+            "inherits": [
+                "base"
+            ],
+            "condition": {
+                "type": "equals",
+                "lhs": "${hostSystemName}",
+                "rhs": "Linux"
+            },
+            "cacheVariables": {
+                "FALLOUT_VENDORED": "OFF"
+            }
+        },
+        {
+            "name": "linux-x86-base",
+            "hidden": true,
+            "inherits": [
+                "linux-base"
+            ],
+            "cacheVariables": {
+                "CMAKE_C_FLAGS": "-m32",
+                "CMAKE_CXX_FLAGS": "-m32",
+                "CMAKE_SYSTEM_NAME": "Linux",
+                "CMAKE_SYSTEM_PROCESSOR": "i386"
+            }
+        },
+        {
+            "name": "linux-x86-debug",
+            "inherits": [
+                "linux-x86-base"
+            ],
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Debug"
+            }
+        },
+        {
+            "name": "linux-x86-release",
+            "inherits": [
+                "linux-x86-base"
+            ],
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "RelWithDebInfo"
+            }
+        },
+        {
+            "name": "linux-x64-debug",
+            "inherits": [
+                "linux-base"
+            ],
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Debug"
+            }
+        },
+        {
+            "name": "linux-x64-release",
+            "inherits": [
+                "linux-base"
+            ],
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "RelWithDebInfo"
+            }
+        },
+        {
+            "name": "darwin-base",
+            "hidden": true,
+            "inherits": [
+                "base"
+            ],
+            "generator": "Xcode",
+            "cacheVariables": {
+                "CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY": ""
+            },
+            "condition": {
+                "type": "equals",
+                "lhs": "${hostSystemName}",
+                "rhs": "Darwin"
+            }
+        },
+        {
+            "name": "macos",
+            "inherits": [
+                "darwin-base"
+            ]
+        },
+        {
+            "name": "ios",
+            "inherits": [
+                "darwin-base"
+            ],
+            "cacheVariables": {
+                "CMAKE_SYSTEM_NAME": "iOS"
+            }
+        }
+    ],
+    "buildPresets": [
+        {
+            "name": "windows-x86-debug",
+            "configurePreset": "windows-x86",
+            "configuration": "Debug"
+        },
+        {
+            "name": "windows-x86-release",
+            "configurePreset": "windows-x86",
+            "configuration": "RelWithDebInfo"
+        },
+        {
+            "name": "windows-x64-debug",
+            "configurePreset": "windows-x64",
+            "configuration": "Debug"
+        },
+        {
+            "name": "windows-x64-release",
+            "configurePreset": "windows-x64",
+            "configuration": "RelWithDebInfo"
+        },
+        {
+            "name": "linux-x86-debug",
+            "configurePreset": "linux-x86-debug"
+        },
+        {
+            "name": "linux-x86-release",
+            "configurePreset": "linux-x86-release"
+        },
+        {
+            "name": "linux-x64-debug",
+            "configurePreset": "linux-x64-debug"
+        },
+        {
+            "name": "linux-x64-release",
+            "configurePreset": "linux-x64-release"
+        },
+        {
+            "name": "macos-debug",
+            "configurePreset": "macos",
+            "configuration": "Debug"
+        },
+        {
+            "name": "macos-release",
+            "configurePreset": "macos",
+            "configuration": "RelWithDebInfo"
+        },
+        {
+            "name": "ios-debug",
+            "configurePreset": "ios",
+            "configuration": "Debug"
+        },
+        {
+            "name": "ios-release",
+            "configurePreset": "ios",
+            "configuration": "RelWithDebInfo"
+        }
+    ]
+}
@@ -1,50 +0,0 @@
-{
-  "configurations": [
-    {
-      "name": "x86-Debug",
-      "generator": "Visual Studio 16 2019",
-      "configurationType": "Debug",
-      "inheritEnvironments": [ "msvc_x86" ],
-      "buildRoot": "${projectDir}\\out\\build\\${name}",
-      "installRoot": "${projectDir}\\out\\install\\${name}",
-      "cmakeCommandArgs": "",
-      "buildCommandArgs": "",
-      "ctestCommandArgs": ""
-    },
-    {
-      "name": "x86-Release",
-      "generator": "Visual Studio 16 2019",
-      "configurationType": "Release",
-      "inheritEnvironments": [ "msvc_x86" ],
-      "buildRoot": "${projectDir}\\out\\build\\${name}",
-      "installRoot": "${projectDir}\\out\\install\\${name}",
-      "cmakeCommandArgs": "",
-      "buildCommandArgs": "",
-      "ctestCommandArgs": ""
-    },
-    {
-      "name": "x64-Debug",
-      "generator": "Visual Studio 16 2019 Win64",
-      "configurationType": "Debug",
-      "buildRoot": "${projectDir}\\out\\build\\${name}",
-      "installRoot": "${projectDir}\\out\\install\\${name}",
-      "cmakeCommandArgs": "",
-      "buildCommandArgs": "",
-      "ctestCommandArgs": "",
-      "inheritEnvironments": [ "msvc_x64_x64" ],
-      "variables": []
-    },
-    {
-      "name": "x64-Release",
-      "generator": "Visual Studio 16 2019 Win64",
-      "configurationType": "Release",
-      "buildRoot": "${projectDir}\\out\\build\\${name}",
-      "installRoot": "${projectDir}\\out\\install\\${name}",
-      "cmakeCommandArgs": "",
-      "buildCommandArgs": "",
-      "ctestCommandArgs": "",
-      "inheritEnvironments": [ "msvc_x64_x64" ],
-      "variables": []
-    }
-  ]
-}
@@ -1,8 +1,14 @@
 # Fallout 2 Community Edition

+Fallout 2 Community Edition is a fully working re-implementation of Fallout 2, with the same original gameplay, engine bugfixes, and some quality of life improvements, that works (mostly) hassle-free on multiple platforms.
+
+Popular Fallout 2 total conversion mods are partially supported. Original versions of Nevada and Sonora (that do not rely on extended features provided by Sfall) likely work, although there is no complete walkthrough confirmation yet. [Fallout 2 Restoration Project](https://github.com/BGforgeNet/Fallout2_Restoration_Project), [Fallout Et Tu](https://github.com/rotators/Fo1in2) and [Olympus 2207](https://olympus2207.com) are not yet supported. Other mods (particularly Resurrection and Yesterday) are not tested.
+
+There is also [Fallout Community Edition](https://github.com/alexbatalov/fallout1-ce).
+
 ## 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 or build from source.
+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

@@ -12,6 +18,14 @@ Download and copy `fallout2-ce.exe` to your `Fallout2` folder. It serves as a dr

 - Use Windows installation as a base - it contains data assets needed to play. Copy `Fallout2` folder somewhere, for example `/home/john/Desktop/Fallout2`.

+- Alternatively you can extract the needed files from the GoG installer:
+
+```console
+$ sudo apt install innoextract
+$ innoextract ~/Downloads/setup_fallout2_2.1.0.18.exe -I app
+$ mv app Fallout2
+```
+
 - Download and copy `fallout2-ce` to this folder.

 - Install [SDL2](https://libsdl.org/download-2.0.php):
@@ -30,19 +44,33 @@ $ sudo apt install libsdl2-2.0-0

 - Alternatively you can use Fallout 2 from Macplay/The Omni Group as a base - you need to extract game assets from the original bundle. Mount CD/DMG, right click `Fallout 2` -> `Show Package Contents`, navigate to `Contents/Resources`. Copy `GameData` folder somewhere, for example `/Applications/Fallout2`.

+- Or if you're a Terminal user and have Homebrew installed you can extract the needed files from the GoG installer:
+
+```console
+$ brew install innoextract
+$ innoextract ~/Downloads/setup_fallout2_2.1.0.18.exe -I app
+$ mv app /Applications/Fallout2
+```
+
 - Download and copy `fallout2-ce.app` to this folder.

 - Run `fallout2-ce.app`.

 ### Android

-> **NOTE**: Fallout 2 was designed with mouse in mind. There are many controls that require precise cursor positioning, which is not possible with fingers. When playing on Android you'll use fingers to move mouse cursor, not a character, or a map. Double tap to "click" left mouse button in the current cursor position, triple tap to "click" right mouse button. It might feel awkward at first, but it's super handy - you can play with just a thumb. This is not set in stone and might change in the future.
+> **NOTE**: Fallout 2 was designed with mouse in mind. There are many controls that require precise cursor positioning, which is not possible with fingers. Current control scheme resembles trackpad usage:
+- One finger moves mouse cursor around.
+- Tap one finger for left mouse click.
+- Tap two fingers for right mouse click (switches mouse cursor mode).
+- Move two fingers to scroll current view (map view, worldmap view, inventory scrollers).

- Use Windows installation as a base - it contains data assets needed to play. Copy `Fallout2` folder to your device, for example to `Downloads`. You need `master.dat`, `critter.dat`, `patch000.dat`, and `data` folder.
+> **NOTE**: From Android standpoint release and debug builds are different apps. Both apps require their own copy of game assets and have their own savegames. This is intentional. As a gamer just stick with release version and check for updates.
+
+- Use Windows installation as a base - it contains data assets needed to play. Copy `Fallout2` folder to your device, for example to `Downloads`. You need `master.dat`, `critter.dat`, `patch000.dat`, and `data` folder. Watch for file names - keep (or make) them lowercased (see [Configuration](#configuration)).

 - Download `fallout2-ce.apk` and copy it to your device. Open it with file explorer, follow instructions (install from unknown source).

- When you run the game for the first time it will immediately present file picker. Select the folder from the first step. Wait until this data is copied. A loading dialog will appear, just wait for about 30 seconds. The game will start automatically.
+- When you run the game for the first time it will immediately present file picker. Select the folder from the first step. Wait until this data is copied. A loading dialog will appear, just wait for about 30 seconds. If you're installing total conversion mod or localized version with a large number of unpacked resources in `data` folder it can take up to 20 minutes. Once copied, the game will start automatically.

 ### iOS

@@ -52,7 +80,39 @@ $ sudo apt install libsdl2-2.0-0

 - Run the game once. You'll see error message saying "Couldn't find/load text fonts". This step is needed for iOS to expose the game via File Sharing feature.

- Use Finder (macOS Catalina and later) or iTunes (Windows and macOS Mojave or earlier) to copy `master.dat`, `critter.dat`, `patch000.dat`, and `data` folder to "Fallout 2" app ([how-to](https://support.apple.com/HT210598)).
+- Use Finder (macOS Catalina and later) or iTunes (Windows and macOS Mojave or earlier) to copy `master.dat`, `critter.dat`, `patch000.dat`, and `data` folder to "Fallout 2" app ([how-to](https://support.apple.com/HT210598)). Watch for file names - keep (or make) them lowercased (see [Configuration](#configuration)).
+
+### Browser
+
+> **NOTE**: WebAssebly build with emscripten
+```
+docker run --rm -v $(pwd):/src emscripten/emsdk:3.1.74 sh -c 'git config --global --add safe.directory "*" && mkdir -p build && cd build && emcmake cmake ../ -DCMAKE_TOOLCHAIN_FILE=../cmake/toolchain/Emscripten.cmake && emmake make'
+```
+- Demo available at https://github.com/ololoken/fallout2-ce-ems.git
+
+## Configuration
+
+The main configuration file is `fallout2.cfg`. There are several important settings you might need to adjust for your installation. Depending on your Fallout distribution main game assets `master.dat`, `critter.dat`, `patch000.dat`, and `data` folder might be either all lowercased, or all uppercased. You can either update `master_dat`, `critter_dat`, `master_patches` and `critter_patches` settings to match your file names, or rename files to match entries in your `fallout2.cfg`.
+
+The `sound` folder (with `music` folder inside) might be located either in `data` folder, or be in the Fallout folder. Update `music_path1` setting to match your hierarchy, usually it's `data/sound/music/` or `sound/music/`. Make sure it matches your path exactly (so it might be `SOUND/MUSIC/` if you've installed Fallout from CD). Music files themselves (with `ACM` extension) should be all uppercased, regardless of `sound` and `music` folders.
+
+The second configuration file is `f2_res.ini`. Use it to change game window size and enable/disable fullscreen mode.
+
+```ini
+[MAIN]
+SCR_WIDTH=1280
+SCR_HEIGHT=720
+WINDOWED=1
+```
+
+Recommendations:
+- **Desktops**: Use any size you see fit.
+- **Tablets**: Set these values to logical resolution of your device, for example iPad Pro 11 is 1668x2388 (pixels), but it's logical resolution is 834x1194 (points).
+- **Mobile phones**: Set height to 480, calculate width according to your device screen (aspect) ratio, for example Samsung S21 is 20:9 device, so the width should be 480 * 20 / 9 = 1067.
+
+In time this stuff will receive in-game interface, right now you have to do it manually.
+
+The third configuration file is `ddraw.ini` (part of Sfall). There are dozens of options that adjust or override engine behaviour and gameplay mechanics. This file is intended for modders and advanced users. Currently only a small subset of these settings are actually implemented.

 ## Contributing

@@ -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
+)
@@ -0,0 +1,18 @@
+set( CMAKE_SYSTEM_NAME      "Emscripten" )
+
+add_compile_definitions("DEBUG=$<CONFIG:Debug>")
+
+set( CMAKE_C_COMPILER                   "emcc" )
+set( CMAKE_CXX_COMPILER                 "em++" )
+
+
+
+set( EXECUTABLE_NAME fallout2-ce.js )
+
+option(OPTION_WASM_64 "Build wasm64 module" OFF)
+option(OPTION_WASM_JSPI "Build wasm with JSPI support instead of asyncify module" OFF)
+
+# Touch toolchain variable to suppress "unused variable" warning.
+# This happens if CMake is invoked with the same command line the second time.
+if(CMAKE_TOOLCHAIN_FILE)
+endif()
@@ -1,4 +0,0 @@
-set( CMAKE_SYSTEM_NAME      "Linux" )
-set( CMAKE_SYSTEM_PROCESSOR "i386" )
-set( CMAKE_C_FLAGS          "-m32" )
-set( CMAKE_CXX_FLAGS        "-m32" )
@@ -9,8 +9,8 @@ android {
        applicationId 'com.alexbatalov.fallout2ce'
        minSdk 21
        targetSdk 32
-        versionCode 3
-        versionName '1.2.0'
+        versionCode 4
+        versionName '1.3.0'
        externalNativeBuild {
            cmake {
                arguments '-DANDROID_STL=c++_static'
@@ -0,0 +1,14 @@
+{
+  "images" : [
+    {
+      "filename" : "AppIcon.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
@@ -8,8 +8,6 @@
    <string>${MACOSX_BUNDLE_DISPLAY_NAME}</string>
    <key>CFBundleExecutable</key>
    <string>${MACOSX_BUNDLE_EXECUTABLE_NAME}</string>
-    <key>CFBundleIconFile</key>
-    <string>${MACOSX_BUNDLE_ICON_FILE}</string>
    <key>CFBundleIdentifier</key>
    <string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string>
    <key>CFBundleInfoDictionaryVersion</key>
@@ -22,12 +20,12 @@
    <string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
    <key>CFBundleVersion</key>
    <string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
-    <key>LSApplicationCategoryType</key>
-    <string>public.app-category.role-playing-games</string>
    <key>LSMinimumSystemVersion</key>
    <string>11.0</string>
    <key>LSRequiresIPhoneOS</key>
    <true/>
+    <key>LSSupportsOpeningDocumentsInPlace</key>
+    <true/>
    <key>NSHighResolutionCapable</key>
    <string>True</string>
    <key>UIApplicationSupportsIndirectInputEvents</key>
@@ -49,8 +47,6 @@
    <array>
        <string>UIInterfaceOrientationLandscapeLeft</string>
        <string>UIInterfaceOrientationLandscapeRight</string>
-        <string>UIInterfaceOrientationPortrait</string>
-        <string>UIInterfaceOrientationPortraitUpsideDown</string>
    </array>
 </dict>
 </plist>
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
    <key>CFBundleDevelopmentRegion</key>
-    <string>English</string>
+    <string>en</string>
    <key>CFBundleDisplayName</key>
    <string>${MACOSX_BUNDLE_DISPLAY_NAME}</string>
    <key>CFBundleExecutable</key>
@@ -28,6 +28,8 @@
    <string>${MACOSX_BUNDLE_COPYRIGHT}</string>
    <key>NSHighResolutionCapable</key>
    <string>True</string>
+    <key>LSApplicationCategoryType</key>
+    <string>public.app-category.role-playing-games</string>
    <key>LSMinimumSystemVersion</key>
    <string>10.11</string>
    <key>SDL_FILESYSTEM_BASE_DIR_TYPE</key>
--- a/Show More
+++ b/Show More