Version 2.11.5

This fixes https://github.com/kichikuou/xsystem35-sdl2/issues/55.

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,24 @@
+---
+name: Bug report
+about: Create a report to help us improve xsystem35
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+### Environment
+ - xsystem35 version:
+ - OS:
+
+### Steps to reproduce the behavior
+1. 
+2. 
+3. 
+
+### Expected behavior
+
+### Actual behavior
+<!-- If applicable, add screenshots to help explain your problem. -->
+
+### Additional context

.github/workflows/android.yml

@@ -6,24 +6,23 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Install Deps
       run: sudo apt install ninja-build
 
-    # Workaround for https://github.com/actions/virtual-environments/issues/3078
-    - name: Setup cmake
-      uses: jwlawson/actions-setup-cmake@v1.9
-      with:
-        cmake-version: '3.19.x'
-
     - name: Build
       run: |
         cd android
-        ANDROID_NDK_HOME=$ANDROID_SDK_ROOT/ndk-bundle ./gradlew assembleRelease
+        echo "${{ secrets.KEYSTORE_BASE64 }}" | base64 -d > keystore.jks
+        JAVA_HOME=$JAVA_HOME_17_X64 ANDROID_NDK_HOME=$ANDROID_SDK_ROOT/ndk-bundle ./gradlew assembleRelease
+      env:
+        KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
+        KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
+        KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
 
     - name: Upload artifacts
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v4
       with:
-        name: xsystem35-release-unsigned-apk
-        path: android/app/build/outputs/apk/release/app-release-unsigned.apk
+        name: xsystem35-apk
+        path: android/app/build/outputs/apk/release/app-release.apk

.github/workflows/emscripten.yml

@@ -2,7 +2,7 @@ name: Emscripten Build
 on: [push, pull_request]
 
 env:
-  EM_VERSION: 2.0.25
+  EM_VERSION: 3.1.54
   EM_CACHE_FOLDER: 'emsdk-cache'
 
 jobs:
@@ -10,17 +10,17 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Setup cache
       id: cache-system-libraries
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: ${{env.EM_CACHE_FOLDER}}
         key: ${{env.EM_VERSION}}-${{ runner.os }}
 
     - name: Setup Emscripten toolchain
-      uses: mymindstorm/setup-emsdk@v10
+      uses: mymindstorm/setup-emsdk@v14
       with:
         version: ${{ env.EM_VERSION }}
         actions-cache-folder: ${{env.EM_CACHE_FOLDER}}
@@ -29,13 +29,13 @@ jobs:
       run: |
         mkdir -p out/wasm
         cd out/wasm
-        emcmake cmake -DCMAKE_BUILD_TYPE=MinSizeRel ../../
-        make
+        emcmake cmake -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_COMPILE_WARNING_AS_ERROR=YES ../../
+        make -j4
         mkdir xsystem35
         mv src/xsystem35.* xsystem35/
 
     - name: Upload artifacts
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: xsystem35-wasm
         path: out/wasm/xsystem35

.github/workflows/linux.yml

@@ -10,19 +10,19 @@ jobs:
 
     name: Linux ${{ matrix.build-type }}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Install Deps
       run: |
         sudo apt update
-        sudo apt install libgtk-3-dev libsdl2-dev libsdl2-ttf-dev libsdl2-mixer-dev libportmidi-dev libcjson-dev
+        sudo apt install libgtk-3-dev libsdl2-dev libsdl2-ttf-dev libsdl2-mixer-dev libwebp-dev libportmidi-dev libcjson-dev
 
     - name: Build
       run: |
         mkdir -p out/${{ matrix.build-type }}
         cd out/${{ matrix.build-type }}
         cmake -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} ../../
-        make
+        make -j4
 
     - name: Test
       run: ctest --output-on-failure

.github/workflows/windows.yml

@@ -3,58 +3,67 @@ on: [push, pull_request]
 
 jobs:
   build:
-    runs-on: windows-2019
+    runs-on: windows-latest
     strategy:
+      fail-fast: false
       matrix:
-        mingw: ["MINGW32", "MINGW64"]
         include:
-          - mingw: "MINGW32"
-            package: "mingw-w64-i686"
-            installer: "xsystem35-32bit"
-          - mingw: "MINGW64"
-            package: "mingw-w64-x86_64"
-            installer: "xsystem35-64bit"
+          - sys: mingw32
+            package: "xsystem35-32bit"
+            cmake_args: "-DENABLE_DEBUGGER=no"
+            deps: ""
+          - sys: ucrt64
+            package: "xsystem35-64bit"
+            cmake_args: ""
+            deps: "cjson:p"
     defaults:
       run:
-        shell: bash.exe --login -eo pipefail "{0}"
-    env:
-      MSYSTEM: ${{ matrix.mingw }}
-      CHERE_INVOKING: 1
-    name: MSYS2 ${{ matrix.mingw }}
+        shell: msys2 {0}
+    name: MSYS2 ${{ matrix.sys }}
     steps:
 
-    - name: Set up shell
-      run: echo "C:\msys64\usr\bin\" >> $env:GITHUB_PATH
-      shell: pwsh
-
-    - name: Print system version
-      run: |
-        uname
-        echo PATH: $PATH
-
-    - name: Install Deps
-      run: pacman -S --noconfirm ${{ matrix.package }}-SDL2 ${{ matrix.package }}-SDL2_ttf ${{ matrix.package }}-SDL2_mixer ${{ matrix.package }}-libjpeg-turbo ${{ matrix.package }}-cjson ${{ matrix.package }}-nsis ${{ matrix.package }}-ntldd-git
+    - name: Set up MSYS2
+      uses: msys2/setup-msys2@v2
+      with:
+        msystem: ${{ matrix.sys }}
+        pacboy: >-
+          SDL2:p
+          SDL2_ttf:p
+          SDL2_mixer:p
+          libwebp:p
+          ${{ matrix.deps }}
 
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
+
+    - name: Copy licenses
+      run: |
+        ls /${{ matrix.sys }}/share/licenses
+        mkdir dist
+        cp -r /${{ matrix.sys }}/share/licenses dist/
+        cp fonts/*.license dist/licenses/
+
+    - name: Install dev dependencies
+      run: pacboy --noconfirm -S --needed gcc:p cmake:p ninja:p
 
     - name: Build
       run: |
         mkdir -p out/release
         cd out/release
-        cmake -G"MSYS Makefiles" -DCMAKE_BUILD_TYPE=Release ../../
-        make
+        cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_COMPILE_WARNING_AS_ERROR=YES ${{ matrix.cmake_args }} ../../
+        ninja
 
     - name: Test
       run: ctest --output-on-failure
       working-directory: out/release
 
     - name: Package
-      working-directory: tools/installer
-      run: ./make-installer.sh ../../out/release ${{ matrix.installer }}.nsi
+      run: |
+        cp out/release/src/xsystem35.exe *.md COPYING xsys35rc.sample dist/
 
     - name: Upload
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
-        name: ${{ matrix.installer }}
-        path: tools/installer/${{ matrix.installer }}.exe
+        name: ${{ matrix.package }}
+        path: dist
+        compression-level: 9  # because we use it for releases

.gitignore

@@ -1,8 +1,13 @@
 out
 android/.gradle
+android/.idea
+android/app/.cxx
 android/app/.externalNativeBuild
 android/app/build
+android/app/src/main/assets
 android/build
+android/keystore.jks
+android/local.properties
 .ccls-cache
 .dir-locals.el
 compile_commands.json

CHANGELOG.md

@@ -0,0 +1,107 @@
+# Changelog
+
+## 2.11.5 - 2024-06-10
+- Android: Fixed a black screen issue in the MangaGamer version of Rance 5D.
+- Fixed `fileCheckExist` command. (#55)
+
+## 2.11.4 - 2024-05-22
+- Windows: In full-screen mode, the menu bar now appears only when the mouse pointer is at the top of the screen. (#53)
+- Fixed text rendering issue in Rance 3 intro. (#54)
+
+## 2.11.3 - 2024-04-11
+- Android: Fixed a bug where save files from older versions could not be loaded in version 2.11.2.
+
+## 2.11.2 - 2024-04-10
+- Added `-savedir` option to specify save directory.
+- Android: Fixed a bug where .xsys35rc in a subdirectory of ZIP was not loaded. (#51)
+
+## 2.11.1 - 2024-02-18
+- Windows: Fixed a black screen issue in the MangaGamer version of Rance 5D (#45).
+- Fixed a crash bug in command-line debugger.
+
+## 2.11.0 - 2024-01-20
+- Windows: Now `xsystem35.exe` is a standalone executable. You can just copy it to the game folder and run it.
+- Windows: The installer is no longer provided. If you have an earlier version installed, please uninstall it.
+- Windows: The debugger is no longer available in the 32-bit version. Please use the 64-bit version if you need it.
+- Added experimental `enable_zb` option (#44). See `xsys35rc.sample` for details.
+
+## 2.10.1 - 2024-01-01
+- Windows: Added "Integer Scaling" menu option
+- Fixed initial palette colors (to match System3.9)
+- Fixed a bug where palette 246 to 249 were unintentionally changed after loading 256-color CGs
+
+## 2.10.0 - 2023-12-09
+- Breaking change: A [bug](https://github.com/kichikuou/xsystem35-sdl2/issues/41) has been fixed in which save format for 大悪司 and かえるにょ国にょアリス was not compatible with System3.9. As a result, save files for these games created with older versions of xsystem35 are no longer usable. (Loading will not fail, but wrong values will be loaded.)
+- Now the 64-bit executable supports Windows 10 or later. For older Windows, please use the 32-bit version.
+- Fixed a problem with the download edition of Daiakuji requiring insertion of Disk 2. (#43)
+- Debugger: Added debug commands for monitoring the color palette.
+- Minor bug fixes.
+
+## 2.9.1 - 2023-06-22
+- Fixed a bug where the `CX 1` command (copy with transparent color) did not work in some games (e.g. Daiakuji)
+- Debugger: Now breakpoints do not make the window completely unresponsive
+- Debugger: Fixed a conditional breakpoint crash bug
+
+## 2.9.0 - 2023-05-04
+- Now xsystem35 uses the System3.9 save file format (unless `-saveformat` command line flag is specified). Old save files can still be loaded.
+- Changed the default naming convention for save files from `[a-z]sleep.asd` to `<gamename>s[a-z].asd`.
+- Fixed a bug where SACT games (e.g. Rance 5D) were not responding to touch.
+- Fixed memory leaks in debugger.
+
+## 2.8.0 - 2023-02-12
+- Added support for Rance 4.1/4.2 ver1.05
+- Fixed movement animation in rooms in Rance 4 v2.05 (#35)
+- Added `-game` option which can be used to enable game-specific hacks in translated games
+
+## 2.7.0 - 2023-01-28
+- Added support for Rance4 ver.2.05
+- Now supports BGM playback for the download edition of Daiakuji
+- Bug fixes
+
+## 2.6.0 - 2023-01-01
+- Android: Introduced a new way to simulate right-click; tapping on the black bars at the left/right or top/bottom of the screen is treated as a right click. (Two-finger touch, the old way to simulate a right click, still works.)
+- Windows: Added a menu command to enable/disable automatic mouse movements.
+
+## 2.5.1 - 2022-07-31
+- Implemented "palette shift" graphic effect (used in 闘神都市II).
+- Implemented `grDrawFillCircle` command (used in グレイメルカ).
+- Fixed color update bug in 256-color games.
+- Fixed crash by out-of-bounds variable access in debugger.
+
+## 2.5.0 - 2022-07-17
+- Supported JPEG image format on Android.
+
+## 2.4.0 - 2022-07-02
+- Windows: Added "Restart" menu command.
+- Fixed a bug where wrong music is played in Kichikuou Rance (System3.9 version). #32
+- Supported mouse wheel input.
+- Fixed a bug in `MF` command.
+- Implemented `grEffectMoveView` command.
+
+## 2.3.0 - 2022-04-08
+- Code for screen transition effects have been substantially rewritten (but you probably wouldn't notice any difference).
+- Fixed bugs in System3.9 games.
+- Android: Enabled joystick input.
+- Debugger improvements.
+
+## 2.2.0 - 2021-12-03
+From now on, the Android and Windows versions will use a common version number.
+
+- Android: Use custom fonts specified in `.xsys35c`. (#20)
+- Supported "王子さまLv1".
+- Debugger improvements.
+- Fixed some bugs and compatibility issues.
+
+## 2.1.0 - 2021-11-07
+- Fixed issues with MangaGamer version of Rance 5D.
+- Fixed garbled text in some System3.9 games with Unicode mode.
+- Display a message box on fatal errors.
+- Various debugger improvements.
+
+## 2.0.1 - 2021-10-24
+- Fixed crash during shutdown.
+
+## 2.0.0 - 2021-10-23
+- Added window menubar from which you can save screenshots, change fullscreen mode, and enable message skipping.
+- Added debugger support that can be used from Visual Studio Code. See [vscode-system3x](https://github.com/kichikuou/vscode-system3x) for details.
+- Many bug fixes and compatibility fixes.

CMakeLists.txt

@@ -2,18 +2,11 @@ cmake_minimum_required(VERSION 3.13)
 
 project(xsystem35 LANGUAGES C)
 set(CMAKE_C_STANDARD 99)
-set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 enable_testing()
+set(CMAKE_EXPORT_COMPILE_COMMANDS TRUE)
 
-include(CheckIncludeFile)
-include(CheckLibraryExists)
 include(CheckSymbolExists)
-
-# In msys, `pkg-config --libs` returns `-lmingw32` but find_library() cannot
-# find it in default search paths.
-if (MSYS)
-  list(APPEND CMAKE_LIBRARY_PATH $ENV{MINGW_PREFIX}/$ENV{MINGW_CHOST}/lib)
-endif ()
+include(FetchContent)
 
 # A wrapper around pkg_check_modules() that skips the check if ENABLE_<prefix> is false
 macro (optional_pkg_check_modules prefix)
@@ -23,20 +16,73 @@ macro (optional_pkg_check_modules prefix)
   endif()
 endmacro()
 
+# Generates a static library from pkg_check_modules() result
+function(add_static_library name pkg)
+  add_library(${name} INTERFACE)
+  set_target_properties(${name}
+      PROPERTIES
+          INTERFACE_INCLUDE_DIRECTORIES "${${pkg}_STATIC_INCLUDE_DIRS}"
+          INTERFACE_COMPILE_OPTIONS "${${pkg}_STATIC_CFLAGS_OTHER}"
+          INTERFACE_LINK_LIBRARIES "${${pkg}_STATIC_LIBRARIES}"
+          INTERFACE_LINK_OPTIONS "${${pkg}_STATIC_LDFLAGS_OTHER}")
+endfunction()
+
+function(fetch_webp)
+  FetchContent_Declare(
+    libwebp
+    URL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.4.0.tar.gz
+    URL_HASH SHA1=0b1c8bea200caaa010182609dbaaa91aec69b64d
+    )
+  set(WEBP_BUILD_ANIM_UTILS OFF CACHE BOOL "Build animation utilities." FORCE)
+  set(WEBP_BUILD_CWEBP OFF CACHE BOOL "Build the cwebp command line tool." FORCE)
+  set(WEBP_BUILD_DWEBP OFF CACHE BOOL "Build the dwebp command line tool." FORCE)
+  set(WEBP_BUILD_GIF2WEBP OFF CACHE BOOL "Build the gif2webp conversion tool." FORCE)
+  set(WEBP_BUILD_IMG2WEBP OFF CACHE BOOL "Build the img2webp animation tool." FORCE)
+  set(WEBP_BUILD_VWEBP OFF CACHE BOOL "Build the vwebp viewer tool." FORCE)
+  set(WEBP_BUILD_WEBPINFO OFF CACHE BOOL "Build the webpinfo command line tool." FORCE)
+  set(WEBP_BUILD_LIBWEBPMUX OFF CACHE BOOL "Build the libwebpmux library." FORCE)
+  set(WEBP_BUILD_WEBPMUX OFF CACHE BOOL "Build the webpmux command line tool." FORCE)
+  set(WEBP_BUILD_EXTRAS OFF CACHE BOOL "Build extras." FORCE)
+  set(WEBP_BUILD_WEBP_JS OFF CACHE BOOL "Emscripten build of webp.js." FORCE)
+  FetchContent_MakeAvailable(libwebp)
+  add_library(WebP ALIAS webp)
+endfunction()
+
 check_symbol_exists(getlogin "unistd.h" HAVE_GETLOGIN)
 check_symbol_exists(mmap "sys/mman.h" HAVE_MMAP)
 check_symbol_exists(sigaction "signal.h" HAVE_SIGACTION)
-check_symbol_exists(uname "sys/utsname.h" HAVE_UNAME)
 
 if (EMSCRIPTEN)
-  set(HAVE_JPEG 1)
+  function(add_emscripten_library name option)
+    add_library(${name} INTERFACE)
+    set_target_properties(${name} PROPERTIES
+        INTERFACE_COMPILE_OPTIONS ${option}
+        INTERFACE_LINK_OPTIONS ${option})
+  endfunction()
+  add_emscripten_library(zlib -sUSE_ZLIB=1)
+  add_emscripten_library(sdl2 -sUSE_SDL=2)
+  add_emscripten_library(sdl2_ttf -sUSE_SDL_TTF=2)
   set(DEFAULT_FONT_PATH /fonts/)
+  fetch_webp()
+  set(HAVE_WEBP 1)
+
 elseif (ANDROID)
-  set(SDL2MIXER_FOUND 1)
-  find_library(ndk_zlib z)
+  add_library(sdl2 ALIAS SDL2)
+  add_library(sdl2_ttf ALIAS SDL2_ttf)
+  add_library(sdl2_mixer ALIAS SDL2_mixer)
   find_library(ndk_log log)
-else()
+  find_library(ndk_zlib z)
+  add_library(zlib INTERFACE)
+  set_target_properties(zlib PROPERTIES INTERFACE_LINK_LIBRARIES ${ndk_zlib})
+  fetch_webp()
+  set(HAVE_WEBP 1)
+
+else()  # non-emscripten, non-android
+  if (WIN32)
+    set(ZLIB_USE_STATIC_LIBS ON)
+  endif()
   find_package(ZLIB REQUIRED)
+  add_library(zlib ALIAS ZLIB::ZLIB)
 
   include(FindPkgConfig)
   optional_pkg_check_modules(GTK3 IMPORTED_TARGET gtk+-3.0)
@@ -44,49 +90,61 @@ else()
     set(ENABLE_GTK 1)
   endif()
 
-  pkg_check_modules(SDL2 IMPORTED_TARGET sdl2)
-  pkg_check_modules(SDL2TTF IMPORTED_TARGET SDL2_ttf)
-  optional_pkg_check_modules(SDL2MIXER IMPORTED_TARGET SDL2_mixer)
+  pkg_check_modules(SDL2 REQUIRED IMPORTED_TARGET sdl2)
+  pkg_check_modules(SDL2TTF REQUIRED IMPORTED_TARGET SDL2_ttf)
+  pkg_check_modules(SDL2MIXER REQUIRED IMPORTED_TARGET SDL2_mixer)
+  if (WIN32)
+    add_static_library(sdl2 SDL2)
+    add_static_library(sdl2_ttf SDL2TTF)
+    # Workaround for linking error
+    set_property(TARGET sdl2_ttf PROPERTY INTERFACE_LINK_LIBRARIES
+        $<LINK_GROUP:RESCAN,${SDL2TTF_STATIC_LIBRARIES} -lstdc++>)
+    add_static_library(sdl2_mixer SDL2MIXER)
+  else()
+    add_library(sdl2 ALIAS PkgConfig::SDL2)
+    add_library(sdl2_ttf ALIAS PkgConfig::SDL2TTF)
+    add_library(sdl2_mixer ALIAS PkgConfig::SDL2MIXER)
+    set(DEFAULT_FONT_PATH ${CMAKE_INSTALL_PREFIX}/share/xsystem35/fonts/)
+  endif()
 
   option(ENABLE_DEBUGGER "Enable built-in debugger" ON)
   if (ENABLE_DEBUGGER)
     pkg_check_modules(cJSON IMPORTED_TARGET libcjson)
-    if (NOT cJSON_FOUND)
+    if (cJSON_FOUND)
+      if (WIN32)
+        add_static_library(cJSON cJSON)
+      else ()
+        add_library(cJSON ALIAS PkgConfig::cJSON)
+      endif()
+    else ()
       # libcjson-dev of Debian buster / Ubuntu 20.04 does not install pkgconfig files.
       find_library(cJSON cjson)
       if (NOT cJSON)
         message(FATAL_ERROR "libcjson is required but not found.")
       endif()
+      add_library(cJSON ALIAS ${cJSON})
     endif()
   endif()
 
-  include(FindJPEG)
-  if (JPEG_FOUND)
-    set(HAVE_JPEG 1)
-  endif()
-
-  set(THREADS_PREFER_PTHREAD_FLAG ON)
-  find_package(Threads)
-  if (CMAKE_USE_PTHREADS_INIT)
-    find_library(PORTMIDI portmidi)
-    if (PORTMIDI)
-      set(HAVE_PORTMIDI 1)
-      set(ENABLE_MIDI_PORTMIDI 1)
+  optional_pkg_check_modules(WEBP IMPORTED_TARGET libwebp)
+  if (WEBP_FOUND)
+    set(HAVE_WEBP 1)
+    if (WIN32)
+      add_static_library(WebP WEBP)
+    else()
+      add_library(WebP ALIAS PkgConfig::WEBP)
     endif()
   endif()
 
-  set(DEFAULT_FONT_PATH ${CMAKE_INSTALL_PREFIX}/share/xsystem35/fonts/)
+  find_library(PORTMIDI portmidi)
+  if (PORTMIDI)
+    set(HAVE_PORTMIDI 1)
+  endif()
 endif()
 
 # Menu
 
-if (EMSCRIPTEN)
-  set(SRC_MENU menu_emscripten.c)
-elseif (ANDROID)
-  set(SRC_MENU menu_android.c)
-elseif (ENABLE_GTK)
-  set(SRC_MENU menu.c menu_callback.c menu_gui.c s39init.c)
-
+if (ENABLE_GTK)
   # i18n support (currently only menus are translated)
   include(FindIntl)
   include(FindGettext)
@@ -96,67 +154,39 @@ elseif (ENABLE_GTK)
     include_directories(${Intl_INCLUDE_DIRS})
     link_libraries(${Intl_LIBRARIES})
   endif()
-else ()
-  set(SRC_MENU menu_sdl.c sdl_input.c)
 endif()
 
 # PCM audio
 
 if (EMSCRIPTEN)
-  list(APPEND SRC_AUDIO)
-  list(APPEND SRC_AUDIO pcm.emscripten.c bgm.emscripten.c bgi.c)
   list(APPEND SUMMARY_AUDIO "Emscripten")
-elseif (SDL2MIXER_FOUND)
-  list(APPEND SRC_AUDIO pcm.sdlmixer.c bgm.sdlmixer.c bgi.c)
-  list(APPEND SUMMARY_AUDIO "SDL_mixer")
-  set(ENABLE_SDLMIXER 1)
 else()
-  list(APPEND SRC_AUDIO pcm.dummy.c bgm.dummy.c)
+  list(APPEND SUMMARY_AUDIO "SDL_mixer")
 endif()
 
 # CDROM
 
-if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
-  list(APPEND SRC_CDROM cdrom.Linux.c)
-  list(APPEND SUMMARY_CDROM "Linux ioctl")
-  set(ENABLE_CDROM_LINUX 1)
-elseif (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
-  list(APPEND SRC_CDROM cdrom.FreeBSD.c)
-  list(APPEND SUMMARY_CDROM "*BSD ioctl")
-  set(ENABLE_CDROM_BSD 1)
-elseif (CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
-  list(APPEND SRC_CDROM cdrom.emscripten.c)
+if (EMSCRIPTEN)
   list(APPEND SUMMARY_CDROM "Emscripten")
-  set(ENABLE_CDROM_EMSCRIPTEN 1)
-elseif (CMAKE_SYSTEM_NAME STREQUAL "Android")
-  list(APPEND SRC_CDROM cdrom.android.c)
-  list(APPEND SUMMARY_CDROM "Android")
-  set(ENABLE_CDROM_ANDROID 1)
 else()
-  list(APPEND SRC_CDROM cdrom.empty.c)
-endif()
-if (SDL2MIXER_FOUND AND NOT ANDROID)
-  list(APPEND SRC_CDROM cdrom.mp3.c)
   list(APPEND SUMMARY_CDROM "SDL_mixer (wav|mp3|ogg...)")
-  set(ENABLE_CDROM_MP3 1)
 endif()
-set(CDROM_DEVICE "playlist.txt" CACHE STRING "CDROM Device Name")
+set(DEFAULT_PLAYLIST_PATH "playlist.txt" CACHE STRING "Default playlist path")
 
 # MIDI
 
 if (EMSCRIPTEN)
-  list(APPEND SRC_MIDI midi.emscripten.c)
   list(APPEND SUMMARY_MIDI "Emscripten")
 elseif (ANDROID)
-  list(APPEND SRC_MIDI midi.android.c)
   list(APPEND SUMMARY_MIDI "Android")
 else()
+  list(APPEND SUMMARY_MIDI "SDL_mixer")
+  set(ENABLE_MIDI_SDLMIXER 1)
+
   if (HAVE_SIGACTION)
-    list(APPEND SRC_MIDI midi.rawmidi.c midifile.c)
     list(APPEND SUMMARY_MIDI "raw")
     set(MIDI_DEVICE "/dev/midi" CACHE STRING "midi device")
     set(ENABLE_MIDI_RAWMIDI 1)
-    option(QUIET_MIDI "No display midi stdout" OFF)
   endif()
 
   if (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
@@ -172,27 +202,12 @@ else()
     set(SEQ_DEVICE "/dev/sequencer" CACHE STRING "sequencer device")
   endif()
 
-  if (SDL2MIXER_FOUND)
-    list(APPEND SRC_MIDI midi.sdlmixer.c)
-    list(APPEND SUMMARY_MIDI "SDL_mixer")
-    set(ENABLE_MIDI_SDLMIXER 1)
-  endif()
-
-  if (HAVE_PORTMIDI AND ENABLE_MIDI_PORTMIDI)
-    list(APPEND SRC_MIDI midi.portmidi.c)
+  if (HAVE_PORTMIDI)
     list(APPEND SUMMARY_MIDI "PortMidi")
-    link_libraries(${PORTMIDI} Threads::Threads)
+    set(ENABLE_MIDI_PORTMIDI 1)
   endif()
 endif()
 
-# Joystick
-
-if (NOT EMSCRIPTEN AND NOT ANDROID)
-  set(HAVE_SDLJOY 1)
-endif()
-
-# TODO: MMX
-
 function (print_summary name)
   if (ARGN)
     list(JOIN ARGN ", " MSG)
@@ -207,13 +222,11 @@ message("------------------")
 print_summary(audio ${SUMMARY_AUDIO})
 print_summary(cdrom ${SUMMARY_CDROM})
 print_summary(midi ${SUMMARY_MIDI})
-print_summary(joystick ${SUMMARY_JOYSTICK})
 message("------------------")
 
 set(PACKAGE ${PROJECT_NAME})
 configure_file(config.h.in config.h)
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
-add_compile_definitions(HAVE_CONFIG_H)
 add_compile_definitions($<$<CONFIG:Debug>:DEBUG>)
 
 add_subdirectory(src)

INSTALL

@@ -1,195 +0,0 @@
-
-        System 3.5 for X Window System     Version 1.7 (開発版)
-
-                   インストールドキュメント
-
-
-0. 目次
-
-  1. 必要環境と対応機能
-  2. コンパイルとインストール
-  3. コンパイル時のオプション
-  4. サポート
-
-
-1. 必要環境と対応機能
-
- 1.1 必要環境
-   * X11R6
-   * gtk+ 2.0.0 以上
-   * SYSV IPC in kernel
-   * zlib
-   * Ogg Vorbis library (libvorbis)
-
- 1.2 推奨環境
-   * スケーラブルフォント(例えば X-TT など)
-     (http://X-TT.dsl.gr.jp/index-ja.html)
-   * MIT-SHM extension をサポートした X Server。次のようにチェックします。
-     $ xdpyinfo | grep MIT-SHM
-   * MMX Pentinum 以降 (for IA32 platform)
-
- 1.3 対応機能
-   * ALSA (for Linux) 0.9.x 以上
-     (http://www.alsa-project.org/)
-   * ESD (Esound) 0.2.8 以上
-     (http://www.tux.org/~ricdude/EsounD.html)
-     (ftp://ftp.gnome.org/pub/GNOME/stable/sources/esound/ or mirrors)
-   * Joystick (for Linux kernel 2.2.x)
-   * SDL(Simple DirectMedia Layer) 1.0.x 以上
-     (http://www.devolution.com/~slouken/SDL)
-   * FreeType Library  2.0 以上
-     (http://www.freetype.org/)
-   * midi デバイス(OSS /dev/midi, /dev/sequencer)を介した外部/仮想MIDI音源
-
- 1.4 注意点
-   * コンパイルには GNU Make (gmake) と gtk-config と nasm (assembler)
-   が必要です。(nasm は IA-32 platform のみ)
-   * また gcc 以外でのコンパイルは多分出来ないと思います。標準 cc でコンパイル
-   を通すためのパッチは大歓迎です。
-
-
-2. コンパイルとインストール
-
- 2.1 プログラムのコンパイルとインストール
-
- $ tar xvfz xsystem35-(version).tar.gz  # ソースコードの展開
- $ cd xsystem35-(version)               # xsystem35 のトップディレクトリに移動
- $ cp src/xsys35rc.sample ~/.xsys35rc   # 設定ファイルのコピー
- $ ./configure                          # `configure' スクリプトの実行 
- $ make                                 # xsystem35 のコンパイル
- [必要なら root になる]
- # make install                         # xsystem35 のインストール
-
- default では make install で /usr/local/bin にインストールされます。
-
- 2.2 ゲームデータのインストール
-
- contrib ディレクトリにゲームデータをインストールするプログラムが入っています。
- /cdromにCD-ROMをマウントした後、
-
- $ cd ./contrib
- $ ./instgame kichiku.inf
-
- のようにしてインストールします。 詳しくは contrib/README.TXTを御覧下さい。
-
-
-3. コンパイル時のオプション
-
- $ ./configure --help
- で使用可能なオプションの一覧がでます。
-
- * audio 関連
-
-  --enable-audio=xxx
-     オーディオデバイスのうち xxx を有効にしてコンパイルします。xxx には今の所
-     oss, alsa, esd が使えます。カンマで区切って並べて指定する事で複数のデバイ
-     スをゲーム起動時に選択できます。(ex. --enable-audio=oss,alsa,esd)
-     このオプションを指定しない時は OS ごとに適切なデバイスが組み込まれます。
-
-  --with-default-output=xxx
-     --enable-audioで複数のデバイスを選択した時、デフォルトのデバイスをこの
-    オプションで指定できます。指定しない場合は使用可能なデバイスのうち任意の
-    デバイスを使用します。
-
-  --with-oss-audiodev=xxx
-     OSS での DSP デバイスのデバイスファイルを xxx で指定します。デフォルトは
-     /dev/dsp です。(*1)
-
-  --with-oss-mixerdev=xxx
-     OSS での MIXER デバイスのデバイスファイルを xxx で指定します。デフォルトは
-     /dev/mixer です。(*1)
-  
-  --enable-cdrom=xxx
-     CD-ROM デバイスのうち xxx を有効にしてコンパイルします。CD-DA の代わりに
-     MP3などを外部プレイヤを使って演奏することも出来ます。xxx には linux,bsd,
-     mp3 が使えます。
-     カンマで区切って並べて指定することで複数のデバイスをゲーム起動時に選択
-     できます。(ex. --enable-cdrom=linux,mp3)
-     CD-DA を使うか MP3 を使うかの指定については README.music を御覧下さい。
-     このオプションを指定しない時は OS ごとに適切なデバイスが組み込まれます。
-
-  --with-cdromdev=xxx
-     CD-ROM デバイスのデバイスファイルを xxx で指定します。デフォルトは
-     /dev/cdrom です。(*1)
-
-  --enable-midi=xxx
-     MIDI デバイスのうち xxx を有効にしてコンパイルします。xxx にはいまのところ
-     extp,raw,seq が使えます。extp は外部プレイヤを使って MIDI を演奏します。
-     raw は Raw midi デバイス (/dev/midiなど)を通して外部MIDI機器を接続している
-     場合に使います。seq は OSS sequencer device (/dev/sequencer) を通して MIDI
-     機器を接続している場合に使います。カンマで区切って並べて指定することで複数
-     のデバイスをゲーム起動時に選択できます。(ex. --enable-midi=extp,raw,seq)
-
-  --with-mididev=xxx
-     Raw MIDI デバイスのデバイスファイルを xxx で指定します。デフォルトは
-     /dev/midi です。(*1)
-
-  --with-seqdev=xxx
-     Sequencer MIDI デバイスのデバイスファイルを xxx で指定します。デフォルトは
-     /dev/sequencer です。(*1)
-
-  --with-midiplayer=xxx
-     外部 MIDI プレイヤを指定します。デフォルトは midiplay -4 です。(*1)
-
-  --enable-qmidi
-     外部 MIDI プレイヤを実行する際に、プレイヤーの実行時メッセージを抑止
-     します。
-
-
- * graphics 関連
- 
-  --enable-sdl
-     SDL を有効にしてコンパイルします。
-
-  --enable-bgr
-     X server の color order が BGR の時指定します。SunとSGIのプラットフォーム
-     ではデフォルトでこの指定が有効になっています。それ以外のプラットフォーム
-     では不要です。ただし、sgi O2 および、Sun sparc のマシンの中には RGB の
-     並びのものもあるので、その場合は --enable-bgr=no あるいは --disable-bgr 
-     としてください。詳しくは doc/README.color を御覧下さい。
-
-
- * その他
-
-  --enable-joy
-     Joystic support を有効にしてコンパイルします。Linux kernel 2.2 以降に
-     対応しています。
-
-  --with-joydev=xxx
-     Joystick デバイスのデバイスファイルを xxx で指定します。デフォルトは
-     /dev/js0 です。(*1)
-
-  --with-locale=xxxx
-     X の locale 機構を使う場合に指定します。Linux libc5 System 等では通常
-     使用している locale を指定して下さい。(ex. --with-locale=ja_JP.ujis)
-     それ以外では必要無いと思います。
-
-  --with-cachesize=xxxx
-     データキャッシュの大きさを指定します。単位は MB で、デフォルトは 20MB
-     です。データのほとんどは展開済み CG のキャッシュに使われます。シナリオ
-     などのデータは mmap を使っていますので、キャッシングは xsystem35 の管理
-     外です。
-
-  --enable-mmx
-     IA32 プラットフォームで MMX を使うようにします。nasm というアセンブラが
-     必要になります。IA32 ではデフォルトで有効にします。無効にする場合は =no
-     を指定して下さい。実行時に MMX 命令が使用可能かどうかチェックしますので、
-     MMX 命令を持たないCPUでも有効のままでかまいません。
-
-  --enable-debug
-     debuging を有効にします。
-     有効にしてコンパイルすると -debuglv # オプションが使えるようになります。
-     debug level に関しては src/xsystem35.h を参照して下さい。
-
-## (*1) 実行時に読み込む設定ファイル ~/.xsys35rc でも指定できます。
-
-
-  参考: 私の開発時の configure オプション(実際には１行です)
-
-        ./configure --enable-midi=extp,raw,seq --enable-audio=oss,alsa,esd 
-        --enable-cdrom=linux,mp3 --enable-debug
-
-4. サポート
- 
-  http://www.aist-nara.ac.jp/~masaki-c/private/unitbase/xsys35/index.html
-  または READMEの 8. サポートの項を御覧下さい。

README.md

@@ -1,47 +1,136 @@
 # xsytem35-sdl2
 
-This is a multi-platform port of xsystem35, a free implementation of AriceSoft's System3.x game engine.
+This is a multi-platform port of `xsystem35`, a free implementation of
+AliceSoft's System 3.x game engine.
 
-## Download
-Prebuilt binaries for Windows and Android can be downloaded from the [Releases](https://github.com/kichikuou/xsystem35-sdl2/releases) page.
+## Compatibility
 
-## Build
+See the [game compatibility table](game_compatibility.md) for a list of games
+that can be played with xsystem35-sdl2.
+
+## Unique Features
+
+In addition to the original System 3.x functionalities, xsystem35-sdl2 offers
+the following features:
+
+### Playing Audio Files as Virtual CD Music
+
+Many System 3.x games feature music as audio tracks on the CD-ROM. xsystem35
+can play music from audio files, eliminating the need to insert CDs. To use
+ripped audio files, create a file named `playlist.txt` in the game directory
+and list the paths to your tracks, one per line. For example:
+
+```
+# The first line is not used
+BGM/track02.mp3
+BGM/track03.mp3
+...
+```
+
+The first line is not used because the first track on a game CD is typically a
+data track.
+
+Some games have integrated music as MIDI. In such cases, the music won't play
+using the virtual CD feature. If you encounter a `Cannot load MIDI` error
+message, you might need to set the `SDL_SOUNDFONTS` environment variable to
+point to an `.sf2` file. For example:
+
+```
+SDL_SOUNDFONTS=/usr/share/soundfonts/GeneralUser.sf2 xsystem35
+```
+
+### Unicode Translation Support
+
+While the original System 3.x only supported Shift_JIS (a Japanese character
+encoding), xsystem35 supports Unicode and can run games translated into
+languages other than Japanese and English.
+
+For instructions on how to build a game with Unicode support, see the
+[xsys35c](https://github.com/kichikuou/xsys35c) documentation.
+
+### Debugging
+
+xsystem35 features a built-in debugger that allows you to step through the game
+and examine or modify game variables. There are two ways to use the debugger:
+
+- Through [Visual Studio Code](https://code.visualstudio.com/) (recommended):
+  The [vscode-system3x](https://github.com/kichikuou/vscode-system3x) extension
+  provides a graphical debugging interface for System 3.x.
+- Using the CLI Debugger: Running xsystem35 with the `-debug` option will
+  launch the debugger with a console interface. Type `help` to see a list of
+  available commands.
+
+## Installation
+
+Prebuilt packages for Windows and Android can be downloaded from the
+[Releases](https://github.com/kichikuou/xsystem35-sdl2/releases) page. For
+other platforms, refer to the [Building](#building) section.
+
+## Running
+### Windows
+
+Copy `xsystem35.exe` to the game folder and run it.
+
+### Android
+
+See [android/README.md](android/README.md#use).
+
+### Other Platforms
+
+Run xsystem35 from within the game directory.
+
+```bash
+$ cd /path/to/game_directory
+$ xsystem35
+```
+
+## Building
 ### Linux (Debian / Ubuntu)
 
-    $ sudo apt install build-essential cmake libgtk-3-dev libsdl2-dev libsdl2-ttf-dev libsdl2-mixer-dev libcjson-dev
-    $ mkdir -p out/debug
-    $ cd out/debug
-    $ cmake -DCMAKE_BUILD_TYPE=Debug ../../
-    $ make && make install
+```bash
+$ sudo apt install build-essential cmake libgtk-3-dev libsdl2-dev libsdl2-ttf-dev libsdl2-mixer-dev libwebp-dev libcjson-dev
+$ mkdir -p out/debug
+$ cd out/debug
+$ cmake -DCMAKE_BUILD_TYPE=Debug ../../
+$ make && make install
+```
 
 ### MacOS
 
-[Homebrew](https://brew.sh/index_ja) is needed.
+[Homebrew](https://brew.sh/) is required.
 
-    $ brew install cmake pkg-config sdl2 sdl2_mixer sdl2_ttf libjpeg cjson
-    $ mkdir -p out/debug
-    $ cd out/debug
-    $ cmake -DCMAKE_BUILD_TYPE=Debug ../../
-    $ make && make install
+```bash
+$ brew install cmake pkg-config sdl2 sdl2_mixer sdl2_ttf webp cjson
+$ mkdir -p out/debug
+$ cd out/debug
+$ cmake -DCMAKE_BUILD_TYPE=Debug ../../
+$ make && make install
+```
 
 ### Windows
 
-[MSYS2](https://www.msys2.org) is needed.
+[MSYS2](https://www.msys2.org) is required.
 
-    $ pacman -S cmake mingw-w64-x86_64-cmake mingw-w64-x86_64-SDL2 mingw-w64-x86_64-SDL2_ttf mingw-w64-x86_64-SDL2_mixer mingw-w64-x86_64-libjpeg-turbo mingw-w64-x86_64-cjson
-    $ mkdir -p out/debug
-    $ cd out/debug
-    $ cmake -G"MSYS Makefiles" -DCMAKE_BUILD_TYPE=Debug ../../
-    $ make
+```bash
+$ pacman -S cmake mingw-w64-ucrt-x86_64-gcc mingw-w64-ucrt-x86_64-cmake mingw-w64-ucrt-x86_64-SDL2 mingw-w64-ucrt-x86_64-SDL2_ttf mingw-w64-ucrt-x86_64-SDL2_mixer mingw-w64-ucrt-x86_64-libwebp mingw-w64-ucrt-x86_64-cjson
+$ mkdir -p out/debug
+$ cd out/debug
+$ cmake -G"MSYS Makefiles" -DCMAKE_BUILD_TYPE=Debug ../../
+$ make
+```
 
 ### Emscripten
 
-    $ mkdir -p out/wasm
-    $ cd out/wasm
-    $ emcmake cmake -DCMAKE_BUILD_TYPE=MinSizeRel ../../
-    $ make
+```bash
+$ mkdir -p out/wasm
+$ cd out/wasm
+$ emcmake cmake -DCMAKE_BUILD_TYPE=MinSizeRel ../../
+$ make
+```
 
-To use the generated binary, checkout [Kichikuou on Web](https://github.com/kichikuou/web) and copy `out/xsystem35.*` into its `docs` directory.
+To use the generated binary, check out
+[Kichikuou on Web](https://github.com/kichikuou/web) and copy `out/xsystem35.*`
+into its `docs` directory.
 
 ### Android
 

android/README.md

@@ -1,60 +1,73 @@
 # xsystem35 for Android
 
 ## Download
-Prebuilt APKs are [here](https://github.com/kichikuou/xsystem35-sdl2/releases).
+You can download prebuilt APKs
+[here](https://github.com/kichikuou/xsystem35-sdl2/releases).
 
 ## Build
 Prerequisites:
-- CMake >=3.13
 - Android SDK >=28
 - Android NDK >=r15c
 
 ### Using Android Studio
 Open this directory as an Android Studio project.
 
-### Command line build
-Configure environment variables and run the `gradlew` script in this folder.
+### Command Line Build
+Set environment variables and run the `gradlew` script in this directory.
 
-Example build instructions (for Debian buster):
+Example build instructions (for Debian bookworm):
 ```sh
 # Install necessary packages
-sudo apt install git wget unzip default-jdk-headless cmake ninja-build
+sudo apt install git wget unzip default-jdk-headless ninja-build
 
 # Install Android SDK / NDK
 export ANDROID_SDK_ROOT=$HOME/android-sdk
 mkdir -p $ANDROID_SDK_ROOT/cmdline-tools
-wget https://dl.google.com/android/repository/commandlinetools-linux-7302050_latest.zip
-unzip commandlinetools-linux-7302050_latest.zip -d $ANDROID_SDK_ROOT/cmdline-tools
+wget https://dl.google.com/android/repository/commandlinetools-linux-10406996_latest.zip
+unzip commandlinetools-linux-10406996_latest.zip -d $ANDROID_SDK_ROOT/cmdline-tools
 mv $ANDROID_SDK_ROOT/cmdline-tools/cmdline-tools $ANDROID_SDK_ROOT/cmdline-tools/tools
-yes |$ANDROID_SDK_ROOT/cmdline-tools/tools/bin/sdkmanager --licenses
-$ANDROID_SDK_ROOT/cmdline-tools/tools/bin/sdkmanager ndk-bundle
+yes | $ANDROID_SDK_ROOT/cmdline-tools/tools/bin/sdkmanager --licenses
+$ANDROID_SDK_ROOT/cmdline-tools/tools/bin/sdkmanager ndk-bundle 'cmake;3.22.1'
 export ANDROID_NDK_HOME=$ANDROID_SDK_ROOT/ndk-bundle
 
-# Check out and build xsystem35
+# Clone and build xsystem35
 git clone https://github.com/kichikuou/xsystem35-sdl2.git
 cd xsystem35-sdl2/android
 ./gradlew build  # or ./gradlew installDebug if you have a connected device
 ```
 
-## Use
+## Usage
 ### Basic Usage
-1. Create a ZIP file containing all the game files and BGM files (see [below](#preparing-a-zip) for details), and transfer it to your device.
-2. Open the app. A list of installed games is displayed. Since nothing has been installed yet, only the "Install from ZIP" button is displayed. Tap it.
-3. Select the ZIP file you created in 1.
-4. The game starts. Two-finger touch is treated as a right click.
+1. Create a ZIP file containing all the game files and BGM files (see
+   [below](#preparing-a-zip) for details), and transfer it to your device.
+2. Open the app. A list of installed games will be displayed. Since no games
+   have been installed yet, only the "Install from ZIP" button will be visible.
+   Tap it.
+3. Select the ZIP file you created in step 1.
+4. The game will start. To simulate a right-click, tap the black bars on either
+   the left or right, or top or bottom of the screen.
 
 ### Preparing a ZIP
-- Include all files in the `GAMEDATA` folder (`.ALD` files and others). `.EXE` and `.DLL` are not really needed, but you can include them as well.
-- Music files (`.mp3`, `.ogg` or `.wav`) whose file names end with a number are recognized as BGM files. For example:
+- Include all files from the `GAMEDATA` folder (such as `.ALD` files and
+  others). `.EXE` and `.DLL` files are not necessary, but you can include them
+  if you want.
+- Music files (`.mp3`, `.ogg`, or `.wav`) whose filenames end with a number
+  will be recognized as BGM files. For example:
   - `Track2.mp3`
   - `15.ogg`
-  - `rance4_03.wav` (This shouldn't be `rance403.wav`, because it would be treated as the 403rd track)
+  - `rance4_03.wav` (Note: The filename shouldn't be `rance403.wav`, as it
+    would be treated as the 403rd track.)
 
-Note: This form of ZIP can be used in [Kichikuou on Web](http://kichikuou.github.io/web/) as well.
+Note: This ZIP format is also compatible with
+[Kichikuou on Web](http://kichikuou.github.io/web/).
 
 ### Miscellaneous
-- You can export / import saved files using the option menu of the game list.
-- To uninstall a game, long-tap the title in the game list.
+- You can export or import save files via the game list's option menu.
+- To uninstall a game, long-tap its title in the game list.
 
 ## Known Issues
-- Android versions older than 7.0 cannot handle ZIPs containing Shift-JIS file names. This is the case with some ZIPs distributed on [retroc.net](http://retropc.net/alice/). If you get the error "This type of ZIP is not supported.", unzip the ZIP file on your PC and re-archive it with a modern ZIP creation software.
+- Android versions older than 7.0 cannot handle ZIP files containing Shift-JIS
+  filenames. This issue occurs with some ZIP files distributed on
+  [retroc.net](http://retropc.net/alice/). If you encounter the error message
+  "This type of ZIP is not supported," unzip the file on your PC and re-archive
+  it using modern ZIP creation software.

android/app/build.gradle

@@ -9,33 +9,47 @@ else {
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 28
+    if (buildAsApplication) {
+        namespace "io.github.kichikuou.xsystem35"
+    }
+    compileSdkVersion 34
     defaultConfig {
-        if (buildAsApplication) {
-            applicationId "io.github.kichikuou.xsystem35"
-        }
         minSdkVersion 19
-        targetSdkVersion 28
-        versionCode 5
-        versionName "0.2.3"
+        targetSdkVersion 34
+        versionCode 23
+        versionName "2.11.5" + gitRevision()
         externalNativeBuild {
             cmake {
-                arguments "-DANDROID_APP_PLATFORM=android-16", "-DANDROID_STL=c++_static"
+                arguments "-DANDROID_APP_PLATFORM=android-19", "-DANDROID_STL=c++_static"
                 // abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
                 abiFilters 'armeabi-v7a', 'arm64-v8a'
             }
         }
     }
+    signingConfigs {
+        release {
+            storeFile rootProject.file('keystore.jks')
+            storePassword System.getenv('KEYSTORE_PASSWORD')
+            keyAlias System.getenv('KEY_ALIAS')
+            keyPassword System.getenv('KEY_PASSWORD')
+        }
+    }
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            if (rootProject.file('keystore.jks').exists()) {
+                signingConfig signingConfigs.release
+            }
         }
     }
+    applicationVariants.all { variant ->
+        tasks["merge${variant.name.capitalize()}Assets"]
+            .dependsOn("externalNativeBuild${variant.name.capitalize()}")
+    }
     if (!project.hasProperty('EXCLUDE_NATIVE_LIBS')) {
         sourceSets.main {
             jniLibs.srcDir 'libs'
-            assets.srcDir '../../fonts'
         }
         aaptOptions {
             // Disable asset compression for fonts.
@@ -44,18 +58,16 @@ android {
         }
         externalNativeBuild {
             cmake {
-                // xsystem35 requires CMake >=3.13, so SDK-bundled CMake
-                // (3.6 or 3.10.2) cannot be used.
-                version getInstalledCmakeVersion()
+                version '3.22.1'
                 path 'jni/CMakeLists.txt'
             }
         }
        
     }
-    lintOptions {
+    lint {
         abortOnError false
     }
-    
+
     if (buildAsLibrary) {
         libraryVariants.all { variant ->
             variant.outputs.each { output ->
@@ -72,8 +84,9 @@ android {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
 }
 
-static String getInstalledCmakeVersion() {
-    ('cmake --version'.execute().text =~ /cmake version ([0-9.]+)/)[0][1]
+static String gitRevision() {
+    ' (git ' + "git rev-parse --short HEAD".execute().text.trim() + ')'
 }

android/app/jni/CMakeLists.txt

@@ -1,49 +1,53 @@
-cmake_minimum_required(VERSION 3.13)
+cmake_minimum_required(VERSION 3.14)
 
 project(GAME)
+set(PROJECT_ROOT_DIR ../../..)
 
-# armeabi-v7a requires cpufeatures library
-# include(AndroidNdkModules)
-# android_ndk_import_module_cpufeatures()
-
+# Compilation of SDL and companion libraries
 include(FetchContent)
 FetchContent_Declare(
   SDL
-  URL https://libsdl.org/release/SDL2-2.0.16.tar.gz
-  URL_HASH SHA1=57825428174adb2ac947e4014080c262505aa972
-  PATCH_COMMAND patch -p1 -i ${CMAKE_CURRENT_LIST_DIR}/SDL.patch
+  URL https://github.com/libsdl-org/SDL/releases/download/release-2.30.2/SDL2-2.30.2.tar.gz
+  URL_HASH SHA1=37a0557fc39460dc2a4fbbf162d95f115d2c9be2
 )
-# TODO: Use SDL2_ttf 2.0.16 once released
 FetchContent_Declare(
   SDL_ttf
-  GIT_REPOSITORY https://github.com/libsdl-org/SDL_ttf.git
-  GIT_TAG 11722a2bb4335d489d724c08cfdbb45f97d07aa7
+  URL https://github.com/libsdl-org/SDL_ttf/releases/download/release-2.22.0/SDL2_ttf-2.22.0.tar.gz
+  URL_HASH SHA1=da5e86b601ad299a697878fab1af6f3be47b529d
 )
-# TODO: Use SDL2_mixer 2.0.5 once released
 FetchContent_Declare(
   SDL_mixer
-  GIT_REPOSITORY https://github.com/libsdl-org/SDL_mixer.git
-  GIT_TAG 20433729fb318f7b6f773a42ffa410114cb067f2
+  URL https://github.com/libsdl-org/SDL_mixer/releases/download/release-2.8.0/SDL2_mixer-2.8.0.tar.gz
+  URL_HASH SHA1=a58c69f9d00e44833b9e00e1adb58d85759ca499
 )
 
-# Compilation of SDL and companion libraries
-FetchContent_GetProperties(SDL)
-if(NOT sdl_POPULATED)
-  FetchContent_Populate(SDL)
-  add_subdirectory(${sdl_SOURCE_DIR} ${sdl_BINARY_DIR})
-endif()
-FetchContent_GetProperties(SDL_ttf)
-if(NOT sdl_ttf_POPULATED)
-  FetchContent_Populate(SDL_ttf)
-  add_subdirectory(${sdl_ttf_SOURCE_DIR} ${sdl_ttf_BINARY_DIR})
-endif()
-FetchContent_GetProperties(SDL_mixer)
-if(NOT sdl_mixer_POPULATED)
-  FetchContent_Populate(SDL_mixer)
-  SET(SUPPORT_OGG ON CACHE BOOL "Enable OGG support in SDL_mixer" FORCE)
-  add_subdirectory(${sdl_mixer_SOURCE_DIR} ${sdl_mixer_BINARY_DIR})
-  target_compile_definitions(SDL2_mixer PRIVATE MUSIC_WAV)
-endif()
+set(SDL2TTF_SAMPLES OFF CACHE BOOL "Build the SDL2_ttf sample program(s)" FORCE)
+set(SDL2TTF_INSTALL OFF CACHE BOOL "Enable SDL2_ttf install target" FORCE)
+set(SDL2TTF_VENDORED ON CACHE BOOL "Use vendored third-party libraries" FORCE)
+
+set(SDL2MIXER_OPUS OFF CACHE BOOL "Enable Opus music" FORCE)
+set(SDL2MIXER_FLAC OFF CACHE BOOL "Enable FLAC music" FORCE)
+set(SDL2MIXER_MOD  OFF CACHE BOOL "Support loading MOD music" FORCE)
+set(SDL2MIXER_MIDI OFF CACHE BOOL "Enable MIDI music" FORCE)
+set(SDL2MIXER_WAVPACK OFF CACHE BOOL "Enable WavPack music" FORCE)
+set(SDL2MIXER_SAMPLES OFF CACHE BOOL "Build the SDL2_mixer sample program(s)" FORCE)
+set(SDL2MIXER_INSTALL OFF CACHE BOOL "Enable SDL2_mixer install target" FORCE)
+
+FetchContent_MakeAvailable(SDL SDL_ttf SDL_mixer)
 
 # The main CMakeLists.txt of xsystem35
-add_subdirectory(../../.. xsystem35)
+add_subdirectory(${PROJECT_ROOT_DIR} xsystem35)
+
+# Copy asset files
+set(ASSETS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../src/main/assets)
+file(MAKE_DIRECTORY ${ASSETS_DIR}/licenses)
+file(COPY_FILE ${PROJECT_ROOT_DIR}/fonts/MTLc3m.ttf ${ASSETS_DIR}/MTLc3m.ttf)
+file(COPY_FILE ${PROJECT_ROOT_DIR}/fonts/mincho.otf ${ASSETS_DIR}/mincho.otf)
+file(COPY_FILE ${PROJECT_ROOT_DIR}/COPYING ${ASSETS_DIR}/licenses/xsystem35)
+file(COPY_FILE ${PROJECT_ROOT_DIR}/fonts/MTLc3m.ttf.license ${ASSETS_DIR}/licenses/MTLc3m)
+file(COPY_FILE ${PROJECT_ROOT_DIR}/fonts/mincho.otf.license ${ASSETS_DIR}/licenses/mincho)
+file(COPY_FILE ${sdl_SOURCE_DIR}/LICENSE.txt ${ASSETS_DIR}/licenses/SDL)
+file(COPY_FILE ${sdl_ttf_SOURCE_DIR}/LICENSE.txt ${ASSETS_DIR}/licenses/SDL_ttf)
+file(COPY_FILE ${sdl_ttf_SOURCE_DIR}/external/freetype/docs/GPLv2.TXT ${ASSETS_DIR}/licenses/freetype)
+file(COPY_FILE ${sdl_ttf_SOURCE_DIR}/external/harfbuzz/COPYING ${ASSETS_DIR}/licenses/harfbuzz)
+file(COPY_FILE ${sdl_mixer_SOURCE_DIR}/LICENSE.txt ${ASSETS_DIR}/licenses/SDL_mixer)

android/app/jni/SDL.patch

@@ -1,17 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e7ab00feb..d86f0087a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -2053,6 +2053,12 @@ if(SDL_SHARED)
-     set_property(TARGET SDL2 APPEND_STRING PROPERTY COMPILE_FLAGS "-fobjc-arc")
-     target_compile_definitions(SDL2 PRIVATE IOS_DYLIB=1)
-   endif()
-+  if (ANDROID)
-+    # Link the cpufeatures library in Android NDK.
-+    # Since we don't use a SDK-bundled CMAKE, AndroidNdkModules module cannot be used.
-+    target_include_directories(SDL2 PRIVATE ${ANDROID_NDK}/sources/android/cpufeatures)
-+    target_sources(SDL2 PRIVATE ${ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c)
-+  endif()
- endif()
- 
- if(ANDROID)

android/app/jni/src/Android.mk

@@ -13,6 +13,6 @@ LOCAL_SRC_FILES := YourSourceHere.c
 
 LOCAL_SHARED_LIBRARIES := SDL2
 
-LOCAL_LDLIBS := -lGLESv1_CM -lGLESv2 -llog
+LOCAL_LDLIBS := -lGLESv1_CM -lGLESv2 -lOpenSLES -llog -landroid
 
 include $(BUILD_SHARED_LIBRARY)

android/app/src/main/AndroidManifest.xml

@@ -4,7 +4,6 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="io.github.kichikuou.xsystem35"
     android:installLocation="auto">
 
     <!-- OpenGL ES 2.0 -->
@@ -37,10 +36,14 @@
         android:name="android.hardware.microphone"
         android:required="false" /> -->
 
-    <!-- Allow writing to external storage -->
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <!-- Allow downloading to the external storage on Android 5.1 and older -->
+    <!-- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="22" /> -->
+
     <!-- Allow access to Bluetooth devices -->
-    <!-- <uses-permission android:name="android.permission.BLUETOOTH" /> -->
+    <!-- Currently this is just for Steam Controller support and requires setting SDL_HINT_JOYSTICK_HIDAPI_STEAM -->
+    <!-- <uses-permission android:name="android.permission.BLUETOOTH" android:maxSdkVersion="30" /> -->
+    <!-- <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" /> -->
+
     <!-- Allow access to the vibrator -->
     <!-- <uses-permission android:name="android.permission.VIBRATE" /> -->
 
@@ -64,7 +67,9 @@
         <meta-data android:name="SDL_ENV.SDL_ACCELEROMETER_AS_JOYSTICK" android:value="0"/>
          -->
 
-        <activity android:name=".LauncherActivity">
+        <activity android:name=".LauncherActivity"
+            android:exported="true">
+
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -88,6 +93,17 @@
             </intent-filter>
             -->
         </activity>
+
+        <activity android:name=".LicensesMenuActivity"
+            android:label="@string/action_licenses"
+            android:parentActivityName=".LauncherActivity"
+            android:exported="false">
+        </activity>
+
+        <activity android:name=".LicensesActivity"
+            android:parentActivityName=".LicensesMenuActivity"
+            android:exported="false">
+        </activity>
     </application>
 
 </manifest>

android/app/src/main/java/io/github/kichikuou/xsystem35/GameActivity.kt

@@ -30,40 +30,40 @@ import java.io.IOException
 
 // Intent for this activity must have the following extra:
 // - EXTRA_GAME_ROOT (string): A path to the game installation.
+// - EXTRA_SAVE_DIRECTORY (string): A path to the save data directory.
 class GameActivity : SDLActivity() {
     companion object {
         const val EXTRA_GAME_ROOT = "GAME_ROOT"
+        const val EXTRA_SAVE_DIRECTORY = "SAVE_DIRECTORY"
         const val EXTRA_ARCHIVE_NAME = "ARCHIVE_NAME"
     }
 
     private lateinit var gameRoot: File
-    private lateinit var cdda: CddaPlayer
     private val midi = MidiPlayer()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        gameRoot = File(intent.getStringExtra(EXTRA_GAME_ROOT))
-        cdda = CddaPlayer(File(gameRoot, Launcher.PLAYLIST_FILE))
+        gameRoot = File(intent.getStringExtra(EXTRA_GAME_ROOT)!!)
     }
 
     override fun onStop() {
         super.onStop()
-        cdda.onActivityStop()
         midi.onActivityStop()
     }
 
     override fun onResume() {
         super.onResume()
-        cdda.onActivityResume()
         midi.onActivityResume()
     }
 
     override fun getLibraries(): Array<String> {
-        return arrayOf("hidapi", "SDL2", "xsystem35")
+        return arrayOf("SDL2", "xsystem35")
     }
 
     override fun getArguments(): Array<String> {
-        return arrayOf("-gamedir", intent.getStringExtra(EXTRA_GAME_ROOT))
+        return arrayOf(
+            "-gamedir", intent.getStringExtra(EXTRA_GAME_ROOT)!!,
+            "-savedir", intent.getStringExtra(EXTRA_SAVE_DIRECTORY)!!)
     }
 
     override fun setTitle(title: CharSequence?) {
@@ -120,9 +120,6 @@ class GameActivity : SDLActivity() {
     }
 
     // The functions below are called in the SDL thread by JNI.
-    @Suppress("unused") fun cddaStart(track: Int, loop: Boolean) = cdda.start(track, loop)
-    @Suppress("unused") fun cddaStop() = cdda.stop()
-    @Suppress("unused") fun cddaCurrentPosition() = cdda.currentPosition()
     @Suppress("unused") fun midiStart(path: String, loop: Boolean) = midi.start(path, loop)
     @Suppress("unused") fun midiStop() = midi.stop()
     @Suppress("unused") fun midiCurrentPosition() = midi.currentPosition()
@@ -156,69 +153,6 @@ class GameActivity : SDLActivity() {
     }
 }
 
-private class CddaPlayer(private val playlistPath: File) {
-    private val playlist =
-        try {
-            playlistPath.readLines()
-        } catch (e: IOException) {
-            Log.e("loadPlaylist", "Cannot load $playlistPath", e)
-            emptyList<String>()
-        }
-    private var currentTrack = 0
-    private val player = MediaPlayer()
-    private var playerPaused = false
-
-    fun start(track: Int, loop: Boolean) {
-        val f = playlist.elementAtOrNull(track)
-        if (f.isNullOrEmpty()) {
-            Log.w("cddaStart", "No playlist entry for track $track")
-            return
-        }
-        Log.v("cddaStart", "$f Loop:$loop")
-        try {
-            player.apply {
-                reset()
-                setDataSource(File(playlistPath.parent, f).path)
-                isLooping = loop
-                prepare()
-                start()
-            }
-            currentTrack = track
-        } catch (e: IOException) {
-            Log.e("cddaStart", "Cannot play $f", e)
-            player.reset()
-        }
-    }
-
-    fun stop() {
-        if (currentTrack > 0 && player.isPlaying) {
-            player.stop()
-            currentTrack = 0
-        }
-    }
-
-    fun currentPosition(): Int {
-        if (currentTrack == 0)
-            return 0
-        val frames = player.currentPosition * 75 / 1000
-        return currentTrack or (frames shl 8)
-    }
-
-    fun onActivityStop() {
-        if (currentTrack > 0 && player.isPlaying) {
-            player.pause()
-            playerPaused = true
-        }
-    }
-
-    fun onActivityResume() {
-        if (playerPaused) {
-            player.start()
-            playerPaused = false
-        }
-    }
-}
-
 private class MidiPlayer {
     private val player = MediaPlayer()
     private var playing = false

android/app/src/main/java/io/github/kichikuou/xsystem35/Launcher.kt

@@ -17,15 +17,15 @@
 */
 package io.github.kichikuou.xsystem35
 
-import android.annotation.SuppressLint
 import android.os.Build
-import android.os.Handler
-import android.os.Message
 import android.util.Log
+import kotlinx.coroutines.DelicateCoroutinesApi
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import java.io.*
-import java.lang.StringBuilder
 import java.nio.charset.Charset
-import java.util.*
 import java.util.zip.ZipEntry
 import java.util.zip.ZipInputStream
 import java.util.zip.ZipOutputStream
@@ -39,15 +39,13 @@ interface LauncherObserver {
     fun onInstallFailure(msgId: Int)
 }
 
-private const val SAVE_DIR = "save"
-private const val PROGRESS = 0
-private const val SUCCESS = 1
-private const val FAILURE = 2
-
 class Launcher private constructor(private val rootDir: File) {
     companion object {
+        const val SAVE_DIR = "save"
         const val TITLE_FILE = "title.txt"
+        const val GAMEDIR_FILE = "game_directory.txt"
         const val PLAYLIST_FILE = "playlist.txt"
+        const val OLD_PLAYLIST_FILE = "playlist2.txt"
 
         fun getInstance(rootDir: File): Launcher {
             if (gLauncher == null) {
@@ -73,31 +71,28 @@ class Launcher private constructor(private val rootDir: File) {
         updateGameList()
     }
 
+    @OptIn(DelicateCoroutinesApi::class)
     fun install(input: InputStream, archiveName: String?) {
         val dir = createDirForGame()
-        @SuppressLint("HandlerLeak")
-        val handler = object : Handler() {
-            override fun handleMessage(msg: Message) {
-                when (msg.what) {
-                    PROGRESS -> {
-                        observer?.onInstallProgress(msg.obj as String)
-                    }
-                    SUCCESS -> {
-                        isInstalling = false
-                        observer?.onInstallSuccess(msg.obj as File, archiveName)
-                    }
-                    FAILURE -> {
-                        isInstalling = false
-                        observer?.onInstallFailure(msg.obj as Int)
+        isInstalling = true
+        GlobalScope.launch(Dispatchers.Main) {
+            try {
+                val gameDir = withContext(Dispatchers.IO) {
+                    extractFiles(input, dir) { msg ->
+                        GlobalScope.launch(Dispatchers.Main) {
+                            observer?.onInstallProgress(msg)
+                        }
                     }
                 }
+                observer?.onInstallSuccess(gameDir, archiveName)
+            } catch (e: InstallFailureException) {
+                observer?.onInstallFailure(e.msgId)
+            } catch (e: Exception) {
+                Log.e("launcher", "Failed to extract ZIP", e)
+                observer?.onInstallFailure(R.string.zip_extraction_error)
             }
+            isInstalling = false
         }
-        val t = Thread {
-            extractFiles(input, dir, handler)
-        }
-        t.start()
-        isInstalling = true
     }
 
     fun uninstall(id: Int) {
@@ -109,7 +104,7 @@ class Launcher private constructor(private val rootDir: File) {
     private fun updateGameList() {
         var saveDirFound = false
         games.clear()
-        for (path in rootDir.listFiles()) {
+        for (path in rootDir.listFiles() ?: emptyArray()) {
             if (!path.isDirectory)
                 continue
             if (path.name == SAVE_DIR) {
@@ -117,9 +112,12 @@ class Launcher private constructor(private val rootDir: File) {
                 continue
             }
             try {
-                val titleFile = File(path, TITLE_FILE)
+                val gameDirFile = File(path, GAMEDIR_FILE)
+                val gamePath = if (gameDirFile.exists()) File(path, gameDirFile.readText()) else path
+                val titleFile = File(gamePath, TITLE_FILE)
                 val title = titleFile.readText()
-                games.add(Entry(path, title, titleFile.lastModified()))
+                games.add(Entry(gamePath, title, titleFile.lastModified()))
+                migratePlaylist(path)
             } catch (e: IOException) {
                 // Incomplete game installation. Delete it.
                 path.deleteRecursively()
@@ -144,7 +142,7 @@ class Launcher private constructor(private val rootDir: File) {
     // Throws IOException
     fun exportSaveData(output: OutputStream) {
         ZipOutputStream(output.buffered()).use { zip ->
-            for (path in File(rootDir, SAVE_DIR).listFiles()) {
+            for (path in File(rootDir, SAVE_DIR).listFiles() ?: emptyArray()) {
                 if (path.isDirectory || path.name.endsWith(".asd."))
                     continue
                 val pathInZip = "${SAVE_DIR}/${path.name}"
@@ -181,94 +179,76 @@ class Launcher private constructor(private val rootDir: File) {
         }
     }
 
-    private fun extractFiles(input: InputStream, outDir: File, handler: Handler) {
-        try {
-            val configWriter = GameConfigWriter()
-            val hadDecodeError = forEachZipEntry(input) { zipEntry, zip ->
-                Log.i("extractFiles", zipEntry.name)
-                val path = File(outDir, zipEntry.name)
-                if (zipEntry.isDirectory)
-                    return@forEachZipEntry
-                path.parentFile.mkdirs()
-                handler.sendMessage(handler.obtainMessage(PROGRESS, zipEntry.name))
-                FileOutputStream(path).buffered().use {
-                    zip.copyTo(it)
-                }
-                configWriter.maybeAdd(zipEntry.name)
+    private fun extractFiles(input: InputStream, outDir: File, progressCallback: (String) -> Unit): File {
+        val configWriter = GameConfigWriter()
+        val hadDecodeError = forEachZipEntry(input) { zipEntry, zip ->
+            Log.i("extractFiles", zipEntry.name)
+            val path = File(outDir, zipEntry.name)
+            if (zipEntry.isDirectory)
+                return@forEachZipEntry
+            path.parentFile?.mkdirs()
+            progressCallback(zipEntry.name)
+            FileOutputStream(path).buffered().use {
+                zip.copyTo(it)
             }
-            if (!configWriter.readyToWrite()) {
-                val msgId = if (hadDecodeError) R.string.unsupported_zip else R.string.cannot_find_ald
-                handler.sendMessage(handler.obtainMessage(FAILURE, msgId))
-                return
-            }
-            configWriter.write(outDir)
-            handler.sendMessage(handler.obtainMessage(SUCCESS, outDir))
-        } catch (e: IOException) {
-            Log.e("launcher", "Failed to extract ZIP", e)
-            handler.sendMessage(handler.obtainMessage(FAILURE, R.string.zip_extraction_error))
+            configWriter.maybeAdd(zipEntry.name)
+        }
+        if (!configWriter.ready) {
+            if (hadDecodeError)
+                throw InstallFailureException(R.string.unsupported_zip)
+            throw InstallFailureException(R.string.cannot_find_ald)
+        }
+        configWriter.write(outDir)
+        return configWriter.gameDir?.let { File(outDir, it) } ?: outDir
+    }
+
+    // Xsystem35-sdl2 2.3.0 - 2.11.1 used playlist2.txt. Rename it to playlist.txt.
+    private fun migratePlaylist(dir: File) {
+        val oldPlaylist = File(dir, OLD_PLAYLIST_FILE)
+        if (oldPlaylist.exists()) {
+            oldPlaylist.renameTo(File(dir, PLAYLIST_FILE))
         }
     }
 
-    // A helper class which generates xsystem35.gr and playlist.txt in the game root directory.
+    class InstallFailureException(val msgId: Int) : Exception()
+
+    // A helper class which generates GAMEDIR_FILE and PLAYLIST_FILE.
     private class GameConfigWriter {
-        private val grb = StringBuilder()
-        private var basename: String? = null
-        private val aldRegex = """(.*?)([a-z])([a-z])\.(ald|wai|bgi)""".toRegex(RegexOption.IGNORE_CASE)
-        private val aldType = mapOf(
-                "b" to "BGM",
-                "d" to "Data",
-                "g" to "Graphics",
-                "m" to "Midi",
-                "r" to "Resource",
-                "s" to "Scenario",
-                "w" to "Wave")
-        private val specialResources = mapOf(
-                "system39.ain" to "Ain",
-                "system39.ini" to "Init",
-                "sactefam.kld" to "SACT01"
-        )
+        var ready = false
+            private set
+        var gameDir: String? = null
+            private set
+        private val aldRegex = """.*?s[a-z]\.ald""".toRegex(RegexOption.IGNORE_CASE)
         private val audioRegex = """.*?(\d+)\.(wav|mp3|ogg)""".toRegex(RegexOption.IGNORE_CASE)
         private val audioFiles: Array<String?> = arrayOfNulls(100)
 
         fun maybeAdd(path: String) {
-            val name = File(path).name
-
-            specialResources[name.toLowerCase(Locale.US)]?.let {
-                grb.appendln("$it $path")
-                return
+            aldRegex.matchEntire(path)?.let {
+                gameDir = File(path).parent
+                ready = true
             }
-            aldRegex.matchEntire(name)?.let {
-                val ext = it.groupValues[4].toUpperCase(Locale.US)
-                val type = if (ext == "ALD") {
-                    aldType[it.groupValues[2].toLowerCase(Locale.US)]
-                } else {
-                    ext
-                }
-                val id = it.groupValues[3].toUpperCase(Locale.US)
-                if (type != null) {
-                    grb.appendln("$type$id $path")
-                    basename = it.groupValues[1]
-                }
-            }
-            audioRegex.matchEntire(name)?.let {
+            audioRegex.matchEntire(path)?.let {
                 val track = it.groupValues[1].toInt()
-                if (track < audioFiles.size)
-                    audioFiles[track] = path
+                if (0 < track && track <= audioFiles.size)
+                    audioFiles[track - 1] = path
             }
         }
 
-        fun readyToWrite() = basename != null
-
         fun write(outDir: File) {
-            for (id in 'A' .. 'Z') {
-                grb.appendln("Save$id ../save/${basename}s${id.toLowerCase()}.asd")
+            // Generate GAMEDIR_FILE
+            gameDir?.let {
+                File(outDir, GAMEDIR_FILE).writeText(it)
+            }
+            // Generate PLAYLIST_FILE
+            val absGameDir = gameDir?.let { File(outDir, it) } ?: outDir
+            val playlistFile = File(absGameDir, PLAYLIST_FILE)
+            if (!playlistFile.exists()) {
+                val prefixToRemove = gameDir?.let { "$it/" } ?: ""
+                val playlist = audioFiles.joinToString("\n") {
+                    it?.removePrefix(prefixToRemove) ?: ""
+                }.trimEnd('\n')
+                playlistFile.writeText(playlist)
             }
-            val gr = grb.toString()
-            Log.i("xsystem35.gr", gr)
-            File(outDir, "xsystem35.gr").writeText(gr)
-
-            val playlist = audioFiles.joinToString("\n") { it ?: "" }.trimEnd('\n')
-            File(outDir, PLAYLIST_FILE).writeText(playlist)
         }
     }
 }

android/app/src/main/java/io/github/kichikuou/xsystem35/LauncherActivity.kt

@@ -25,10 +25,9 @@ import android.provider.OpenableColumns
 import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
-import android.view.View
-import android.widget.AdapterView
 import android.widget.ArrayAdapter
 import android.widget.ListView
+import android.widget.TextView
 import android.widget.Toast
 import java.io.*
 
@@ -36,31 +35,46 @@ private const val CONTENT_TYPE_ZIP = "application/zip"
 private const val INSTALL_REQUEST = 1
 private const val SAVEDATA_EXPORT_REQUEST = 2
 private const val SAVEDATA_IMPORT_REQUEST = 3
+private const val STATE_PROGRESS_TEXT = "progressText"
 
-class LauncherActivity : ListActivity(), AdapterView.OnItemLongClickListener, LauncherObserver {
+class LauncherActivity : Activity(), LauncherObserver {
     private lateinit var launcher: Launcher
-    private var progressDialog: ProgressDialogFragment? = null
+    private var progressDialog: Dialog? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        setContentView(R.layout.launcher)
 
         launcher = Launcher.getInstance(filesDir)
         launcher.observer = this
         if (launcher.isInstalling) {
-            showProgressDialog()
+            showProgressDialog(savedInstanceState)
         }
 
         onGameListChange()
-        listView.onItemLongClickListener = this
+        val listView = findViewById<ListView>(R.id.list)
+        listView.setOnItemClickListener { _, _, position, _ ->
+            onListItemClick(position)
+        }
+        listView.setOnItemLongClickListener { _, _, position, _ ->
+            onItemLongClick(position)
+        }
     }
 
     override fun onDestroy() {
         launcher.observer = null
+        dismissProgressDialog()
         super.onDestroy()
     }
 
-    override fun onListItemClick(l: ListView?, v: View?, position: Int, id: Long) {
-        super.onListItemClick(l, v, position, id)
+    override fun onSaveInstanceState(outState: Bundle) {
+        progressDialog?.let {
+            outState.putCharSequence(STATE_PROGRESS_TEXT, it.findViewById<TextView>(R.id.text).text)
+        }
+        super.onSaveInstanceState(outState)
+    }
+
+    private fun onListItemClick(position: Int) {
         if (position < launcher.games.size) {
             startGame(launcher.games[position].path, null)
         } else {
@@ -70,7 +84,7 @@ class LauncherActivity : ListActivity(), AdapterView.OnItemLongClickListener, La
         }
     }
 
-    override fun onItemLongClick(a: AdapterView<*>?, v: View?, position: Int, id: Long): Boolean {
+    private fun onItemLongClick(position: Int): Boolean {
         if (position < launcher.games.size) {
             AlertDialog.Builder(this).setTitle(R.string.uninstall_dialog_title)
                     .setMessage(getString(R.string.uninstall_dialog_message, launcher.games[position].title))
@@ -102,6 +116,11 @@ class LauncherActivity : ListActivity(), AdapterView.OnItemLongClickListener, La
                                        SAVEDATA_IMPORT_REQUEST)
                 true
             }
+            R.id.licenses -> {
+                val intent = Intent(this, LicensesMenuActivity::class.java)
+                startActivity(intent)
+                true
+            }
             else -> super.onOptionsItemSelected(item)
         }
     }
@@ -139,11 +158,12 @@ class LauncherActivity : ListActivity(), AdapterView.OnItemLongClickListener, La
     override fun onGameListChange() {
         val items = launcher.titles.toMutableList()
         items.add(getString(R.string.install_from_zip))
-        listAdapter = ArrayAdapter(this, android.R.layout.simple_list_item_1, items)
+        val listView = findViewById<ListView>(R.id.list)
+        listView.adapter = ArrayAdapter(this, android.R.layout.simple_list_item_1, items)
     }
 
     override fun onInstallProgress(path: String) {
-        progressDialog?.setProgress(getString(R.string.install_progress, path))
+        progressDialog?.findViewById<TextView>(R.id.text)?.text = getString(R.string.install_progress, path)
     }
 
     override fun onInstallSuccess(path: File, archiveName: String?) {
@@ -160,6 +180,7 @@ class LauncherActivity : ListActivity(), AdapterView.OnItemLongClickListener, La
         val i = Intent()
         i.setClass(applicationContext, GameActivity::class.java)
         i.putExtra(GameActivity.EXTRA_GAME_ROOT, path.path)
+        i.putExtra(GameActivity.EXTRA_SAVE_DIRECTORY, File(filesDir, Launcher.SAVE_DIR).path)
         i.putExtra(GameActivity.EXTRA_ARCHIVE_NAME, archiveName)
         startActivity(i)
     }
@@ -168,9 +189,17 @@ class LauncherActivity : ListActivity(), AdapterView.OnItemLongClickListener, La
         launcher.uninstall(id)
     }
 
-    private fun showProgressDialog() {
-        progressDialog = ProgressDialogFragment()
-        progressDialog!!.show(fragmentManager, "progress_dialog")
+    private fun showProgressDialog(savedInstanceState: Bundle? = null) {
+        progressDialog = Dialog(this)
+        progressDialog!!.apply {
+            setTitle(R.string.install_dialog_title)
+            setCancelable(false)
+            setContentView(R.layout.progress_dialog)
+            savedInstanceState?.let {
+                findViewById<TextView>(R.id.text)?.text = it.getCharSequence(STATE_PROGRESS_TEXT)
+            }
+            show()
+        }
     }
 
     private fun dismissProgressDialog() {
@@ -189,25 +218,13 @@ class LauncherActivity : ListActivity(), AdapterView.OnItemLongClickListener, La
         val cursor = contentResolver.query(uri, null, null, null, null, null)
         cursor?.use {
             if (it.moveToFirst()) {
-                val fname = it.getString(it.getColumnIndex(OpenableColumns.DISPLAY_NAME))
-                return if (fname.endsWith(".zip", true)) fname.dropLast(4) else fname
+                val column = it.getColumnIndex(OpenableColumns.DISPLAY_NAME)
+                if (column >= 0) {
+                    val fname = it.getString(column)
+                    return if (fname.endsWith(".zip", true)) fname.dropLast(4) else fname
+                }
             }
         }
         return null
     }
 }
-
-@Suppress("DEPRECATION") // for ProgressDialog
-class ProgressDialogFragment : DialogFragment() {
-    private lateinit var dialog: ProgressDialog
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        dialog = ProgressDialog(activity)
-        return dialog.apply {
-            setTitle(R.string.install_dialog_title)
-            setCancelable(true)
-        }
-    }
-    fun setProgress(msg: String) {
-        dialog.setMessage(msg)
-    }
-}

android/app/src/main/java/io/github/kichikuou/xsystem35/LicensesActivity.kt

@@ -0,0 +1,23 @@
+package io.github.kichikuou.xsystem35
+
+import android.app.Activity
+import android.os.Bundle
+import android.widget.TextView
+import java.io.BufferedReader
+
+class LicensesActivity : Activity() {
+    companion object {
+        const val EXTRA_DISPLAY_NAME = "DISPLAY_NAME"
+        const val EXTRA_FILE_NAME = "FILE_NAME"
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_licenses)
+
+        actionBar?.title = intent.getStringExtra(EXTRA_DISPLAY_NAME)
+        val path = "licenses/" + intent.getStringExtra(EXTRA_FILE_NAME)
+        val text = assets.open(path).bufferedReader().use(BufferedReader::readText)
+        findViewById<TextView>(R.id.license_text).text = text
+    }
+}

android/app/src/main/java/io/github/kichikuou/xsystem35/LicensesMenuActivity.kt

@@ -0,0 +1,38 @@
+package io.github.kichikuou.xsystem35
+
+import android.app.Activity
+import android.content.Intent
+import android.os.Bundle
+import android.widget.ListView
+import android.widget.SimpleAdapter
+
+class LicensesMenuActivity : Activity() {
+    class Entry(val displayName: String, val fileName: String, val url: String)
+    private val entries: ArrayList<Entry> = arrayListOf(
+        Entry("xsystem35-sdl2", "xsystem35", "https://github.com/kichikuou/xsystem35-sdl2"),
+        Entry("SDL", "SDL", "https://www.libsdl.org/"),
+        Entry("SDL_mixer", "SDL_mixer", "https://github.com/libsdl-org/SDL_mixer"),
+        Entry("SDL_ttf", "SDL_ttf", "https://github.com/libsdl-org/SDL_ttf"),
+        Entry("FreeType", "freetype", "https://freetype.org/"),
+        Entry("HarfBuzz", "harfbuzz", "https://harfbuzz.github.io/"),
+        Entry("MotoyaLCedar W3 mono", "MTLc3m", "https://github.com/aosp-mirror/platform_frameworks_base/tree/lollipop-release/data/fonts"),
+        Entry("Source Han Serif", "mincho", "https://github.com/adobe-fonts/source-han-serif/"),
+    )
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_licenses_menu)
+
+        val items = entries.map { mapOf("name" to it.displayName, "url" to it.url)}
+        val listView = findViewById<ListView>(R.id.list)
+        listView.adapter = SimpleAdapter(this, items, android.R.layout.simple_list_item_2,
+            arrayOf("name", "url"), intArrayOf(android.R.id.text1, android.R.id.text2))
+        listView.setOnItemClickListener { _, _, pos, _ ->
+            val intent = Intent(this, LicensesActivity::class.java).apply {
+                putExtra(LicensesActivity.EXTRA_DISPLAY_NAME, entries[pos].displayName)
+                putExtra(LicensesActivity.EXTRA_FILE_NAME, entries[pos].fileName)
+            }
+            startActivity(intent)
+        }
+    }
+}

android/app/src/main/java/org/libsdl/app/HIDDeviceBLESteamController.java

@@ -186,7 +186,7 @@ class HIDDeviceBLESteamController extends BluetoothGattCallback implements HIDDe
     // Because on Chromebooks we show up as a dual-mode device, it will attempt to connect TRANSPORT_AUTO, which will use TRANSPORT_BREDR instead
     // of TRANSPORT_LE.  Let's force ourselves to connect low energy.
     private BluetoothGatt connectGatt(boolean managed) {
-        if (Build.VERSION.SDK_INT >= 23) {
+        if (Build.VERSION.SDK_INT >= 23 /* Android 6.0 (M) */) {
             try {
                 return mDevice.connectGatt(mManager.getContext(), managed, this, TRANSPORT_LE);
             } catch (Exception e) {
@@ -429,7 +429,7 @@ class HIDDeviceBLESteamController extends BluetoothGattCallback implements HIDDe
                     }
                 });
             }
-        } 
+        }
         else if (newState == 0) {
             mIsConnected = false;
         }
@@ -564,10 +564,10 @@ class HIDDeviceBLESteamController extends BluetoothGattCallback implements HIDDe
         return "Steam Controller";
     }
 
-	@Override
+    @Override
     public UsbDevice getDevice() {
-		return null;
-	}
+        return null;
+    }
 
     @Override
     public boolean open() {

android/app/src/main/java/org/libsdl/app/HIDDeviceManager.java

@@ -105,36 +105,6 @@ public class HIDDeviceManager {
     private HIDDeviceManager(final Context context) {
         mContext = context;
 
-        // Make sure we have the HIDAPI library loaded with the native functions
-        try {
-            SDL.loadLibrary("hidapi");
-        } catch (Throwable e) {
-            Log.w(TAG, "Couldn't load hidapi: " + e.toString());
-
-            AlertDialog.Builder builder = new AlertDialog.Builder(context);
-            builder.setCancelable(false);
-            builder.setTitle("SDL HIDAPI Error");
-            builder.setMessage("Please report the following error to the SDL maintainers: " + e.getMessage());
-            builder.setNegativeButton("Quit", new DialogInterface.OnClickListener() {
-                @Override
-                public void onClick(DialogInterface dialog, int which) {
-                    try {
-                        // If our context is an activity, exit rather than crashing when we can't
-                        // call our native functions.
-                        Activity activity = (Activity)context;
-        
-                        activity.finish();
-                    }
-                    catch (ClassCastException cce) {
-                        // Context wasn't an activity, there's nothing we can do.  Give up and return.
-                    }
-                }
-            });
-            builder.show();
-
-            return;
-        }
-        
         HIDDeviceRegisterCallback();
 
         mSharedPreferences = mContext.getSharedPreferences("hidapi", Context.MODE_PRIVATE);
@@ -149,9 +119,6 @@ public class HIDDeviceManager {
         {
             mNextDeviceId = mSharedPreferences.getInt("next_device_id", 0);
         }
-
-        initializeUSB();
-        initializeBluetooth();
     }
 
     public Context getContext() {
@@ -174,6 +141,9 @@ public class HIDDeviceManager {
 
     private void initializeUSB() {
         mUsbManager = (UsbManager)mContext.getSystemService(Context.USB_SERVICE);
+        if (mUsbManager == null) {
+            return;
+        }
 
         /*
         // Logging
@@ -200,7 +170,7 @@ public class HIDDeviceManager {
                 Log.i(TAG,"  Interface protocol: " + mUsbInterface.getInterfaceProtocol());
                 Log.i(TAG,"  Endpoint count: " + mUsbInterface.getEndpointCount());
 
-                // Get endpoint details 
+                // Get endpoint details
                 for (int epi = 0; epi < mUsbInterface.getEndpointCount(); epi++)
                 {
                     UsbEndpoint mEndpoint = mUsbInterface.getEndpoint(epi);
@@ -278,7 +248,11 @@ public class HIDDeviceManager {
             0x1689, // Razer Onza
             0x1949, // Lab126, Inc.
             0x1bad, // Harmonix
+            0x20d6, // PowerA
             0x24c6, // PowerA
+            0x2c22, // Qanba
+            0x2dc8, // 8BitDo
+            0x9886, // ASTRO Gaming
         };
 
         if (usbInterface.getInterfaceClass() == UsbConstants.USB_CLASS_VENDOR_SPEC &&
@@ -299,13 +273,19 @@ public class HIDDeviceManager {
         final int XB1_IFACE_SUBCLASS = 71;
         final int XB1_IFACE_PROTOCOL = 208;
         final int[] SUPPORTED_VENDORS = {
+            0x03f0, // HP
+            0x044f, // Thrustmaster
             0x045e, // Microsoft
             0x0738, // Mad Catz
             0x0e6f, // PDP
             0x0f0d, // Hori
+            0x10f5, // Turtle Beach
             0x1532, // Razer Wildcat
+            0x20d6, // PowerA
             0x24c6, // PowerA
+            0x2dc8, // 8BitDo
             0x2e24, // Hyperkin
+            0x3537, // GameSir
         };
 
         if (usbInterface.getId() == 0 &&
@@ -379,12 +359,19 @@ public class HIDDeviceManager {
     private void initializeBluetooth() {
         Log.d(TAG, "Initializing Bluetooth");
 
-        if (mContext.getPackageManager().checkPermission(android.Manifest.permission.BLUETOOTH, mContext.getPackageName()) != PackageManager.PERMISSION_GRANTED) {
+        if (Build.VERSION.SDK_INT >= 31 /* Android 12  */ &&
+            mContext.getPackageManager().checkPermission(android.Manifest.permission.BLUETOOTH_CONNECT, mContext.getPackageName()) != PackageManager.PERMISSION_GRANTED) {
+            Log.d(TAG, "Couldn't initialize Bluetooth, missing android.permission.BLUETOOTH_CONNECT");
+            return;
+        }
+
+        if (Build.VERSION.SDK_INT <= 30 /* Android 11.0 (R) */ &&
+            mContext.getPackageManager().checkPermission(android.Manifest.permission.BLUETOOTH, mContext.getPackageName()) != PackageManager.PERMISSION_GRANTED) {
             Log.d(TAG, "Couldn't initialize Bluetooth, missing android.permission.BLUETOOTH");
             return;
         }
 
-        if (!mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH_LE) || (Build.VERSION.SDK_INT < 18)) {
+        if (!mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH_LE) || (Build.VERSION.SDK_INT < 18 /* Android 4.3 (JELLY_BEAN_MR2) */)) {
             Log.d(TAG, "Couldn't initialize Bluetooth, this version of Android does not support Bluetooth LE");
             return;
         }
@@ -549,7 +536,7 @@ public class HIDDeviceManager {
             for (HIDDevice device : mDevicesById.values()) {
                 device.setFrozen(frozen);
             }
-        }        
+        }
     }
 
     //////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -571,6 +558,18 @@ public class HIDDeviceManager {
     ////////// JNI interface functions
     //////////////////////////////////////////////////////////////////////////////////////////////////////
 
+    public boolean initialize(boolean usb, boolean bluetooth) {
+        Log.v(TAG, "initialize(" + usb + ", " + bluetooth + ")");
+
+        if (usb) {
+            initializeUSB();
+        }
+        if (bluetooth) {
+            initializeBluetooth();
+        }
+        return true;
+    }
+
     public boolean openDevice(int deviceID) {
         Log.v(TAG, "openDevice deviceID=" + deviceID);
         HIDDevice device = getDevice(deviceID);
@@ -584,7 +583,14 @@ public class HIDDeviceManager {
         if (usbDevice != null && !mUsbManager.hasPermission(usbDevice)) {
             HIDDeviceOpenPending(deviceID);
             try {
-                mUsbManager.requestPermission(usbDevice, PendingIntent.getBroadcast(mContext, 0, new Intent(HIDDeviceManager.ACTION_USB_PERMISSION), 0));
+                final int FLAG_MUTABLE = 0x02000000; // PendingIntent.FLAG_MUTABLE, but don't require SDK 31
+                int flags;
+                if (Build.VERSION.SDK_INT >= 31 /* Android 12.0 (S) */) {
+                    flags = FLAG_MUTABLE;
+                } else {
+                    flags = 0;
+                }
+                mUsbManager.requestPermission(usbDevice, PendingIntent.getBroadcast(mContext, 0, new Intent(HIDDeviceManager.ACTION_USB_PERMISSION), flags));
             } catch (Exception e) {
                 Log.v(TAG, "Couldn't request permission for USB device " + usbDevice);
                 HIDDeviceOpenResult(deviceID, false);

android/app/src/main/java/org/libsdl/app/HIDDeviceUSB.java

@@ -52,7 +52,7 @@ class HIDDeviceUSB implements HIDDevice {
     @Override
     public String getSerialNumber() {
         String result = null;
-        if (Build.VERSION.SDK_INT >= 21) {
+        if (Build.VERSION.SDK_INT >= 21 /* Android 5.0 (LOLLIPOP) */) {
             try {
                 result = mDevice.getSerialNumber();
             }
@@ -74,7 +74,7 @@ class HIDDeviceUSB implements HIDDevice {
     @Override
     public String getManufacturerName() {
         String result = null;
-        if (Build.VERSION.SDK_INT >= 21) {
+        if (Build.VERSION.SDK_INT >= 21 /* Android 5.0 (LOLLIPOP) */) {
             result = mDevice.getManufacturerName();
         }
         if (result == null) {
@@ -86,7 +86,7 @@ class HIDDeviceUSB implements HIDDevice {
     @Override
     public String getProductName() {
         String result = null;
-        if (Build.VERSION.SDK_INT >= 21) {
+        if (Build.VERSION.SDK_INT >= 21 /* Android 5.0 (LOLLIPOP) */) {
             result = mDevice.getProductName();
         }
         if (result == null) {

android/app/src/main/java/org/libsdl/app/SDL.java

@@ -29,6 +29,7 @@ public class SDL {
 
     // This function stores the current activity (SDL or not)
     public static void setContext(Context context) {
+        SDLAudioManager.setContext(context);
         mContext = context;
     }
 

android/app/src/main/java/org/libsdl/app/SDLAudioManager.java

@@ -1,5 +1,8 @@
 package org.libsdl.app;
 
+import android.content.Context;
+import android.media.AudioDeviceCallback;
+import android.media.AudioDeviceInfo;
 import android.media.AudioFormat;
 import android.media.AudioManager;
 import android.media.AudioRecord;
@@ -8,34 +11,67 @@ import android.media.MediaRecorder;
 import android.os.Build;
 import android.util.Log;
 
-public class SDLAudioManager
-{
+import java.util.Arrays;
+
+public class SDLAudioManager {
     protected static final String TAG = "SDLAudio";
 
     protected static AudioTrack mAudioTrack;
     protected static AudioRecord mAudioRecord;
+    protected static Context mContext;
+
+    private static final int[] NO_DEVICES = {};
+
+    private static AudioDeviceCallback mAudioDeviceCallback;
 
     public static void initialize() {
         mAudioTrack = null;
         mAudioRecord = null;
+        mAudioDeviceCallback = null;
+
+        if(Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */)
+        {
+            mAudioDeviceCallback = new AudioDeviceCallback() {
+                @Override
+                public void onAudioDevicesAdded(AudioDeviceInfo[] addedDevices) {
+                    Arrays.stream(addedDevices).forEach(deviceInfo -> addAudioDevice(deviceInfo.isSink(), deviceInfo.getId()));
+                }
+
+                @Override
+                public void onAudioDevicesRemoved(AudioDeviceInfo[] removedDevices) {
+                    Arrays.stream(removedDevices).forEach(deviceInfo -> removeAudioDevice(deviceInfo.isSink(), deviceInfo.getId()));
+                }
+            };
+        }
+    }
+
+    public static void setContext(Context context) {
+        mContext = context;
+        if (context != null) {
+            registerAudioDeviceCallback();
+        }
+    }
+
+    public static void release(Context context) {
+        unregisterAudioDeviceCallback(context);
     }
 
     // Audio
 
     protected static String getAudioFormatString(int audioFormat) {
         switch (audioFormat) {
-        case AudioFormat.ENCODING_PCM_8BIT:
-            return "8-bit";
-        case AudioFormat.ENCODING_PCM_16BIT:
-            return "16-bit";
-        case AudioFormat.ENCODING_PCM_FLOAT:
-            return "float";
-        default:
-            return Integer.toString(audioFormat);
+            case AudioFormat.ENCODING_PCM_8BIT:
+                return "8-bit";
+            case AudioFormat.ENCODING_PCM_16BIT:
+                return "16-bit";
+            case AudioFormat.ENCODING_PCM_FLOAT:
+                return "float";
+            default:
+                return Integer.toString(audioFormat);
         }
     }
 
-    protected static int[] open(boolean isCapture, int sampleRate, int audioFormat, int desiredChannels, int desiredFrames) {
+    protected static int[] open(boolean isCapture, int sampleRate, int audioFormat, int desiredChannels, int desiredFrames, int deviceId) {
         int channelConfig;
         int sampleSize;
         int frameSize;
@@ -43,10 +79,14 @@ public class SDLAudioManager
         Log.v(TAG, "Opening " + (isCapture ? "capture" : "playback") + ", requested " + desiredFrames + " frames of " + desiredChannels + " channel " + getAudioFormatString(audioFormat) + " audio at " + sampleRate + " Hz");
 
         /* On older devices let's use known good settings */
-        if (Build.VERSION.SDK_INT < 21) {
+        if (Build.VERSION.SDK_INT < 21 /* Android 5.0 (LOLLIPOP) */) {
             if (desiredChannels > 2) {
                 desiredChannels = 2;
             }
+        }
+
+        /* AudioTrack has sample rate limitation of 48000 (fixed in 5.0.2) */
+        if (Build.VERSION.SDK_INT < 22 /* Android 5.1 (LOLLIPOP_MR1) */) {
             if (sampleRate < 8000) {
                 sampleRate = 8000;
             } else if (sampleRate > 48000) {
@@ -55,7 +95,7 @@ public class SDLAudioManager
         }
 
         if (audioFormat == AudioFormat.ENCODING_PCM_FLOAT) {
-            int minSDKVersion = (isCapture ? 23 : 21);
+            int minSDKVersion = (isCapture ? 23 /* Android 6.0 (M) */ : 21 /* Android 5.0 (LOLLIPOP) */);
             if (Build.VERSION.SDK_INT < minSDKVersion) {
                 audioFormat = AudioFormat.ENCODING_PCM_16BIT;
             }
@@ -116,7 +156,7 @@ public class SDLAudioManager
                 channelConfig = AudioFormat.CHANNEL_OUT_5POINT1 | AudioFormat.CHANNEL_OUT_BACK_CENTER;
                 break;
             case 8:
-                if (Build.VERSION.SDK_INT >= 23) {
+                if (Build.VERSION.SDK_INT >= 23 /* Android 6.0 (M) */) {
                     channelConfig = AudioFormat.CHANNEL_OUT_7POINT1_SURROUND;
                 } else {
                     Log.v(TAG, "Requested " + desiredChannels + " channels, getting 5.1 surround");
@@ -197,6 +237,10 @@ public class SDLAudioManager
                     return null;
                 }
 
+                if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */ && deviceId != 0) {
+                    mAudioRecord.setPreferredDevice(getOutputAudioDeviceInfo(deviceId));
+                }
+
                 mAudioRecord.startRecording();
             }
 
@@ -220,6 +264,10 @@ public class SDLAudioManager
                     return null;
                 }
 
+                if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */ && deviceId != 0) {
+                    mAudioTrack.setPreferredDevice(getInputAudioDeviceInfo(deviceId));
+                }
+
                 mAudioTrack.play();
             }
 
@@ -234,11 +282,73 @@ public class SDLAudioManager
         return results;
     }
 
+    private static AudioDeviceInfo getInputAudioDeviceInfo(int deviceId) {
+        if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
+            AudioManager audioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
+            return Arrays.stream(audioManager.getDevices(AudioManager.GET_DEVICES_INPUTS))
+                    .filter(deviceInfo -> deviceInfo.getId() == deviceId)
+                    .findFirst()
+                    .orElse(null);
+        } else {
+            return null;
+        }
+    }
+
+    private static AudioDeviceInfo getOutputAudioDeviceInfo(int deviceId) {
+        if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
+            AudioManager audioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
+            return Arrays.stream(audioManager.getDevices(AudioManager.GET_DEVICES_OUTPUTS))
+                    .filter(deviceInfo -> deviceInfo.getId() == deviceId)
+                    .findFirst()
+                    .orElse(null);
+        } else {
+            return null;
+        }
+    }
+
+    private static void registerAudioDeviceCallback() {
+        if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
+            AudioManager audioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
+            audioManager.registerAudioDeviceCallback(mAudioDeviceCallback, null);
+        }
+    }
+
+    private static void unregisterAudioDeviceCallback(Context context) {
+        if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
+            AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
+            audioManager.unregisterAudioDeviceCallback(mAudioDeviceCallback);
+        }
+    }
+
     /**
      * This method is called by SDL using JNI.
      */
-    public static int[] audioOpen(int sampleRate, int audioFormat, int desiredChannels, int desiredFrames) {
-        return open(false, sampleRate, audioFormat, desiredChannels, desiredFrames);
+    public static int[] getAudioOutputDevices() {
+        if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
+            AudioManager audioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
+            return Arrays.stream(audioManager.getDevices(AudioManager.GET_DEVICES_OUTPUTS)).mapToInt(AudioDeviceInfo::getId).toArray();
+        } else {
+            return NO_DEVICES;
+        }
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static int[] getAudioInputDevices() {
+        if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
+            AudioManager audioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
+            return Arrays.stream(audioManager.getDevices(AudioManager.GET_DEVICES_INPUTS)).mapToInt(AudioDeviceInfo::getId).toArray();
+        } else {
+            return NO_DEVICES;
+        }
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static int[] audioOpen(int sampleRate, int audioFormat, int desiredChannels, int desiredFrames, int deviceId) {
+        return open(false, sampleRate, audioFormat, desiredChannels, desiredFrames, deviceId);
     }
 
     /**
@@ -250,6 +360,11 @@ public class SDLAudioManager
             return;
         }
 
+        if (android.os.Build.VERSION.SDK_INT < 21 /* Android 5.0 (LOLLIPOP) */) {
+            Log.e(TAG, "Attempted to make an incompatible audio call with uninitialized audio! (floating-point output is supported since Android 5.0 Lollipop)");
+            return;
+        }
+
         for (int i = 0; i < buffer.length;) {
             int result = mAudioTrack.write(buffer, i, buffer.length - i, AudioTrack.WRITE_BLOCKING);
             if (result > 0) {
@@ -322,18 +437,22 @@ public class SDLAudioManager
     /**
      * This method is called by SDL using JNI.
      */
-    public static int[] captureOpen(int sampleRate, int audioFormat, int desiredChannels, int desiredFrames) {
-        return open(true, sampleRate, audioFormat, desiredChannels, desiredFrames);
+    public static int[] captureOpen(int sampleRate, int audioFormat, int desiredChannels, int desiredFrames, int deviceId) {
+        return open(true, sampleRate, audioFormat, desiredChannels, desiredFrames, deviceId);
     }
 
     /** This method is called by SDL using JNI. */
     public static int captureReadFloatBuffer(float[] buffer, boolean blocking) {
-        return mAudioRecord.read(buffer, 0, buffer.length, blocking ? AudioRecord.READ_BLOCKING : AudioRecord.READ_NON_BLOCKING);
+        if (Build.VERSION.SDK_INT < 23 /* Android 6.0 (M) */) {
+            return 0;
+        } else {
+            return mAudioRecord.read(buffer, 0, buffer.length, blocking ? AudioRecord.READ_BLOCKING : AudioRecord.READ_NON_BLOCKING);
+        }
     }
 
     /** This method is called by SDL using JNI. */
     public static int captureReadShortBuffer(short[] buffer, boolean blocking) {
-        if (Build.VERSION.SDK_INT < 23) {
+        if (Build.VERSION.SDK_INT < 23 /* Android 6.0 (M) */) {
             return mAudioRecord.read(buffer, 0, buffer.length);
         } else {
             return mAudioRecord.read(buffer, 0, buffer.length, blocking ? AudioRecord.READ_BLOCKING : AudioRecord.READ_NON_BLOCKING);
@@ -342,7 +461,7 @@ public class SDLAudioManager
 
     /** This method is called by SDL using JNI. */
     public static int captureReadByteBuffer(byte[] buffer, boolean blocking) {
-        if (Build.VERSION.SDK_INT < 23) {
+        if (Build.VERSION.SDK_INT < 23 /* Android 6.0 (M) */) {
             return mAudioRecord.read(buffer, 0, buffer.length);
         } else {
             return mAudioRecord.read(buffer, 0, buffer.length, blocking ? AudioRecord.READ_BLOCKING : AudioRecord.READ_NON_BLOCKING);
@@ -387,4 +506,9 @@ public class SDLAudioManager
     }
 
     public static native int nativeSetupJNI();
+
+    public static native void removeAudioDevice(boolean isCapture, int deviceId);
+
+    public static native void addAudioDevice(boolean isCapture, int deviceId);
+
 }

android/app/src/main/java/org/libsdl/app/SDLControllerManager.java

@@ -24,7 +24,7 @@ public class SDLControllerManager
     public static native int nativeAddJoystick(int device_id, String name, String desc,
                                                int vendor_id, int product_id,
                                                boolean is_accelerometer, int button_mask,
-                                               int naxes, int nhats, int nballs);
+                                               int naxes, int axis_mask, int nhats, int nballs);
     public static native int nativeRemoveJoystick(int device_id);
     public static native int nativeAddHaptic(int device_id, String name);
     public static native int nativeRemoveHaptic(int device_id);
@@ -42,7 +42,7 @@ public class SDLControllerManager
 
     public static void initialize() {
         if (mJoystickHandler == null) {
-            if (Build.VERSION.SDK_INT >= 19) {
+            if (Build.VERSION.SDK_INT >= 19 /* Android 4.4 (KITKAT) */) {
                 mJoystickHandler = new SDLJoystickHandler_API19();
             } else {
                 mJoystickHandler = new SDLJoystickHandler_API16();
@@ -50,7 +50,7 @@ public class SDLControllerManager
         }
 
         if (mHapticHandler == null) {
-            if (Build.VERSION.SDK_INT >= 26) {
+            if (Build.VERSION.SDK_INT >= 26 /* Android 8.0 (O) */) {
                 mHapticHandler = new SDLHapticHandler_API26();
             } else {
                 mHapticHandler = new SDLHapticHandler();
@@ -168,6 +168,32 @@ class SDLJoystickHandler_API16 extends SDLJoystickHandler {
                 arg1Axis = MotionEvent.AXIS_GAS;
             }
 
+            // Make sure the AXIS_Z is sorted between AXIS_RY and AXIS_RZ.
+            // This is because the usual pairing are:
+            // - AXIS_X + AXIS_Y (left stick).
+            // - AXIS_RX, AXIS_RY (sometimes the right stick, sometimes triggers).
+            // - AXIS_Z, AXIS_RZ (sometimes the right stick, sometimes triggers).
+            // This sorts the axes in the above order, which tends to be correct
+            // for Xbox-ish game pads that have the right stick on RX/RY and the
+            // triggers on Z/RZ.
+            //
+            // Gamepads that don't have AXIS_Z/AXIS_RZ but use
+            // AXIS_LTRIGGER/AXIS_RTRIGGER are unaffected by this.
+            //
+            // References:
+            // - https://developer.android.com/develop/ui/views/touch-and-input/game-controllers/controller-input
+            // - https://www.kernel.org/doc/html/latest/input/gamepad.html
+            if (arg0Axis == MotionEvent.AXIS_Z) {
+                arg0Axis = MotionEvent.AXIS_RZ - 1;
+            } else if (arg0Axis > MotionEvent.AXIS_Z && arg0Axis < MotionEvent.AXIS_RZ) {
+                --arg0Axis;
+            }
+            if (arg1Axis == MotionEvent.AXIS_Z) {
+                arg1Axis = MotionEvent.AXIS_RZ - 1;
+            } else if (arg1Axis > MotionEvent.AXIS_Z && arg1Axis < MotionEvent.AXIS_RZ) {
+                --arg1Axis;
+            }
+
             return arg0Axis - arg1Axis;
         }
     }
@@ -210,7 +236,7 @@ class SDLJoystickHandler_API16 extends SDLJoystickHandler {
                     mJoysticks.add(joystick);
                     SDLControllerManager.nativeAddJoystick(joystick.device_id, joystick.name, joystick.desc,
                             getVendorId(joystickDevice), getProductId(joystickDevice), false,
-                            getButtonMask(joystickDevice), joystick.axes.size(), joystick.hats.size()/2, 0);
+                            getButtonMask(joystickDevice), joystick.axes.size(), getAxisMask(joystick.axes), joystick.hats.size()/2, 0);
                 }
             }
         }
@@ -255,23 +281,21 @@ class SDLJoystickHandler_API16 extends SDLJoystickHandler {
 
     @Override
     public boolean handleMotionEvent(MotionEvent event) {
-        if ((event.getSource() & InputDevice.SOURCE_JOYSTICK) != 0) {
-            int actionPointerIndex = event.getActionIndex();
-            int action = event.getActionMasked();
-            if (action == MotionEvent.ACTION_MOVE) {
-                SDLJoystick joystick = getJoystick(event.getDeviceId());
-                if (joystick != null) {
-                    for (int i = 0; i < joystick.axes.size(); i++) {
-                        InputDevice.MotionRange range = joystick.axes.get(i);
-                        /* Normalize the value to -1...1 */
-                        float value = (event.getAxisValue(range.getAxis(), actionPointerIndex) - range.getMin()) / range.getRange() * 2.0f - 1.0f;
-                        SDLControllerManager.onNativeJoy(joystick.device_id, i, value);
-                    }
-                    for (int i = 0; i < joystick.hats.size() / 2; i++) {
-                        int hatX = Math.round(event.getAxisValue(joystick.hats.get(2 * i).getAxis(), actionPointerIndex));
-                        int hatY = Math.round(event.getAxisValue(joystick.hats.get(2 * i + 1).getAxis(), actionPointerIndex));
-                        SDLControllerManager.onNativeHat(joystick.device_id, i, hatX, hatY);
-                    }
+        int actionPointerIndex = event.getActionIndex();
+        int action = event.getActionMasked();
+        if (action == MotionEvent.ACTION_MOVE) {
+            SDLJoystick joystick = getJoystick(event.getDeviceId());
+            if (joystick != null) {
+                for (int i = 0; i < joystick.axes.size(); i++) {
+                    InputDevice.MotionRange range = joystick.axes.get(i);
+                    /* Normalize the value to -1...1 */
+                    float value = (event.getAxisValue(range.getAxis(), actionPointerIndex) - range.getMin()) / range.getRange() * 2.0f - 1.0f;
+                    SDLControllerManager.onNativeJoy(joystick.device_id, i, value);
+                }
+                for (int i = 0; i < joystick.hats.size() / 2; i++) {
+                    int hatX = Math.round(event.getAxisValue(joystick.hats.get(2 * i).getAxis(), actionPointerIndex));
+                    int hatY = Math.round(event.getAxisValue(joystick.hats.get(2 * i + 1).getAxis(), actionPointerIndex));
+                    SDLControllerManager.onNativeHat(joystick.device_id, i, hatX, hatY);
                 }
             }
         }
@@ -293,6 +317,9 @@ class SDLJoystickHandler_API16 extends SDLJoystickHandler {
     public int getVendorId(InputDevice joystickDevice) {
         return 0;
     }
+    public int getAxisMask(List<InputDevice.MotionRange> ranges) {
+        return -1;
+    }
     public int getButtonMask(InputDevice joystickDevice) {
         return -1;
     }
@@ -310,6 +337,43 @@ class SDLJoystickHandler_API19 extends SDLJoystickHandler_API16 {
         return joystickDevice.getVendorId();
     }
 
+    @Override
+    public int getAxisMask(List<InputDevice.MotionRange> ranges) {
+        // For compatibility, keep computing the axis mask like before,
+        // only really distinguishing 2, 4 and 6 axes.
+        int axis_mask = 0;
+        if (ranges.size() >= 2) {
+            // ((1 << SDL_GAMEPAD_AXIS_LEFTX) | (1 << SDL_GAMEPAD_AXIS_LEFTY))
+            axis_mask |= 0x0003;
+        }
+        if (ranges.size() >= 4) {
+            // ((1 << SDL_GAMEPAD_AXIS_RIGHTX) | (1 << SDL_GAMEPAD_AXIS_RIGHTY))
+            axis_mask |= 0x000c;
+        }
+        if (ranges.size() >= 6) {
+            // ((1 << SDL_GAMEPAD_AXIS_LEFT_TRIGGER) | (1 << SDL_GAMEPAD_AXIS_RIGHT_TRIGGER))
+            axis_mask |= 0x0030;
+        }
+        // Also add an indicator bit for whether the sorting order has changed.
+        // This serves to disable outdated gamecontrollerdb.txt mappings.
+        boolean have_z = false;
+        boolean have_past_z_before_rz = false;
+        for (InputDevice.MotionRange range : ranges) {
+            int axis = range.getAxis();
+            if (axis == MotionEvent.AXIS_Z) {
+                have_z = true;
+            } else if (axis > MotionEvent.AXIS_Z && axis < MotionEvent.AXIS_RZ) {
+                have_past_z_before_rz = true;
+            }
+        }
+        if (have_z && have_past_z_before_rz) {
+            // If both these exist, the compare() function changed sorting order.
+            // Set a bit to indicate this fact.
+            axis_mask |= 0x8000;
+        }
+        return axis_mask;
+    }
+
     @Override
     public int getButtonMask(InputDevice joystickDevice) {
         int button_mask = 0;
@@ -319,6 +383,7 @@ class SDLJoystickHandler_API19 extends SDLJoystickHandler_API16 {
             KeyEvent.KEYCODE_BUTTON_X,
             KeyEvent.KEYCODE_BUTTON_Y,
             KeyEvent.KEYCODE_BACK,
+            KeyEvent.KEYCODE_MENU,
             KeyEvent.KEYCODE_BUTTON_MODE,
             KeyEvent.KEYCODE_BUTTON_START,
             KeyEvent.KEYCODE_BUTTON_THUMBL,
@@ -360,6 +425,7 @@ class SDLJoystickHandler_API19 extends SDLJoystickHandler_API16 {
             (1 << 2),   // X -> X
             (1 << 3),   // Y -> Y
             (1 << 4),   // BACK -> BACK
+            (1 << 6),   // MENU -> START
             (1 << 5),   // MODE -> GUIDE
             (1 << 6),   // START -> START
             (1 << 7),   // THUMBL -> LEFTSTICK
@@ -480,13 +546,15 @@ class SDLHapticHandler {
             if (haptic == null) {
                 InputDevice device = InputDevice.getDevice(deviceIds[i]);
                 Vibrator vib = device.getVibrator();
-                if (vib.hasVibrator()) {
-                    haptic = new SDLHaptic();
-                    haptic.device_id = deviceIds[i];
-                    haptic.name = device.getName();
-                    haptic.vib = vib;
-                    mHaptics.add(haptic);
-                    SDLControllerManager.nativeAddHaptic(haptic.device_id, haptic.name);
+                if (vib != null) {
+                    if (vib.hasVibrator()) {
+                        haptic = new SDLHaptic();
+                        haptic.device_id = deviceIds[i];
+                        haptic.name = device.getName();
+                        haptic.vib = vib;
+                        mHaptics.add(haptic);
+                        SDLControllerManager.nativeAddHaptic(haptic.device_id, haptic.name);
+                    }
                 }
             }
         }
@@ -560,8 +628,6 @@ class SDLGenericMotionListener_API12 implements View.OnGenericMotionListener {
 
         switch ( event.getSource() ) {
             case InputDevice.SOURCE_JOYSTICK:
-            case InputDevice.SOURCE_GAMEPAD:
-            case InputDevice.SOURCE_DPAD:
                 return SDLControllerManager.handleJoystickMotionEvent(event);
 
             case InputDevice.SOURCE_MOUSE:
@@ -691,8 +757,6 @@ class SDLGenericMotionListener_API26 extends SDLGenericMotionListener_API24 {
 
         switch ( event.getSource() ) {
             case InputDevice.SOURCE_JOYSTICK:
-            case InputDevice.SOURCE_GAMEPAD:
-            case InputDevice.SOURCE_DPAD:
                 return SDLControllerManager.handleJoystickMotionEvent(event);
 
             case InputDevice.SOURCE_MOUSE:
@@ -747,7 +811,7 @@ class SDLGenericMotionListener_API26 extends SDLGenericMotionListener_API24 {
 
     @Override
     public boolean supportsRelativeMouse() {
-        return (!SDLActivity.isDeXMode() || (Build.VERSION.SDK_INT >= 27));
+        return (!SDLActivity.isDeXMode() || Build.VERSION.SDK_INT >= 27 /* Android 8.1 (O_MR1) */);
     }
 
     @Override
@@ -757,7 +821,7 @@ class SDLGenericMotionListener_API26 extends SDLGenericMotionListener_API24 {
 
     @Override
     public boolean setRelativeMouseEnabled(boolean enabled) {
-        if (!SDLActivity.isDeXMode() || (Build.VERSION.SDK_INT >= 27)) {
+        if (!SDLActivity.isDeXMode() || Build.VERSION.SDK_INT >= 27 /* Android 8.1 (O_MR1) */) {
             if (enabled) {
                 SDLActivity.getContentView().requestPointerCapture();
             } else {

android/app/src/main/java/org/libsdl/app/SDLSurface.java

@@ -0,0 +1,405 @@
+package org.libsdl.app;
+
+
+import android.content.Context;
+import android.content.pm.ActivityInfo;
+import android.hardware.Sensor;
+import android.hardware.SensorEvent;
+import android.hardware.SensorEventListener;
+import android.hardware.SensorManager;
+import android.os.Build;
+import android.util.DisplayMetrics;
+import android.util.Log;
+import android.view.Display;
+import android.view.InputDevice;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+import android.view.Surface;
+import android.view.SurfaceHolder;
+import android.view.SurfaceView;
+import android.view.View;
+import android.view.WindowManager;
+
+
+/**
+    SDLSurface. This is what we draw on, so we need to know when it's created
+    in order to do anything useful.
+
+    Because of this, that's where we set up the SDL thread
+*/
+public class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
+    View.OnKeyListener, View.OnTouchListener, SensorEventListener  {
+
+    // Sensors
+    protected SensorManager mSensorManager;
+    protected Display mDisplay;
+
+    // Keep track of the surface size to normalize touch events
+    protected float mWidth, mHeight;
+
+    // Is SurfaceView ready for rendering
+    public boolean mIsSurfaceReady;
+
+    // Startup
+    public SDLSurface(Context context) {
+        super(context);
+        getHolder().addCallback(this);
+
+        setFocusable(true);
+        setFocusableInTouchMode(true);
+        requestFocus();
+        setOnKeyListener(this);
+        setOnTouchListener(this);
+
+        mDisplay = ((WindowManager)context.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
+        mSensorManager = (SensorManager)context.getSystemService(Context.SENSOR_SERVICE);
+
+        setOnGenericMotionListener(SDLActivity.getMotionListener());
+
+        // Some arbitrary defaults to avoid a potential division by zero
+        mWidth = 1.0f;
+        mHeight = 1.0f;
+
+        mIsSurfaceReady = false;
+    }
+
+    public void handlePause() {
+        enableSensor(Sensor.TYPE_ACCELEROMETER, false);
+    }
+
+    public void handleResume() {
+        setFocusable(true);
+        setFocusableInTouchMode(true);
+        requestFocus();
+        setOnKeyListener(this);
+        setOnTouchListener(this);
+        enableSensor(Sensor.TYPE_ACCELEROMETER, true);
+    }
+
+    public Surface getNativeSurface() {
+        return getHolder().getSurface();
+    }
+
+    // Called when we have a valid drawing surface
+    @Override
+    public void surfaceCreated(SurfaceHolder holder) {
+        Log.v("SDL", "surfaceCreated()");
+        SDLActivity.onNativeSurfaceCreated();
+    }
+
+    // Called when we lose the surface
+    @Override
+    public void surfaceDestroyed(SurfaceHolder holder) {
+        Log.v("SDL", "surfaceDestroyed()");
+
+        // Transition to pause, if needed
+        SDLActivity.mNextNativeState = SDLActivity.NativeState.PAUSED;
+        SDLActivity.handleNativeState();
+
+        mIsSurfaceReady = false;
+        SDLActivity.onNativeSurfaceDestroyed();
+    }
+
+    // Called when the surface is resized
+    @Override
+    public void surfaceChanged(SurfaceHolder holder,
+                               int format, int width, int height) {
+        Log.v("SDL", "surfaceChanged()");
+
+        if (SDLActivity.mSingleton == null) {
+            return;
+        }
+
+        mWidth = width;
+        mHeight = height;
+        int nDeviceWidth = width;
+        int nDeviceHeight = height;
+        try
+        {
+            if (Build.VERSION.SDK_INT >= 17 /* Android 4.2 (JELLY_BEAN_MR1) */) {
+                DisplayMetrics realMetrics = new DisplayMetrics();
+                mDisplay.getRealMetrics( realMetrics );
+                nDeviceWidth = realMetrics.widthPixels;
+                nDeviceHeight = realMetrics.heightPixels;
+            }
+        } catch(Exception ignored) {
+        }
+
+        synchronized(SDLActivity.getContext()) {
+            // In case we're waiting on a size change after going fullscreen, send a notification.
+            SDLActivity.getContext().notifyAll();
+        }
+
+        Log.v("SDL", "Window size: " + width + "x" + height);
+        Log.v("SDL", "Device size: " + nDeviceWidth + "x" + nDeviceHeight);
+        SDLActivity.nativeSetScreenResolution(width, height, nDeviceWidth, nDeviceHeight, mDisplay.getRefreshRate());
+        SDLActivity.onNativeResize();
+
+        // Prevent a screen distortion glitch,
+        // for instance when the device is in Landscape and a Portrait App is resumed.
+        boolean skip = false;
+        int requestedOrientation = SDLActivity.mSingleton.getRequestedOrientation();
+
+        if (requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT || requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT) {
+            if (mWidth > mHeight) {
+               skip = true;
+            }
+        } else if (requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE || requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE) {
+            if (mWidth < mHeight) {
+               skip = true;
+            }
+        }
+
+        // Special Patch for Square Resolution: Black Berry Passport
+        if (skip) {
+           double min = Math.min(mWidth, mHeight);
+           double max = Math.max(mWidth, mHeight);
+
+           if (max / min < 1.20) {
+              Log.v("SDL", "Don't skip on such aspect-ratio. Could be a square resolution.");
+              skip = false;
+           }
+        }
+
+        // Don't skip in MultiWindow.
+        if (skip) {
+            if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
+                if (SDLActivity.mSingleton.isInMultiWindowMode()) {
+                    Log.v("SDL", "Don't skip in Multi-Window");
+                    skip = false;
+                }
+            }
+        }
+
+        if (skip) {
+           Log.v("SDL", "Skip .. Surface is not ready.");
+           mIsSurfaceReady = false;
+           return;
+        }
+
+        /* If the surface has been previously destroyed by onNativeSurfaceDestroyed, recreate it here */
+        SDLActivity.onNativeSurfaceChanged();
+
+        /* Surface is ready */
+        mIsSurfaceReady = true;
+
+        SDLActivity.mNextNativeState = SDLActivity.NativeState.RESUMED;
+        SDLActivity.handleNativeState();
+    }
+
+    // Key events
+    @Override
+    public boolean onKey(View v, int keyCode, KeyEvent event) {
+        return SDLActivity.handleKeyEvent(v, keyCode, event, null);
+    }
+
+    // Touch events
+    @Override
+    public boolean onTouch(View v, MotionEvent event) {
+        /* Ref: http://developer.android.com/training/gestures/multi.html */
+        int touchDevId = event.getDeviceId();
+        final int pointerCount = event.getPointerCount();
+        int action = event.getActionMasked();
+        int pointerFingerId;
+        int i = -1;
+        float x,y,p;
+
+        /*
+         * Prevent id to be -1, since it's used in SDL internal for synthetic events
+         * Appears when using Android emulator, eg:
+         *  adb shell input mouse tap 100 100
+         *  adb shell input touchscreen tap 100 100
+         */
+        if (touchDevId < 0) {
+            touchDevId -= 1;
+        }
+
+        // 12290 = Samsung DeX mode desktop mouse
+        // 12290 = 0x3002 = 0x2002 | 0x1002 = SOURCE_MOUSE | SOURCE_TOUCHSCREEN
+        // 0x2   = SOURCE_CLASS_POINTER
+        if (event.getSource() == InputDevice.SOURCE_MOUSE || event.getSource() == (InputDevice.SOURCE_MOUSE | InputDevice.SOURCE_TOUCHSCREEN)) {
+            int mouseButton = 1;
+            try {
+                Object object = event.getClass().getMethod("getButtonState").invoke(event);
+                if (object != null) {
+                    mouseButton = (Integer) object;
+                }
+            } catch(Exception ignored) {
+            }
+
+            // We need to check if we're in relative mouse mode and get the axis offset rather than the x/y values
+            // if we are.  We'll leverage our existing mouse motion listener
+            SDLGenericMotionListener_API12 motionListener = SDLActivity.getMotionListener();
+            x = motionListener.getEventX(event);
+            y = motionListener.getEventY(event);
+
+            SDLActivity.onNativeMouse(mouseButton, action, x, y, motionListener.inRelativeMode());
+        } else {
+            switch(action) {
+                case MotionEvent.ACTION_MOVE:
+                    for (i = 0; i < pointerCount; i++) {
+                        pointerFingerId = event.getPointerId(i);
+                        x = event.getX(i) / mWidth;
+                        y = event.getY(i) / mHeight;
+                        p = event.getPressure(i);
+                        if (p > 1.0f) {
+                            // may be larger than 1.0f on some devices
+                            // see the documentation of getPressure(i)
+                            p = 1.0f;
+                        }
+                        SDLActivity.onNativeTouch(touchDevId, pointerFingerId, action, x, y, p);
+                    }
+                    break;
+
+                case MotionEvent.ACTION_UP:
+                case MotionEvent.ACTION_DOWN:
+                    // Primary pointer up/down, the index is always zero
+                    i = 0;
+                    /* fallthrough */
+                case MotionEvent.ACTION_POINTER_UP:
+                case MotionEvent.ACTION_POINTER_DOWN:
+                    // Non primary pointer up/down
+                    if (i == -1) {
+                        i = event.getActionIndex();
+                    }
+
+                    pointerFingerId = event.getPointerId(i);
+                    x = event.getX(i) / mWidth;
+                    y = event.getY(i) / mHeight;
+                    p = event.getPressure(i);
+                    if (p > 1.0f) {
+                        // may be larger than 1.0f on some devices
+                        // see the documentation of getPressure(i)
+                        p = 1.0f;
+                    }
+                    SDLActivity.onNativeTouch(touchDevId, pointerFingerId, action, x, y, p);
+                    break;
+
+                case MotionEvent.ACTION_CANCEL:
+                    for (i = 0; i < pointerCount; i++) {
+                        pointerFingerId = event.getPointerId(i);
+                        x = event.getX(i) / mWidth;
+                        y = event.getY(i) / mHeight;
+                        p = event.getPressure(i);
+                        if (p > 1.0f) {
+                            // may be larger than 1.0f on some devices
+                            // see the documentation of getPressure(i)
+                            p = 1.0f;
+                        }
+                        SDLActivity.onNativeTouch(touchDevId, pointerFingerId, MotionEvent.ACTION_UP, x, y, p);
+                    }
+                    break;
+
+                default:
+                    break;
+            }
+        }
+
+        return true;
+   }
+
+    // Sensor events
+    public void enableSensor(int sensortype, boolean enabled) {
+        // TODO: This uses getDefaultSensor - what if we have >1 accels?
+        if (enabled) {
+            mSensorManager.registerListener(this,
+                            mSensorManager.getDefaultSensor(sensortype),
+                            SensorManager.SENSOR_DELAY_GAME, null);
+        } else {
+            mSensorManager.unregisterListener(this,
+                            mSensorManager.getDefaultSensor(sensortype));
+        }
+    }
+
+    @Override
+    public void onAccuracyChanged(Sensor sensor, int accuracy) {
+        // TODO
+    }
+
+    @Override
+    public void onSensorChanged(SensorEvent event) {
+        if (event.sensor.getType() == Sensor.TYPE_ACCELEROMETER) {
+
+            // Since we may have an orientation set, we won't receive onConfigurationChanged events.
+            // We thus should check here.
+            int newOrientation;
+
+            float x, y;
+            switch (mDisplay.getRotation()) {
+                case Surface.ROTATION_90:
+                    x = -event.values[1];
+                    y = event.values[0];
+                    newOrientation = SDLActivity.SDL_ORIENTATION_LANDSCAPE;
+                    break;
+                case Surface.ROTATION_270:
+                    x = event.values[1];
+                    y = -event.values[0];
+                    newOrientation = SDLActivity.SDL_ORIENTATION_LANDSCAPE_FLIPPED;
+                    break;
+                case Surface.ROTATION_180:
+                    x = -event.values[0];
+                    y = -event.values[1];
+                    newOrientation = SDLActivity.SDL_ORIENTATION_PORTRAIT_FLIPPED;
+                    break;
+                case Surface.ROTATION_0:
+                default:
+                    x = event.values[0];
+                    y = event.values[1];
+                    newOrientation = SDLActivity.SDL_ORIENTATION_PORTRAIT;
+                    break;
+            }
+
+            if (newOrientation != SDLActivity.mCurrentOrientation) {
+                SDLActivity.mCurrentOrientation = newOrientation;
+                SDLActivity.onNativeOrientationChanged(newOrientation);
+            }
+
+            SDLActivity.onNativeAccel(-x / SensorManager.GRAVITY_EARTH,
+                                      y / SensorManager.GRAVITY_EARTH,
+                                      event.values[2] / SensorManager.GRAVITY_EARTH);
+
+
+        }
+    }
+
+    // Captured pointer events for API 26.
+    public boolean onCapturedPointerEvent(MotionEvent event)
+    {
+        int action = event.getActionMasked();
+
+        float x, y;
+        switch (action) {
+            case MotionEvent.ACTION_SCROLL:
+                x = event.getAxisValue(MotionEvent.AXIS_HSCROLL, 0);
+                y = event.getAxisValue(MotionEvent.AXIS_VSCROLL, 0);
+                SDLActivity.onNativeMouse(0, action, x, y, false);
+                return true;
+
+            case MotionEvent.ACTION_HOVER_MOVE:
+            case MotionEvent.ACTION_MOVE:
+                x = event.getX(0);
+                y = event.getY(0);
+                SDLActivity.onNativeMouse(0, action, x, y, true);
+                return true;
+
+            case MotionEvent.ACTION_BUTTON_PRESS:
+            case MotionEvent.ACTION_BUTTON_RELEASE:
+
+                // Change our action value to what SDL's code expects.
+                if (action == MotionEvent.ACTION_BUTTON_PRESS) {
+                    action = MotionEvent.ACTION_DOWN;
+                } else { /* MotionEvent.ACTION_BUTTON_RELEASE */
+                    action = MotionEvent.ACTION_UP;
+                }
+
+                x = event.getX(0);
+                y = event.getY(0);
+                int button = event.getButtonState();
+
+                SDLActivity.onNativeMouse(button, action, x, y, true);
+                return true;
+        }
+
+        return false;
+    }
+}

android/app/src/main/res/layout/activity_licenses.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <TextView android:id="@+id/license_text"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:padding="20dp" />
+</ScrollView>

android/app/src/main/res/layout/activity_licenses_menu.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent">
+    <ListView android:id="@+id/list"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent" />
+</LinearLayout>

android/app/src/main/res/layout/launcher.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <ListView android:id="@+id/list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+</LinearLayout>

android/app/src/main/res/layout/progress_dialog.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:padding="16dp"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+    <ProgressBar
+        android:layout_marginEnd="8dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+    <TextView
+        android:id="@+id/text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:textSize="16sp"/>
+</LinearLayout>

android/app/src/main/res/menu/launcher_menu.xml

@@ -6,4 +6,7 @@
     <item
         android:id="@+id/import_savedata"
         android:title="@string/action_import_save_data" />
+    <item
+        android:id="@+id/licenses"
+        android:title="@string/action_licenses" />
 </menu>

android/app/src/main/res/values-ja/strings.xml

@@ -3,6 +3,7 @@
     <string name="app_name">xsystem35</string>
     <string name="action_export_save_data">セーブデータをエクスポート</string>
     <string name="action_import_save_data">セーブデータをインポート</string>
+    <string name="action_licenses">オープンソースライセンス</string>
     <string name="cancel">キャンセル</string>
     <string name="cannot_find_ald">System 3.x のファイル (*.ald) が見つかりません。</string>
     <string name="choose_a_file">ファイルを選択</string>

android/app/src/main/res/values/strings.xml

@@ -2,6 +2,7 @@
     <string name="app_name">xsystem35</string>
     <string name="action_export_save_data">Export Save Files</string>
     <string name="action_import_save_data">Import Save Files</string>
+    <string name="action_licenses">Open source licenses</string>
     <string name="cancel">Cancel</string>
     <string name="cannot_find_ald">Cannot find System 3.x game files (*.ald).</string>
     <string name="choose_a_file">Choose a file</string>

android/build.gradle

@@ -1,13 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.72'
+    ext.kotlin_version = '1.7.21'
     repositories {
         mavenCentral()
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:8.1.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Aug 10 12:24:31 JST 2020
+#Thu Nov 11 18:20:34 PST 2021
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+zipStoreBase=GRADLE_USER_HOME

android/gradlew

@@ -126,8 +126,8 @@ if $cygwin ; then
     # Now convert the arguments - kludge to limit ourselves to /bin/sh
     i=0
     for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+        CHECK=`echo "$arg"|grep -E -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|grep -E -c "^-"`                                 ### Determine if an option
 
         if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
             eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`

config.h.in

@@ -1,15 +1,8 @@
 #cmakedefine PACKAGE "@PACKAGE@"
-#define VERSION "2.0.0"
-
-#cmakedefine CMAKE_SYSTEM_NAME "@CMAKE_SYSTEM_NAME@"
+#define VERSION "2.11.5"
 
 #cmakedefine CACHE_TOTALSIZE @CACHE_TOTALSIZE@
 
-#cmakedefine ENABLE_CDROM_ANDROID @ENABLE_CDROM_ANDROID@
-#cmakedefine ENABLE_CDROM_BSD @ENABLE_CDROM_BSD@
-#cmakedefine ENABLE_CDROM_EMSCRIPTEN @ENABLE_CDROM_EMSCRIPTEN@
-#cmakedefine ENABLE_CDROM_LINUX @ENABLE_CDROM_LINUX@
-#cmakedefine ENABLE_CDROM_MP3 @ENABLE_CDROM_MP3@
 #cmakedefine ENABLE_DEBUGGER @ENABLE_DEBUGGER@
 #cmakedefine ENABLE_GTK @ENABLE_GTK@
 #cmakedefine ENABLE_MIDI_RAWMIDI @ENABLE_MIDI_RAWMIDI@
@@ -17,21 +10,16 @@
 #cmakedefine ENABLE_MIDI_SEQMIDI @ENABLE_MIDI_SEQMIDI@
 #cmakedefine ENABLE_MIDI_PORTMIDI @ENABLE_MIDI_PORTMIDI@
 #cmakedefine ENABLE_NLS @ENABLE_NLS@
-#cmakedefine ENABLE_SDLMIXER @ENABLE_SDLMIXER@
 
-#cmakedefine CDROM_DEVICE "@CDROM_DEVICE@"
+#cmakedefine DEFAULT_PLAYLIST_PATH "@DEFAULT_PLAYLIST_PATH@"
 #cmakedefine JOY_DEVICE "@JOY_DEVICE@"
 #cmakedefine MIDI_DEVICE "@MIDI_DEVICE@"
 #cmakedefine SEQ_DEVICE "@SEQ_DEVICE@"
 
-#cmakedefine QUIET_MIDI @QUIET_MIDI@
-
 #cmakedefine HAVE_GETLOGIN @HAVE_GETLOGIN@
-#cmakedefine HAVE_JPEG @HAVE_JPEG@
 #cmakedefine HAVE_MMAP @HAVE_MMAP@
-#cmakedefine HAVE_SDLJOY @HAVE_SDLJOY@
 #cmakedefine HAVE_SIGACTION @HAVE_SIGACTION@
-#cmakedefine HAVE_UNAME @HAVE_UNAME@
+#cmakedefine HAVE_WEBP @HAVE_WEBP@
 
 #define DEFAULT_GOTHIC_TTF "@DEFAULT_FONT_PATH@MTLc3m.ttf"
 #define DEFAULT_MINCHO_TTF "@DEFAULT_FONT_PATH@mincho.otf"

contrib/20cDPS.inf

@@ -1,7 +0,0 @@
-# 20世紀アリス これDPS? Install infomation
-# Tag,		#origin,		#destination
-ScenarioA,	gamedata/*SA.ald,	20cDPS_sa.ald
-GraphicsA,	gamedata/*GA.ald,	20cDPS_ga.ald
-MidiA,		gamedata/*MA.ald,	20cDPS_ma.ald
-SaveA,				,	20cDPS_sa.asd
-Ain,		gamedata/*.ain,		system39.ain

contrib/20cKaeru.inf

@@ -1,10 +0,0 @@
-# 20世紀アリス かえるにょ国にょアリス Install infomation
-# Tag,		#origin,		#destination
-ScenarioA,	gamedata/*SA.ald,	20cKaeru_sa.ald
-GraphicsA,	gamedata/*GA.ald,	20cKaeru_ga.ald
-WaveA,		gamedata/*WA.ald,	20cKaeru_wa.ald
-MidiA,		gamedata/*MA.ald,	20cKaeru_ma.ald
-DataA,		gamedata/*DA.ald,	20cKaeru_da.ald
-Ain,		gamedata/*.ain,		system39.ain
-SaveA,				,	20cKaeru_sa.asd
-SaveZ,				,	20cKaeru_sz.asd

contrib/456atlach.inf

@@ -1,14 +0,0 @@
-# ATLACH-NACHA Install infomation
-# Tag,		#origin,		#destination
-ScenarioA,	gamedata/*sa.ald,	atlach_sa.ald
-GraphicsA,	gamedata/*ga.ald,	atlach_ga.ald
-GraphicsB,	gamedata/*gb.ald,	atlach_gb.ald
-WaveA,		gamedata/*wa.ald,	atlach_wa.ald
-SaveA,				,	atlach_sa.asd
-SaveB,				,	atlach_sb.asd
-SaveC,				,	atlach_sc.asd
-SaveD,				,	atlach_sd.asd
-SaveE,				,	atlach_se.asd
-SaveF,				,	atlach_sf.asd
-SaveG,				,	atlach_sg.asd
-SaveH,				,	atlach_sh.asd

contrib/456ningen.inf

@@ -1,6 +0,0 @@
-# Ningen Kari Install infomation
-# Tag,		#origin,		#destination
-ScenarioA,	gamedata/*sa.ald,	ningen_sa.ald
-GraphicsA,	gamedata/*ga.ald,	ningen_ga.ald
-WaveA,		gamedata/*wa.ald,	ningen_wa.ald
-SaveA,				,	ningen_sa.asd

contrib/456zero.inf

@@ -1,12 +0,0 @@
-# Zero-shiki Install infomation
-# Tag,		#origin,		#destination
-ScenarioA,	gamedata/*sa.ald,	zero_sa.ald
-GraphicsA,	gamedata/*ga.ald,	zero_ga.ald
-WaveA,		gamedata/*wa.ald,	zero_wa.ald
-SaveA,				,	zero_sa.asd
-SaveB,				,	zero_sb.asd
-SaveC,				,	zero_sc.asd
-SaveD,				,	zero_sd.asd
-SaveE,				,	zero_se.asd
-,          gamedata/map_data.dat,      MAP_DATA.DAT
-,           gamedata/ur_data.dat,       UR_DATA.DAT

contrib/README.TXT

@@ -1,115 +0,0 @@
-  ゲームデータインストール用スクリプト instgame の使い方について
-
-                                    スクリプト作成   奈良木 さん
-                                    ドキュメント作成 近間@NAIST
-0. 目次
-
-  1. ファイルの説明
-  2. 使い方
-  3. その他の情報
-  4. 著作権など
-  5. 連絡先
-
-
-1. ファイルの説明
-
-  instgame       スクリプト本体
-  456atlach.inf  ATLACH-NACHA 用設定ファイル (アリスの館456収録)
-  456ningen.inf  人間狩り 用設定ファイル (アリスの館456収録 
-  456zero.inf    零式 用設定ファイル (アリスの館456収録)
-  ambi.inf       AmbivalenZ for WIN95 用設定ファイル
-  atlach_new.inf ATLACH-NACHA (廉価版) 用設定ファイル
-  darcrows.inf   DARCROWS 用設定ファイル
-  diabo.inf      DiaboLiQue 用設定ファイル
-  diabo_new.inf  DiaboLiQue (廉価版) 用設定ファイル
-  hushaby.inf    HushaBy Baby 用設定ファイル
-  katsumi.inf    いけないかつみ先生 用設定ファイル
-  kichiku.inf    鬼畜王ランス 用設定ファイル
-  mamatoto.inf   ママトト 用設定ファイル
-  mamori.inf     守り神様 用設定ファイル
-  miko.inf       戦巫女 用設定ファイル
-  mugen.inf      無幻泡影 for WIN95 用設定ファイル
-  oudou.inf      王道勇者 用設定ファイル
-  panyo.inf      かえるにょぱにょ〜ん 用設定ファイル
-  panyo_new.inf  かえるにょぱにょ〜ん(廉価版) 用設定ファイル
-  pascha.inf     ぱすてるチャイム 用設定ファイル
-  persiom.inf    PERSIOM 用設定ファイル
-  progood.inf    ぷろすちゅーでんとGOOD 用設定ファイル
-  rance4.inf     ランス４ forWIN 用設定ファイル
-  seeinao.inf    SeeIn青 用設定ファイル
-  toushin2.inf   闘神都市II forWIN 用設定ファイル
-  dalk.inf       DALK 用設定ファイル (アリスの館456収録)
-  drstop.inf     Dr.Stop! 用設定ファイル (アリスの館456収録)
-  rance1.inf     Rance1 用設定ファイル (アリスの館456収録)
-  rance2.inf     Rance2 用設定ファイル (アリスの館456収録)
-  rance3.inf     Rance3 用設定ファイル (アリスの館456収録)
-  toushin.inf    闘神都市 用設定ファイル (アリスの館456収録)
-  zero_new.inf   零式 (廉価版) 用設定ファイル
-  20cKaeru.inf   20世紀アリス かえるにょ国にょアリス 用設定ファイル
-  20cDPS.inf     20世紀アリス これDPS？ 用設定ファイル
-  onlyyou_r.inf  Only You リクルス 用設定ファイル
-  daiakuji.inf   大悪司 用設定ファイル
-  tsuma.inf      妻みぐい 用設定ファイル
-
-2. 使い方
-
-   ゲームのCD-ROMをドライブに入れてマウントし、
- %  ./instgame kichiku.inf
- のように実行します。
-
-   デフォルトではCDROMは/cdromにマウントされているものとしています。
- また、データのインストール先は ~/game/kichiku/ の下になります。
-
-   デフォルトでは設定用ファイルのファイル名が~/game/の下のディレクトリ名に
- なります。
-
-  これらのデフォルトの条件を変えるには以下のオプションを使います。
-
-  -c : CD-ROMのマウントされている位置を指定します(default: -c /cdrom)
-  -d : ゲームデータのインストール先を指定します  (default: -d ~/game/target>)
-
-   データが正常にコピーされると、~/game/の下にkichiku.grと言うファイルが作成
- されます。これはゲームデータの場所をプログラム(xsystem35)に知らせるためのも
- ので、
- % xsystem35 -gamefile ~/game/kichiku.gr
- のように指定するのに使います。(「ゲームリソースファイル」とでも呼んで下さい)
-
-   デフォルトでは、*.grというファイルも設定用ファイルのファイル名と同じ名前に
- なりますが、以下のオプションで変更可能です。
-
-  -g : ゲームリソースファイルのファイル名を指定します
-       (default: -g ~/game/<target>.inf)
-
-
-3. その他の情報
-
-   その他のオプションに、指定のファイルはCD-ROMからコピーせずにリンクを張る、
- という指定が出来ます。
-
- % ./instgame -k Graphics kichiku.inf
-
- とすると、kichiku_ga.ald と kichiku_gb.ald のファイルはコピーされずに、
- CD-ROM上のデータへのシンボリックリンクになります。ただし、そうするとゲーム中
- はCD-ROMをマウントしておかなければならないので、CD-ROMをマウントしたまま
- CD-DAの演奏可能な一部のシステムでのみ可能です。
-
-
-   このオプションはゲームデータのインストール時の動作を規定するものなので、
- 自分でCD-ROMからファイルをコピーして、ゲームリソースファイルをエディタで
- 編集すれば、全く自由にデータの配置を行なう事が出来ます。もちろん、ゲーム
- リソースファイルのファイル名や置き場所も自由にして出来ます。
- ゲームリソースファイルの書式については doc/GRFMT.TXT を御覧下さい。
-
-
-4. 著作権など
-
-   instgameは 奈良木 さんがつくられたものですので、著作権は奈良木さんに
- 属します。奈良木さんの意向により、GPLに基づいて再配布可能です。
-
-  ドキュメントの不備は私(近間)までどうぞ。
-
-
-5. 連絡先
-
-   奈良木さん <naraki@debian.or.jp>
-   近間@NAIST <masaki-c@is.aist-nara.ac.jp>

contrib/ambi.inf

@@ -1,18 +0,0 @@
-# AmbivalenZ Install infomation
-# Tag,		#origin,		#destination
-ScenarioA,	gamedata/*sa.ald,	ambi_sa.ald
-GraphicsA,	gamedata/*ga.ald,	ambi_ga.ald
-SaveA,				,	ambi_sa.asd
-SaveB,				,	ambi_sb.asd
-SaveC,				,	ambi_sc.asd
-SaveD,				,	ambi_sd.asd
-SaveE,				,	ambi_se.asd
-SaveF,				,	ambi_sf.asd
-SaveG,				,	ambi_sg.asd
-SaveH,				,	ambi_sh.asd
-SaveI,				,	ambi_si.asd
-SaveJ,				,	ambi_sj.asd
-SaveK,				,	ambi_sk.asd
-SaveL,				,	ambi_sl.asd
-SaveM,				,	ambi_sm.asd
-SaveN,				,	ambi_sn.asd

contrib/atlach_new.inf

@@ -1,30 +0,0 @@
-# ATLACH-NACHA (low price version) Install infomation
-# Tag,		#origin,		#destination
-ScenarioA,	gamedata/*sa.ald,	atlach_sa.ald
-GraphicsA,	gamedata/*ga.ald,	atlach_ga.ald
-WaveA,		gamedata/*wa.ald,	atlach_wa.ald
-SaveA,				,	atlach_sa.asd
-SaveB,				,	atlach_sb.asd
-SaveC,				,	atlach_sc.asd
-SaveD,				,	atlach_sd.asd
-SaveE,				,	atlach_se.asd
-SaveF,				,	atlach_sf.asd
-SaveG,				,	atlach_sg.asd
-SaveH,				,	atlach_sh.asd
-SaveI,				,	atlach_si.asd
-SaveJ,				,	atlach_sj.asd
-SaveK,				,	atlach_sk.asd
-SaveL,				,	atlach_sl.asd
-SaveM,				,	atlach_sm.asd
-SaveN,				,	atlach_sn.asd
-SaveO,				,	atlach_so.asd
-SaveP,				,	atlach_sp.asd
-SaveQ,				,	atlach_sq.asd
-SaveR,				,	atlach_sr.asd
-SaveS,				,	atlach_ss.asd
-SaveT,				,	atlach_st.asd
-SaveU,				,	atlach_su.asd
-SaveV,				,	atlach_sv.asd
-SaveW,				,	atlach_sw.asd
-SaveX,				,	atlach_sx.asd
-SaveY,				,	atlach_sy.asd

contrib/chairs.inf

@@ -1,37 +0,0 @@
-# シェル・クレイル Install infomation
-# Tag,		#origin,		#destination
-ScenarioA,	GAMEDATA/*SA.ALD,	chairs_sa.ald
-GraphicsA,	GAMEDATA/*GA.ald,	chairs_ga.ald
-WaveA,		GAMEDATA/*WA.ald,	chairs_wa.ald
-BGMA,		GAMEDATA/*BA.ald,	chairs_ba.ald
-WAIA,		GAMEDATA/*WA.wai,	chairs_wa.wai
-BGIA,		GAMEDATA/*BA.bgi,	chairs_ba.bgi
-Ain,		GAMEDATA/*.ain,		system39.ain
-Init,		GAMEDATA/*.ini,		system39.ini
-SACT01,         GAMEDATA/SACTEFAM.KLD,  SACTEFAM.KLD
-SaveA,				,	chairs_sa.asd
-SaveB,				,	chairs_sb.asd
-SaveC,				,	chairs_sc.asd
-SaveD,				,	chairs_sd.asd
-SaveE,				,	chairs_se.asd
-SaveF,				,	chairs_sf.asd
-SaveG,				,	chairs_sg.asd
-SaveH,				,	chairs_sh.asd
-SaveI,				,	chairs_si.asd
-SaveJ,				,	chairs_sj.asd
-SaveK,				,	chairs_sk.asd
-SaveL,				,	chairs_sl.asd
-SaveM,				,	chairs_sm.asd
-SaveN,				,	chairs_sn.asd
-SaveO,				,	chairs_so.asd
-SaveP,				,	chairs_sp.asd
-SaveQ,				,	chairs_sq.asd
-SaveR,				,	chairs_sr.asd
-SaveS,				,	chairs_ss.asd
-SaveT,				,	chairs_st.asd
-SaveU,				,	chairs_su.asd
-SaveV,				,	chairs_sv.asd
-SaveW,				,	chairs_sw.asd
-SaveX,				,	chairs_sx.asd
-SaveY,				,	chairs_sy.asd
-SaveZ,				,	chairs_sz.asd

contrib/daiakuji.inf

@@ -1,19 +0,0 @@
-# 大悪司 Install infomation
-# Tag,		#origin,		#destination
-ScenarioA,	GAMEDATA/*SA.ALD,	daiakuji_sa.ald
-GraphicsA,	GAMEDATA/*GA.ALD,	daiakuji_ga.ald
-WaveA,		GAMEDATA/*WA.ALD,	daiakuji_wa.ald
-DataA,		GAMEDATA/*DA.ALD,	daiakuji_da.ald
-Ain,		GAMEDATA/*.ain,		system39.ain
-SaveA,				,	daiakuji_sa.asd
-SaveB,				,	daiakuji_sb.asd
-SaveC,				,	daiakuji_sc.asd
-SaveD,				,	daiakuji_sd.asd
-SaveE,				,	daiakuji_se.asd
-SaveF,				,	daiakuji_sf.asd
-SaveG,				,	daiakuji_sg.asd
-SaveH,				,	daiakuji_sh.asd
-SaveI,				,	daiakuji_si.asd
-SaveJ,				,	daiakuji_sj.asd
-SaveK,				,	daiakuji_sk.asd
-SaveL,				,	daiakuji_sl.asd

contrib/dalk.inf

@@ -1,17 +0,0 @@
-# dalk Install infomation
-# Tag,		#origin,		#destination
-ScenarioA,	dalk/dalk_sa.ald,	dalk_sa.ald
-GraphicsA,	dalk/dalk_ga.ald,	dalk_ga.ald
-MidiA,		dalk/dalk_ma.ald,	dalk_ma.ald
-WaveA,		dalk/dalk_wa.ald,	dalk_wa.ald
-DataA,		dalk/dalk_da.ald,	dalk_da.ald
-SaveA,				,	dalk_sa.asd
-SaveB,				,	dalk_sb.asd
-SaveC,				,	dalk_sc.asd
-SaveD,				,	dalk_sd.asd
-SaveE,				,	dalk_se.asd
-SaveF,				,	dalk_sf.asd
-SaveG,				,	dalk_sg.asd
-SaveH,				,	dalk_sh.asd
-SaveI,				,	dalk_si.asd
-SaveJ,				,	dalk_sj.asd

contrib/darcrows.inf

@@ -1,35 +0,0 @@
-# DARCROWS Install infomation
-# Tag,		#origin,		#destination
-ScenarioA,	gamedata/*SA.ALD,	hime_sa.ald
-GraphicsA,	gamedata/*GA.ALD,	hime_ga.ald
-GraphicsB,	gamedata/*GB.ALD,	hime_gb.ald
-WaveA,		gamedata/*WA.ALD,	hime_wa.ald
-WaveB,		gamedata/*WB.ALD,	hime_wb.ald
-MidiA,		gamedata/*MA.ALD,	hime_ma.ald
-ResourceA,	gamedata/*RA.ALD,	hime_ra.ald
-SaveA,				,	hime_sa.asd
-SaveB,				,	hime_sb.asd
-SaveC,				,	hime_sc.asd
-SaveD,				,	hime_sd.asd
-SaveE,				,	hime_se.asd
-SaveF,				,	hime_sf.asd
-SaveG,				,	hime_sg.asd
-SaveH,				,	hime_sh.asd
-SaveI,				,	hime_si.asd
-SaveJ,				,	hime_sj.asd
-SaveK,				,	hime_sk.asd
-SaveL,				,	hime_sl.asd
-SaveM,				,	hime_sm.asd
-SaveN,				,	hime_sn.asd
-SaveO,				,	hime_so.asd
-SaveP,				,	hime_sp.asd
-SaveQ,				,	hime_sq.asd
-SaveR,				,	hime_sr.asd
-SaveS,				,	hime_ss.asd
-SaveT,				,	hime_st.asd
-SaveU,				,	hime_su.asd
-SaveV,				,	hime_sv.asd
-SaveW,				,	hime_sw.asd
-SaveX,				,	hime_sx.asd
-SaveY,				,	hime_sy.asd
-SaveZ,				,	hime_sz.asd

contrib/diabo.inf

@@ -1,16 +0,0 @@
-# DiaboLiQue Install infomation
-# Tag,		#origin,		#destination
-ScenarioA,	gamedata/*sa.ald,	diabo_sa.ald
-GraphicsA,	gamedata/*ga.ald,	diabo_ga.ald
-GraphicsB,	gamedata/*gb.ald,	diabo_gb.ald
-WaveA,		gamedata/*wa.ald,	diabo_wa.ald
-SaveA,				,	diabo_sa.asd
-SaveB,				,	diabo_sb.asd
-SaveC,				,	diabo_sc.asd
-SaveD,				,	diabo_sd.asd
-SaveE,				,	diabo_se.asd
-SaveF,				,	diabo_sf.asd
-SaveG,				,	diabo_sg.asd
-SaveH,				,	diabo_sh.asd
-SaveI,				,	diabo_si.asd
-SaveJ,				,	diabo_sj.asd

contrib/diabo_new.inf

@@ -1,30 +0,0 @@
-# DiaboLiQue (low price version) Install infomation
-# Tag,		#origin,		#destination
-ScenarioA,	gamedata/*sa.ald,	diabo_sa.ald
-GraphicsA,	gamedata/*ga.ald,	diabo_ga.ald
-WaveA,		gamedata/*wa.ald,	diabo_wa.ald
-SaveA,				,	diabo_sa.asd
-SaveB,				,	diabo_sb.asd
-SaveC,				,	diabo_sc.asd
-SaveD,				,	diabo_sd.asd
-SaveE,				,	diabo_se.asd
-SaveF,				,	diabo_sf.asd
-SaveG,				,	diabo_sg.asd
-SaveH,				,	diabo_sh.asd
-SaveI,				,	diabo_si.asd
-SaveJ,				,	diabo_sj.asd
-SaveK,				,	diabo_sk.asd
-SaveL,				,	diabo_sl.asd
-SaveM,				,	diabo_sm.asd
-SaveN,				,	diabo_sn.asd
-SaveO,				,	diabo_so.asd
-SaveP,				,	diabo_sp.asd
-SaveQ,				,	diabo_sq.asd
-SaveR,				,	diabo_sr.asd
-SaveS,				,	diabo_ss.asd
-SaveT,				,	diabo_st.asd
-SaveU,				,	diabo_su.asd
-SaveV,				,	diabo_sv.asd
-SaveW,				,	diabo_sw.asd
-SaveX,				,	diabo_sx.asd
-SaveY,				,	diabo_sy.asd

contrib/drstop.inf

@@ -1,10 +0,0 @@
-# DrStop! Install infomation
-# Tag,		#origin,		#destination
-ScenarioA,	drstop\!/ds_sa.ald,	ds_sa.ald
-GraphicsA,	drstop\!/ds_ga.ald,	ds_ga.ald
-MidiA,		drstop\!/ds_ma.ald,	ds_ma.ald
-SaveA,				,	ds_sa.asd
-SaveB,				,	ds_sb.asd
-SaveC,				,	ds_sc.asd
-SaveD,				,	ds_sd.asd
-SaveE,				,	ds_se.asd

contrib/esuka.inf

@@ -1,38 +0,0 @@
-# エスカレイヤー Install infomation
-# Tag,		#origin,		#destination
-ScenarioA,	GAMEDATA/*SA.ALD,	esuka_sa.ald
-GraphicsA,	GAMEDATA/*GA.ALD,	esuka_ga.ald
-GraphicsB,	GAMEDATA/*GB.ALD,	esuka_gb.ald
-WaveA,		GAMEDATA/*WA.ALD,	esuka_wa.ald
-WaveB,		GAMEDATA/*WB.ALD,	esuka_wb.ald
-BGMA,		GAMEDATA/*BA.ALD,	esuka_ba.ald
-WAIA,		GAMEDATA/*WA.WAI,	esuka_wa.wai
-BGIA,		GAMEDATA/*BA.BGI,	esuka_ba.bgi
-Ain,		GAMEDATA/*.ain,		system39.ain
-Init,		GAMEDATA/*.ini,		system39.ini
-SaveA,				,	esuka_sa.asd
-SaveB,				,	esuka_sb.asd
-SaveC,				,	esuka_sc.asd
-SaveD,				,	esuka_sd.asd
-SaveE,				,	esuka_se.asd
-SaveF,				,	esuka_sf.asd
-SaveG,				,	esuka_sg.asd
-SaveH,				,	esuka_sh.asd
-SaveI,				,	esuka_si.asd
-SaveJ,				,	esuka_sj.asd
-SaveK,				,	esuka_sk.asd
-SaveL,				,	esuka_sl.asd
-SaveM,				,	esuka_sm.asd
-SaveN,				,	esuka_sn.asd
-SaveO,				,	esuka_so.asd
-SaveP,				,	esuka_sp.asd
-SaveQ,				,	esuka_sq.asd
-SaveR,				,	esuka_sr.asd
-SaveS,				,	esuka_ss.asd
-SaveT,				,	esuka_st.asd
-SaveU,				,	esuka_su.asd
-SaveV,				,	esuka_sv.asd
-SaveW,				,	esuka_sw.asd
-SaveX,				,	esuka_sx.asd
-SaveY,				,	esuka_sy.asd
-SaveZ,				,	esuka_sz.asd

contrib/hushaby.inf

@@ -1,8 +0,0 @@
-# Hushaby Baby Install infomation
-# Tag,		#origin,		#destination
-ScenarioA,	gamedata/*SA.ALD,	hushaby_sa.ald
-GraphicsA,	gamedata/*GA.ALD,	hushaby_ga.ald
-WaveA,		gamedata/*WA.ALD,	hushaby_wa.ald
-MidiA,		gamedata/*MA.ALD,	hushaby_ma.ald
-SaveA,				,	hushaby_sa.asd
-

contrib/instgame

@@ -1,151 +0,0 @@
-#!/usr/bin/perl
-#
-# instgame: xsystem3.5 data install script
-#
-# Author: Hiroshi Naraki<naraki@debian.or.jp>
-#
-# $Id: instgame,v 1.5 1999/05/18 21:52:02 chikama Exp $
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-# default value
-$cdrom_dir = "/cdrom";
-$dest_base_dir = "~/game";
-
-# get program name
-($program) = ($0 =~ m%([^/]+)$%);
-
-# get home directory
-$home = $ENV{'HOME'};
-
-# show usage and exit
-sub usage {
-    print "Usage: $program [options] <target>.inf \n";
-    print "  -c directory    cdrom directory.(default: /cdrom) \n"; 
-    print "  -d directory    destination game directory.(default: ~/game/<target>)\n"; 
-    print "  -g file         game resource file name.(default: ~/game/<target>.gr)\n"; 
-    print "  -k tag          keep the tagged file from copying.\n"; 
-}
-
-;# parsing options
-while (@ARGV) {
-    $_ = shift;
-    s/^-// || do { $target = $_; last };
-    $_ eq 'c' && @ARGV && do { $cdrom_dir = shift; next }; # install from
-    $_ eq 'd' && @ARGV && do { $dest_base_dir = shift; next }; # install to
-    $_ eq 'g' && @ARGV && do { $grfile = shift; next }; # gr-file to
-    $_ eq 'k' && @ARGV && do { @keep_list = (@keep_list, shift); next }; # keep tag
-    $_ eq 'v' && @ARGV && do { $debug = 1; next }; # debug
-    &usage;
-    exit;
-}
-
-# nothing target
-if (! -f $target ) { 
-	&usage;
-	exit;
-}
-# decide game resource file name 
-$base = $target; 
-$base =~ s%.*/%%;
-$base =~ s/\.inf//;
-$dest_dir = $dest_base_dir."/".$base;
-$grfile = $dest_base_dir."/".$base.".gr";
-
-# expand directory name
-$dest_dir =~ s/~/$home/;
-$grfile   =~ s/~/$home/;
-
-# print variables if debug
-if ($debug) {
-	print "cdrom_dir:$cdrom_dir\n";
-	print "dest_dir:$dest_dir\n";
-	print "grfile  :$grfile\n";
-}
-
--d $cdrom_dir || die "$!:$cdrom_dir\n";
-
-&make_dir($dest_dir);
-
-open( DAT, $target) || die "Can't open $target:$!\n";
-
-open( FILE, "> $grfile" )     || die "Can't create file $grfile:$!\n";
-print FILE "# System 3.5 GameResource File: [$target]\n";
-
-while( $line = <DAT>) {
-	$line =~ s/\#.*|\s//g; 
-	$line eq /^$/ && do { next };
-	@data = split(/,/,$line);
-	$tag  = $data[0];
-	$from = $data[1];
-	$to   = $data[2];
-
-	if( $to eq '' ) {
-		&view_action("Ignore ", $tag, $from, $to);
-		next;
-	}
-	$to = $dest_dir."/".$to;
-	if( $tag eq '' ) {
-		$keep = 0;
-	} else {
-		$keep = grep(/$tag*/, @keep_list );
-	}
-	if( $keep ) {
-		$from = $cdrom_dir."/".$from ;
-		&view_action("Linking", $tag, $from, $to);
-#		symlink($from, $to) if !$debug;
-		system("ln -s $from $to") if !$debug;
-	} elsif( $from eq '' ) { 
-#		&view_action("Create ", $tag, $from, $to);
-#		system("touch $to") if !$debug;
-		&view_action("Skip   ", $tag, $from, $to);
-	} else {
-		$from = $cdrom_dir."/".$from ;
-		foreach ( <${from}>) {
-			&view_action("Copying", $tag, $from, $to);
-			system("cp $from $to") if !$debug;
-		}
-	}
-
-	# Create game resource file
-	if( $tag ne '' ) { 
-		print "writing: $tag $to\n" if $debug;
-		print FILE "$tag $to\n";
-	}
-}
-close(FILE);
-close(DAT);
-exit;
-
-sub view_action {
-	local($action, $tag, $from, $to ) = @_;
-
-	print "$action $tag: $from -> $to\n";
-}
-
-# mkdir destination directories.
-sub make_dir {
-	local($target ) = @_;
-
-	@dest = split(/\//,$target);
-	foreach $dir ( @dest ) {
-        	$work .= $dir.'/';
-        	print "checking $work\n" if $debug;
-        	if( !-d $work ) {
-        		print "mkdir $work\n" if $debug;
-			mkdir( $work,0777) || die "Can't mkdir $work:$!\n";
-		}
-	}
-}

contrib/kakurezuki.inf

@@ -1,16 +0,0 @@
-# kakurezuki Install infomation
-# Tag,          #origin,                #destination
-ScenarioA,      GAMEDATA/*SA.ALD,       tsuki_sa.ald
-GraphicsA,      GAMEDATA/*GA.ALD,       tsuki_ga.ald
-WaveA,          GAMEDATA/*WA.ALD,       tsuki_wa.ald
-SaveA,                          ,       tsuki_sa.asd
-SaveB,                          ,       tsuki_sb.asd
-SaveC,                          ,       tsuki_sc.asd
-SaveD,                          ,       tsuki_sd.asd
-SaveE,                          ,       tsuki_se.asd
-SaveF,                          ,       tsuki_sf.asd
-SaveG,                          ,       tsuki_sg.asd
-SaveH,                          ,       tsuki_sh.asd
-SaveI,                          ,       tsuki_si.asd
-SaveJ,                          ,       tsuki_sj.asd
-SaveK,                          ,       tsuki_sk.asd

contrib/katsumi.inf

@@ -1,17 +0,0 @@
-# Ikenai Katsumisensei Install infomation
-# Tag,		#origin,		#destination
-ScenarioA,	gamedata/*sa.ald,	katsumi_sa.ald
-GraphicsA,	gamedata/*ga.ald,	katsumi_ga.ald
-GraphicsB,	gamedata/*gb.ald,	katsumi_gb.ald
-WaveA,		gamedata/*wa.ald,	katsumi_wa.ald
-SaveA,				,	katsumi_sa.asd
-SaveB,				,	katsumi_sb.asd
-SaveC,				,	katsumi_sc.asd
-SaveD,				,	katsumi_sd.asd
-SaveE,				,	katsumi_se.asd
-SaveF,				,	katsumi_sf.asd
-SaveG,				,	katsumi_sg.asd
-SaveH,				,	katsumi_sh.asd
-SaveI,				,	katsumi_si.asd
-SaveJ,				,	katsumi_sj.asd
-              gamedata/gaiji.dat,       gaiji.dat

contrib/kichiku.inf

@@ -1,16 +0,0 @@
-# Kichikuoh Install infomation
-# Tag,		#origin,		#destination
-ScenarioA,	gamedata/*sa.ald,	kichiku_sa.ald
-GraphicsA,	gamedata/*ga.ald,	kichiku_ga.ald
-GraphicsB,	gamedata/*gb.ald,	kichiku_gb.ald
-WaveA,		gamedata/*wa.ald,	kichiku_wa.ald
-SaveA,				,	kichiku_sa.asd
-SaveB,				,	kichiku_sb.asd
-SaveC,				,	kichiku_sc.asd
-SaveD,				,	kichiku_sd.asd
-SaveE,				,	kichiku_se.asd
-SaveF,				,	kichiku_sf.asd
-SaveG,				,	kichiku_sg.asd
-SaveH,				,	kichiku_sh.asd
-SaveI,				,	kichiku_si.asd
-SaveJ,				,	kichiku_sj.asd

contrib/mamatoto.inf

@@ -1,34 +0,0 @@
-# MAMATOTO Install infomation
-# Tag,		#origin,		#destination
-ScenarioA,	GAMEDATA/*SA.ALD,	mamatoto_sa.ald
-GraphicsA,	GAMEDATA/*GA.ALD,	mamatoto_ga.ald
-GraphicsB,	GAMEDATA/*GB.ALD,	mamatoto_gb.ald
-WaveA,		GAMEDATA/*WA.ALD,	mamatoto_wa.ald
-MidiA,		GAMEDATA/*MA.ALD,	mamatoto_ma.ald
-DataA,		GAMEDATA/*DA.ALD,	mamatoto_da.ald
-SaveA,				,	mamatoto_sa.asd
-SaveB,				,	mamatoto_sb.asd
-SaveC,				,	mamatoto_sc.asd
-SaveD,				,	mamatoto_sd.asd
-SaveE,				,	mamatoto_se.asd
-SaveF,				,	mamatoto_sf.asd
-SaveG,				,	mamatoto_sg.asd
-SaveH,				,	mamatoto_sh.asd
-SaveI,				,	mamatoto_si.asd
-SaveJ,				,	mamatoto_sj.asd
-SaveK,				,	mamatoto_sk.asd
-SaveL,				,	mamatoto_sl.asd
-SaveM,				,	mamatoto_sm.asd
-SaveN,				,	mamatoto_sn.asd
-SaveO,				,	mamatoto_so.asd
-SaveP,				,	mamatoto_sp.asd
-SaveQ,				,	mamatoto_sq.asd
-SaveR,				,	mamatoto_sr.asd
-SaveS,				,	mamatoto_ss.asd
-SaveT,				,	mamatoto_st.asd
-SaveU,				,	mamatoto_su.asd
-SaveV,				,	mamatoto_sv.asd
-SaveW,				,	mamatoto_sw.asd
-SaveX,				,	mamatoto_sx.asd
-SaveY,				,	mamatoto_sy.asd
-SaveZ,				,	mamatoto_sz.asd

contrib/mamori.inf

@@ -1,17 +0,0 @@
-# MamoriGami Sama Install infomation
-# Tag,		#origin,		#destination
-ScenarioA,	GAMEDATA/*SA.ALD,	mamori_sa.ald
-GraphicsA,	GAMEDATA/*GA.ALD,	mamori_ga.ald
-GraphicsB,	GAMEDATA/*GB.ALD,	mamori_gb.ald
-WaveA,		GAMEDATA/*WA.ALD,	mamori_wa.ald
-MidiA,		GAMEDATA/*MA.ALD,	mamori_ma.ald
-SaveA,				,	mamori_sa.asd
-SaveB,				,	mamori_sb.asd
-SaveC,				,	mamori_sc.asd
-SaveD,				,	mamori_sd.asd
-SaveE,				,	mamori_se.asd
-SaveF,				,	mamori_sf.asd
-SaveG,				,	mamori_sg.asd
-SaveH,				,	mamori_sh.asd
-SaveI,				,	mamori_si.asd
-SaveJ,				,	mamori_sj.asd

contrib/miko.inf

@@ -1,9 +0,0 @@
-# Ikusa Miko Install infomation
-# Tag,		#origin,		#destination
-ScenarioA,	gamedata/*sa.ald,	miko_sa.ald
-GraphicsA,	gamedata/*ga.ald,	miko_ga.ald
-WaveA,		gamedata/*wa.ald,	miko_wa.ald
-SaveA,				,	miko_sa.asd
-SaveB,				,	miko_sb.asd
-SaveC,				,	miko_sc.asd
-SaveJ,				,	miko_sj.asd

contrib/mugen.inf

@@ -1,7 +0,0 @@
-# mugen hoyo Install infomation
-# Tag,		#origin,		#destination
-ScenarioA,	gamedata/*SA.ald,	mugen_sa.ald
-GraphicsA,	gamedata/*GA.ald,	mugen_ga.ald
-SaveA,				,	mugen_sa.asd
-SaveB,				,	mugen_sb.asd
-SaveC,				,	mugen_sc.asd

contrib/nd.inf

@@ -1,41 +0,0 @@
-# Night Demon Install infomation
-# Tag,		#origin,		#destination
-ScenarioA,	GAMEDATA/*SA.ald,	nd_sa.ald
-GraphicsA,	GAMEDATA/*GA.ald,	nd_ga.ald
-WaveA,		GAMEDATA/*WA.ald,	nd_wa.ald
-BGMA,		GAMEDATA/*BA.ald,	nd_ba.ald
-WAIA,		GAMEDATA/*WA.wai,	nd_wa.wai
-BGIA,		GAMEDATA/*BA.bgi,	nd_ba.bgi
-Ain,		GAMEDATA/*.ain,		system39.ain
-Init,		GAMEDATA/*.ini,		system39.ini
-SACT01,         GAMEDATA/SACTEFAM.KLD,  SACTEFAM.KLD
-ALK01,          GAMEDATA/AliceLogo.alk, AliceLogo.alk
-ALK02,          GAMEDATA/NightDemonDemo1.alk, NightDemonDemo1.alk
-ALK03,          GAMEDATA/NightDemonDemo2.alk, NightDemonDemo2.alk
-ALK04,          GAMEDATA/NightDemonDemo3.alk, NightDemonDemo3.alk
-SaveA,				,	nd_sa.asd
-SaveB,				,	nd_sb.asd
-SaveC,				,	nd_sc.asd
-SaveD,				,	nd_sd.asd
-SaveE,				,	nd_se.asd
-SaveF,				,	nd_sf.asd
-SaveG,				,	nd_sg.asd
-SaveH,				,	nd_sh.asd
-SaveI,				,	nd_si.asd
-SaveJ,				,	nd_sj.asd
-SaveK,				,	nd_sk.asd
-SaveL,				,	nd_sl.asd
-SaveM,				,	nd_sm.asd
-SaveN,				,	nd_sn.asd
-SaveO,				,	nd_so.asd
-SaveP,				,	nd_sp.asd
-SaveQ,				,	nd_sq.asd
-SaveR,				,	nd_sr.asd
-SaveS,				,	nd_ss.asd
-SaveT,				,	nd_st.asd
-SaveU,				,	nd_su.asd
-SaveV,				,	nd_sv.asd
-SaveW,				,	nd_sw.asd
-SaveX,				,	nd_sx.asd
-SaveY,				,	nd_sy.asd
-SaveZ,				,	nd_sz.asd

contrib/onlyyou_r.inf

@@ -1,32 +0,0 @@
-# Only You リクルス Install infomation
-# Tag,		#origin,		#destination
-ScenarioA,	gamedata/*SA.ald,	onlyyou_r_sa.ald
-GraphicsA,	gamedata/*GA.ald,	onlyyou_r_ga.ald
-WaveA,		gamedata/*WA.ald,	onlyyou_r_wa.ald
-Ain,		gamedata/*.ain,		System39.ain
-SaveA,				,	onlyyou_r_sa.asd
-SaveB,				,	onlyyou_r_sb.asd
-SaveC,				,	onlyyou_r_sc.asd
-SaveD,				,	onlyyou_r_sd.asd
-SaveE,				,	onlyyou_r_se.asd
-SaveF,				,	onlyyou_r_sf.asd
-SaveG,				,	onlyyou_r_sg.asd
-SaveH,				,	onlyyou_r_sh.asd
-SaveI,				,	onlyyou_r_si.asd
-SaveJ,				,	onlyyou_r_sj.asd
-SaveK,				,	onlyyou_r_sk.asd
-SaveL,				,	onlyyou_r_sl.asd
-SaveM,				,	onlyyou_r_sm.asd
-SaveN,				,	onlyyou_r_sn.asd
-SaveO,				,	onlyyou_r_so.asd
-SaveP,				,	onlyyou_r_sp.asd
-SaveQ,				,	onlyyou_r_sq.asd
-SaveR,				,	onlyyou_r_sr.asd
-SaveS,				,	onlyyou_r_ss.asd
-SaveT,				,	onlyyou_r_st.asd
-SaveU,				,	onlyyou_r_su.asd
-SaveV,				,	onlyyou_r_sv.asd
-SaveW,				,	onlyyou_r_sw.asd
-SaveX,				,	onlyyou_r_sx.asd
-SaveY,				,	onlyyou_r_sy.asd
-SaveZ,				,	onlyyou_r_sz.asd

contrib/oudou.inf

@@ -1,16 +0,0 @@
-# Oudou Yusha Install infomation
-# Tag,		#origin,		#destination
-ScenarioA,	gamedata/*sa.ald,	oudou_sa.ald
-GraphicsA,	gamedata/*ga.ald,	oudou_ga.ald
-GraphicsB,	gamedata/*gb.ald,	oudou_gb.ald
-WaveA,		gamedata/*wa.ald,	oudou_wa.ald
-SaveA,				,	oudou_sa.asd
-SaveB,				,	oudou_sb.asd
-SaveC,				,	oudou_sc.asd
-SaveD,				,	oudou_sd.asd
-SaveE,				,	oudou_se.asd
-SaveF,				,	oudou_sf.asd
-SaveG,				,	oudou_sg.asd
-SaveH,				,	oudou_sh.asd
-SaveI,				,	oudou_si.asd
-SaveJ,				,	oudou_sj.asd

contrib/panyo.inf

@@ -1,36 +0,0 @@
-# Kaerunyo Panyon Install infomation
-# Tag,		#origin,		#destination
-ScenarioA,	gamedata/*sa.ald,	panyo_sa.ald
-GraphicsA,	gamedata/*ga.ald,	panyo_ga.ald
-WaveA,		gamedata/*wa.ald,	panyo_wa.ald
-SaveA,				,	panyo_sa.asd
-SaveB,				,	panyo_sb.asd
-SaveC,				,	panyo_sc.asd
-SaveD,				,	panyo_sd.asd
-SaveE,				,	panyo_se.asd
-SaveF,				,	panyo_sf.asd
-SaveG,				,	panyo_sg.asd
-SaveH,				,	panyo_sh.asd
-SaveI,				,	panyo_si.asd
-SaveJ,				,	panyo_sj.asd
-SaveK,				,	panyo_sk.asd
-SaveL,				,	panyo_sl.asd
-SaveM,				,	panyo_sm.asd
-SaveN,				,	panyo_sn.asd
-SaveO,				,	panyo_so.asd
-,           gamedata/floor_1.map,       floor_1.map
-,           gamedata/floor_2.map,       floor_2.map
-,           gamedata/floor_3.map,       floor_3.map
-,           gamedata/floor_4.map,       floor_4.map
-,           gamedata/floor_5.map,       floor_5.map
-,           gamedata/floor_6.map,       floor_6.map
-,           gamedata/floor_7.map,       floor_7.map
-,           gamedata/floor_8.map,       floor_8.map
-,           gamedata/floor_9.map,       floor_9.map
-,           gamedata/floor_10.map,      floor_10.map
-,           gamedata/floor_11.map,      floor_11.map
-,           gamedata/floor_12.map,      floor_12.map
-,           gamedata/floor_13.map,      floor_13.map
-,           gamedata/floor_14.map,      floor_14.map
-,           gamedata/floor_15.map,      floor_15.map
-,           gamedata/floor_16.map,      floor_16.map

contrib/panyo_new.inf

@@ -1,63 +0,0 @@
-# Kaerunyo Panyon (low price version) Install infomation
-# Tag,		#origin,		#destination
-ScenarioA,	gamedata/*sa.ald,	panyo_sa.ald
-GraphicsA,	gamedata/*ga.ald,	panyo_ga.ald
-WaveA,		gamedata/*wa.ald,	panyo_wa.ald
-SaveA,				,	panyo_sa.asd
-SaveB,				,	panyo_sb.asd
-SaveC,				,	panyo_sc.asd
-SaveD,				,	panyo_sd.asd
-SaveE,				,	panyo_se.asd
-SaveF,				,	panyo_sf.asd
-SaveG,				,	panyo_sg.asd
-SaveH,				,	panyo_sh.asd
-SaveI,				,	panyo_si.asd
-SaveJ,				,	panyo_sj.asd
-SaveK,				,	panyo_sk.asd
-SaveL,				,	panyo_sl.asd
-SaveM,				,	panyo_sm.asd
-SaveN,				,	panyo_sn.asd
-SaveO,				,	panyo_so.asd
-SaveP,				,	panyo_sp.asd
-SaveQ,				,	panyo_sq.asd
-SaveR,				,	panyo_sr.asd
-SaveS,				,	panyo_ss.asd
-SaveT,				,	panyo_st.asd
-SaveU,				,	panyo_su.asd
-SaveV,				,	panyo_sv.asd
-SaveW,				,	panyo_sw.asd
-SaveX,				,	panyo_sx.asd
-SaveY,				,	panyo_sy.asd
-,           gamedata/floor_1.map,       floor_1.map
-,           gamedata/floor_2.map,       floor_2.map
-,           gamedata/floor_3.map,       floor_3.map
-,           gamedata/floor_4.map,       floor_4.map
-,           gamedata/floor_5.map,       floor_5.map
-,           gamedata/floor_6.map,       floor_6.map
-,           gamedata/floor_7.map,       floor_7.map
-,           gamedata/floor_8.map,       floor_8.map
-,           gamedata/floor_9.map,       floor_9.map
-,           gamedata/floor_10.map,      floor_10.map
-,           gamedata/floor_11.map,      floor_11.map
-,           gamedata/floor_12.map,      floor_12.map
-,           gamedata/floor_13.map,      floor_13.map
-,           gamedata/floor_14.map,      floor_14.map
-,           gamedata/floor_15.map,      floor_15.map
-,           gamedata/floor_16.map,      floor_16.map
-,           gamedata/floor_17.map,      floor_17.map
-,           gamedata/floor_18.map,      floor_18.map
-,           gamedata/floor_19.map,      floor_19.map
-,           gamedata/floor_20.map,      floor_20.map
-,           gamedata/floor_21.map,      floor_21.map
-,           gamedata/floor_22.map,      floor_22.map
-,           gamedata/floor_23.map,      floor_23.map
-,           gamedata/floor_24.map,      floor_24.map
-,           gamedata/floor_25.map,      floor_25.map
-,           gamedata/floor_26.map,      floor_26.map
-,           gamedata/floor_27.map,      floor_27.map
-,           gamedata/floor_28.map,      floor_28.map
-,           gamedata/floor_29.map,      floor_29.map
-,           gamedata/floor_30.map,      floor_30.map
-,           gamedata/floor_31.map,      floor_31.map
-,           gamedata/floor_32.map,      floor_32.map
-,           gamedata/floor_33.map,      floor_33.map

contrib/pascha.inf

@@ -1,33 +0,0 @@
-# PastelChime Install infomation
-# Tag,		#origin,		#destination
-ScenarioA,	gamedata/*SA.ALD,	pascha_sa.ald
-GraphicsA,	gamedata/*GA.ALD,	pascha_ga.ald
-WaveA,		gamedata/*WA.ALD,	pascha_wa.ald
-MidiA,		gamedata/*MA.ALD,	pascha_ma.ald
-DataA,		gamedata/*DA.ALD,	pascha_da.ald
-SaveA,				,	pascha_sa.asd
-SaveB,				,	pascha_sb.asd
-SaveC,				,	pascha_sc.asd
-SaveD,				,	pascha_sd.asd
-SaveE,				,	pascha_se.asd
-SaveF,				,	pascha_sf.asd
-SaveG,				,	pascha_sg.asd
-SaveH,				,	pascha_sh.asd
-SaveI,				,	pascha_si.asd
-SaveJ,				,	pascha_sj.asd
-SaveK,				,	pascha_sk.asd
-SaveL,				,	pascha_sl.asd
-SaveM,				,	pascha_sm.asd
-SaveN,				,	pascha_sn.asd
-SaveO,				,	pascha_so.asd
-SaveP,				,	pascha_sp.asd
-SaveQ,				,	pascha_sq.asd
-SaveR,				,	pascha_sr.asd
-SaveS,				,	pascha_ss.asd
-SaveT,				,	pascha_st.asd
-SaveU,				,	pascha_su.asd
-SaveV,				,	pascha_sv.asd
-SaveW,				,	pascha_sw.asd
-SaveX,				,	pascha_sx.asd
-SaveY,				,	pascha_sy.asd
-SaveZ,				,	pascha_sz.asd

contrib/persiom.inf

@@ -1,20 +0,0 @@
-# Persiom Install infomation
-# Tag,		#origin,		#destination
-ScenarioA,	GAMEDATA/*SA.ALD,	persiom_sa.ald
-GraphicsA,	GAMEDATA/*GA.ALD,	persiom_ga.ald
-GraphicsB,	GAMEDATA/*GB.ALD,	persiom_gb.ald
-WaveA,		GAMEDATA/*WA.ALD,	persiom_wa.ald
-MidiA,		GAMEDATA/*MA.ALD,	persiom_ma.ald
-DataA,		GAMEDATA/*DA.ALD,	persiom_da.ald
-SaveA,				,	persiom_sa.asd
-SaveB,				,	persiom_sb.asd
-SaveC,				,	persiom_sc.asd
-SaveD,				,	persiom_sd.asd
-SaveE,				,	persiom_se.asd
-SaveF,				,	persiom_sf.asd
-SaveG,				,	persiom_sg.asd
-SaveH,				,	persiom_sh.asd
-SaveI,				,	persiom_si.asd
-SaveJ,				,	persiom_sj.asd
-SaveK,				,	persiom_sk.asd
-SaveL,				,	persiom_sl.asd

contrib/progood.inf

@@ -1,17 +0,0 @@
-# prostudent good Install infomation
-# Tag,		#origin,		#destination
-ScenarioA,	GAMEDATA/*SA.ALD,	progood_sa.ald
-GraphicsA,	GAMEDATA/*GA.ALD,	progood_ga.ald
-WaveA,		GAMEDATA/*WA.ALD,	progood_wa.ald
-DataA,		GAMEDATA/*DA.ALD,	progood_da.ald
-SaveA,				,	progood_sa.asd
-SaveB,				,	progood_sb.asd
-SaveC,				,	progood_sc.asd
-SaveD,				,	progood_sd.asd
-SaveE,				,	progood_se.asd
-SaveF,				,	progood_sf.asd
-SaveG,				,	progood_sg.asd
-SaveH,				,	progood_sh.asd
-SaveI,				,	progood_si.asd
-SaveJ,				,	progood_sj.asd
-SaveK,				,	progood_sk.asd

contrib/rance1.inf

@@ -1,20 +0,0 @@
-# Rance 1 Install infomation
-# Tag,		#origin,		#destination
-ScenarioA,	rance1/rancesa.ald,	rance1_sa.ald
-GraphicsA,	rance1/rancega.ald,	rance1_ga.ald
-MidiA,		rance1/rancema.ald,	rance1_ma.ald
-WaveA,		rance1/rancewa.ald,	rance1_wa.ald
-SaveA,				,	rance1_sa.asd
-SaveB,				,	rance1_sb.asd
-SaveC,				,	rance1_sc.asd
-SaveD,				,	rance1_sd.asd
-SaveE,				,	rance1_se.asd
-SaveF,				,	rance1_sf.asd
-SaveG,				,	rance1_sg.asd
-SaveH,				,	rance1_sh.asd
-SaveI,				,	rance1_si.asd
-SaveJ,				,	rance1_sj.asd
-SaveK,				,	rance1_sk.asd
-SaveL,				,	rance1_sl.asd
-SaveM,				,	rance1_sm.asd
-SaveN,				,	rance1_sn.asd

contrib/rance2.inf

@@ -1,20 +0,0 @@
-# Rance 2 Install infomation
-# Tag,		#origin,		#destination
-ScenarioA,	rance2/rance2sa.ald,	rance2_sa.ald
-GraphicsA,	rance2/rance2ga.ald,	rance2_ga.ald
-MidiA,		rance2/rance2ma.ald,	rance2_ma.ald
-WaveA,		rance2/rance2wa.ald,	rance2_wa.ald
-SaveA,				,	rance2_sa.asd
-SaveB,				,	rance2_sb.asd
-SaveC,				,	rance2_sc.asd
-SaveD,				,	rance2_sd.asd
-SaveE,				,	rance2_se.asd
-SaveF,				,	rance2_sf.asd
-SaveG,				,	rance2_sg.asd
-SaveH,				,	rance2_sh.asd
-SaveI,				,	rance2_si.asd
-SaveJ,				,	rance2_sj.asd
-SaveK,				,	rance2_sk.asd
-SaveL,				,	rance2_sl.asd
-SaveM,				,	rance2_sm.asd
-SaveN,				,	rance2_sn.asd

contrib/rance3.inf

@@ -1,15 +0,0 @@
-# Rance 3 Install infomation
-# Tag,		#origin,		#destination
-ScenarioA,      rance3/rance3sa.ald,    rance3sa.ald
-GraphicsA,      rance3/rance3ga.ald,    rance3ga.ald
-WaveA,          rance3/rance3wa.ald,    rance3wa.ald
-MidiA,          rance3/rance3ma.ald,    rance3ma.ald
-DataA,          rance3/rance3da.ald,    rance3da.ald
-SaveA,                             ,    rance3sa.asd
-SaveB,                             ,    rance3sb.asd
-SaveC,                             ,    rance3sc.asd
-SaveD,                             ,    rance3sd.asd
-SaveE,                             ,    rance3se.asd
-SaveF,                             ,    rance3sf.asd
-SaveG,                             ,    rance3sg.asd
-SaveH,                             ,    rance3sh.asd

contrib/rance4.inf

@@ -1,15 +0,0 @@
-# Rance 4 Install infomation
-# Tag,		#origin,		#destination
-ScenarioA,	gamedata/*sa.ald,	rance4_sa.ald
-GraphicsA,	gamedata/*ga.ald,	rance4_ga.ald
-WaveA,		gamedata/*wa.ald,	rance4_wa.ald
-SaveA,				,	rance4_sa.asd
-SaveB,				,	rance4_sb.asd
-SaveC,				,	rance4_sc.asd
-SaveD,				,	rance4_sd.asd
-SaveE,				,	rance4_se.asd
-SaveF,				,	rance4_sf.asd
-SaveG,				,	rance4_sg.asd
-SaveH,				,	rance4_sh.asd
-SaveI,				,	rance4_si.asd
-SaveJ,				,	rance4_sj.asd

contrib/rance5d.inf

@@ -1,36 +0,0 @@
-# Rance5D Install infomation
-# Tag,		#origin,		#destination
-ScenarioA,	GAMEDATA/*SA.ALD,	r5d_sa.ald
-GraphicsA,	GAMEDATA/*GA.ALD,	r5d_ga.ald
-WaveA,		GAMEDATA/*WA.ALD,	r5d_wa.ald
-BGMA,		GAMEDATA/*BA.ALD,	r5d_ba.ald
-BGIA,		GAMEDATA/*BA.BGI,	r5d_ba.bgi
-Ain,		GAMEDATA/*.ain,		system39.ain
-Init,		GAMEDATA/*.ini,		system39.ini
-SACT01,		GAMEDATA/SACTEFAM.KLD,	SACTEFAM.KLD
-SaveA,				,	r5d_sa.asd
-SaveB,				,	r5d_sb.asd
-SaveC,				,	r5d_sc.asd
-SaveD,				,	r5d_sd.asd
-SaveE,				,	r5d_se.asd
-SaveF,				,	r5d_sf.asd
-SaveG,				,	r5d_sg.asd
-SaveH,				,	r5d_sh.asd
-SaveI,				,	r5d_si.asd
-SaveJ,				,	r5d_sj.asd
-SaveK,				,	r5d_sk.asd
-SaveL,				,	r5d_sl.asd
-SaveM,				,	r5d_sm.asd
-SaveN,				,	r5d_sn.asd
-SaveO,				,	r5d_so.asd
-SaveP,				,	r5d_sp.asd
-SaveQ,				,	r5d_sq.asd
-SaveR,				,	r5d_sr.asd
-SaveS,				,	r5d_ss.asd
-SaveT,				,	r5d_st.asd
-SaveU,				,	r5d_su.asd
-SaveV,				,	r5d_sv.asd
-SaveW,				,	r5d_sw.asd
-SaveX,				,	r5d_sx.asd
-SaveY,				,	r5d_sy.asd
-SaveZ,				,	r5d_sz.asd

contrib/seeinao.inf

@@ -1,31 +0,0 @@
-# SeeInAO Install infomation
-# Tag,		#origin,		#destination
-ScenarioA,	gamedata/*SA.ald,	seeinao_sa.ald
-GraphicsA,	gamedata/*GA.ald,	seeinao_ga.ald
-WaveA,		gamedata/*WA.ald,	seeinao_wa.ald
-MidiA,		gamedata/*MA.ald,	seeinao_ma.ald
-SaveA,				,	seeinao_sa.asd
-SaveB,				,	seeinao_sb.asd
-SaveC,				,	seeinao_sc.asd
-SaveD,				,	seeinao_sd.asd
-SaveE,				,	seeinao_se.asd
-SaveF,				,	seeinao_sf.asd
-SaveG,				,	seeinao_sg.asd
-SaveH,				,	seeinao_sh.asd
-SaveI,				,	seeinao_si.asd
-SaveJ,				,	seeinao_sj.asd
-SaveK,				,	seeinao_sk.asd
-SaveL,				,	seeinao_sl.asd
-SaveM,				,	seeinao_sm.asd
-SaveN,				,	seeinao_sn.asd
-SaveO,				,	seeinao_so.asd
-SaveP,				,	seeinao_sp.asd
-SaveQ,				,	seeinao_sq.asd
-SaveR,				,	seeinao_sr.asd
-SaveS,				,	seeinao_ss.asd
-SaveT,				,	seeinao_st.asd
-SaveU,				,	seeinao_su.asd
-SaveV,				,	seeinao_sv.asd
-SaveW,				,	seeinao_sw.asd
-SaveX,				,	seeinao_sx.asd
-SaveY,				,	seeinao_sy.asd

contrib/toushin.inf

@@ -1,16 +0,0 @@
-# Toushin Toshi Install infomation
-# Tag,		#origin,		#destination
-ScenarioA,	???_?s?s/*_sa.ald,	toushin_sa.ald
-GraphicsA,	???_?s?s/*_ga.ald,	toushin_ga.ald
-MidiA,		???_?s?s/*_ma.ald,	toushin_ma.ald
-WaveA,		???_?s?s/*_wa.ald,	toushin_wa.ald
-DataA,		???_?s?s/*_da.ald,	toushin_da.ald
-SaveA,				,	toushin_sa.asd
-SaveB,				,	toushin_sb.asd
-SaveC,				,	toushin_sc.asd
-SaveD,				,	toushin_sd.asd
-SaveE,				,	toushin_se.asd
-SaveF,				,	toushin_sf.asd
-SaveG,				,	toushin_sg.asd
-SaveH,				,	toushin_sh.asd
-

contrib/toushin2.inf

@@ -1,16 +0,0 @@
-# Toushintoshi2 Install infomation
-# Tag,		#origin,		#destination
-ScenarioA,	gamedata/*sa.ald,	toushin2_sa.ald
-GraphicsA,	gamedata/*ga.ald,	toushin2_ga.ald
-WaveA,		gamedata/*wa.ald,	toushin2_wa.ald
-DataA,		gamedata/*da.ald,	toushin2_da.ald
-SaveA,				,	toushin2_sa.asd
-SaveB,				,	toushin2_sb.asd
-SaveC,				,	toushin2_sc.asd
-SaveD,				,	toushin2_sd.asd
-SaveE,				,	toushin2_se.asd
-SaveF,				,	toushin2_sf.asd
-SaveG,				,	toushin2_sg.asd
-SaveH,				,	toushin2_sh.asd
-SaveI,				,	toushin2_si.asd
-SaveJ,				,	toushin2_sj.asd

contrib/tsuma.inf

@@ -1,32 +0,0 @@
-# 妻みぐい Install infomation
-# Tag,		#origin,		#destination
-ScenarioA,	gamedata/*SA.ald,	tsuma_sa.ald
-GraphicsA,	gamedata/*GA.ald,	tsuma_ga.ald
-WaveA,		gamedata/*WA.ald,	tsuma_wa.ald
-Ain,		gamedata/*.ain,		system39.ain
-SaveA,				,	tsuma_sa.asd
-SaveB,				,	tsuma_sb.asd
-SaveC,				,	tsuma_sc.asd
-SaveD,				,	tsuma_sd.asd
-SaveE,				,	tsuma_se.asd
-SaveF,				,	tsuma_sf.asd
-SaveG,				,	tsuma_sg.asd
-SaveH,				,	tsuma_sh.asd
-SaveI,				,	tsuma_si.asd
-SaveJ,				,	tsuma_sj.asd
-SaveK,				,	tsuma_sk.asd
-SaveL,				,	tsuma_sl.asd
-SaveM,				,	tsuma_sm.asd
-SaveN,				,	tsuma_sn.asd
-SaveO,				,	tsuma_so.asd
-SaveP,				,	tsuma_sp.asd
-SaveQ,				,	tsuma_sq.asd
-SaveR,				,	tsuma_sr.asd
-SaveS,				,	tsuma_ss.asd
-SaveT,				,	tsuma_st.asd
-SaveU,				,	tsuma_su.asd
-SaveV,				,	tsuma_sv.asd
-SaveW,				,	tsuma_sw.asd
-SaveX,				,	tsuma_sx.asd
-SaveY,				,	tsuma_sy.asd
-SaveZ,				,	tsuma_sz.asd

contrib/tsuma2.inf

@@ -1,38 +0,0 @@
-# 妻みぐい２ Install infomation
-# Tag,		#origin,		#destination
-ScenarioA,	GAMEDATA/*SA.ALD,	tsuma2_sa.ald
-GraphicsA,	GAMEDATA/*GA.ALD,	tsuma2_ga.ald
-WaveA,		GAMEDATA/*WA.ALD,	tsuma2_wa.ald
-WaveB,		GAMEDATA/*WB.ALD,	tsuma2_wb.ald
-BGMA,		GAMEDATA/*BA.ALD,	tsuma2_ba.ald
-WAIA,		GAMEDATA/*WA.WAI,	tsuma2_wa.wai
-BGIA,		GAMEDATA/*BA.BGI,	tsuma2_ba.bgi
-Ain,		GAMEDATA/*.ain,		system39.ain
-Init,		GAMEDATA/*.ini,		system39.ini
-SACT01,         GAMEDATA/SACTEFAM.KLD,  SACTEFAM.KLD
-SaveA,				,	tsuma2_sa.asd
-SaveB,				,	tsuma2_sb.asd
-SaveC,				,	tsuma2_sc.asd
-SaveD,				,	tsuma2_sd.asd
-SaveE,				,	tsuma2_se.asd
-SaveF,				,	tsuma2_sf.asd
-SaveG,				,	tsuma2_sg.asd
-SaveH,				,	tsuma2_sh.asd
-SaveI,				,	tsuma2_si.asd
-SaveJ,				,	tsuma2_sj.asd
-SaveK,				,	tsuma2_sk.asd
-SaveL,				,	tsuma2_sl.asd
-SaveM,				,	tsuma2_sm.asd
-SaveN,				,	tsuma2_sn.asd
-SaveO,				,	tsuma2_so.asd
-SaveP,				,	tsuma2_sp.asd
-SaveQ,				,	tsuma2_sq.asd
-SaveR,				,	tsuma2_sr.asd
-SaveS,				,	tsuma2_ss.asd
-SaveT,				,	tsuma2_st.asd
-SaveU,				,	tsuma2_su.asd
-SaveV,				,	tsuma2_sv.asd
-SaveW,				,	tsuma2_sw.asd
-SaveX,				,	tsuma2_sx.asd
-SaveY,				,	tsuma2_sy.asd
-SaveZ,				,	tsuma2_sz.asd

contrib/zero_new.inf

@@ -1,32 +0,0 @@
-# Zero-shiki (low price version) Install infomation
-# Tag,		#origin,		#destination
-ScenarioA,	gamedata/*sa.ald,	zero_sa.ald
-GraphicsA,	gamedata/*ga.ald,	zero_ga.ald
-WaveA,		gamedata/*wa.ald,	zero_wa.ald
-SaveA,				,	zero_sa.asd
-SaveB,				,	zero_sb.asd
-SaveC,				,	zero_sc.asd
-SaveD,				,	zero_sd.asd
-SaveE,				,	zero_se.asd
-SaveF,				,	zero_sf.asd
-SaveG,				,	zero_sg.asd
-SaveH,				,	zero_sh.asd
-SaveI,				,	zero_si.asd
-SaveJ,				,	zero_sj.asd
-SaveK,				,	zero_sk.asd
-SaveL,				,	zero_sl.asd
-SaveM,				,	zero_sm.asd
-SaveN,				,	zero_sn.asd
-SaveO,				,	zero_so.asd
-SaveP,				,	zero_sp.asd
-SaveQ,				,	zero_sq.asd
-SaveR,				,	zero_sr.asd
-SaveS,				,	zero_ss.asd
-SaveT,				,	zero_st.asd
-SaveU,				,	zero_su.asd
-SaveV,				,	zero_sv.asd
-SaveW,				,	zero_sw.asd
-SaveX,				,	zero_sx.asd
-SaveY,				,	zero_sy.asd
-,          gamedata/map_data.dat,      MAP_DATA.DAT
-,           gamedata/ur_data.dat,       UR_DATA.DAT

doc/BUGS

@@ -1,23 +0,0 @@
-BUG INFORMATION for 
-    System 3.5 for X Window System     Version 1.7
-
-
- * いけないかつみ先生の外字はサポートしていません。
-
-
- * Ctrl+Cで強制終了したり、異常終了した場合 IPC Keyがまれに残る事があります。
-  % ipcs
- でidを確認し、
-  % ipcrm shm ???
- で消して下さい。(Linuxの場合。その他は man ipcrm してください)
-
-
- * SDL を有効にしてコンパイルしフルスクリーンで実行した場合、真中クリックに
- よるメニューが表示されません。その場合、F4 キーで一旦フルスクリーンを解除
- してください。
-
-
- * フルスクリーン実行中にマウスの真中ボタンクリックによるポップアップ
- メニューを出すと、マウスカーソルが画面の表示領域を超えて動いてしまいます。
- 
-[EOF]

doc/FAQ

@@ -1,13 +0,0 @@
-
-Q. FreeBSD でコンパイルできない。make とするとエラーが出る。
-A. gmake (GNU make) を使ってください。
-
-
-Q. cant load font JISX0201.1976-0 と出て終了してしまう。
-A. ~/.xsys35rc に自分のシステムにインストールされているフォントを指定して
-   いますか？
-
-  % xlsfonts | grep 0-0-0-0 | grep jisx0201.1976
-
- とやって表示されるフォント名を ~/.xsys35rc の font_gothic と font_mincho
- に書きます。今の所この２つしか使用していません。

doc/GAMES.TXT

@@ -1,190 +0,0 @@
-                それぞれのゲームに付いての注意書き
-
- [鬼畜王ランス]
-
- [ランス４(for Win95)]
-
- [闘神都市２(for Win95)]
-
- [いけないかつみ先生]
-   = 外字データには対応していません
-
- [かえるにょぱにょ〜ん]
-   = フロアデータ(floor_1.map 〜 floor_16.map) はセーブデータと同じディレク
-     トリに置いてください。
-   = 一部のキャラの絵と説明が違う(金魚と????)
-
- [戦巫女]
-   = 戦巫女は２枚組のCDで、Windows版では一部のデータをCD-ROMに置いたままゲーム
-     することになっていますが、xsystem35 では CD-Audio と CD-ROM上のデータを
-     同時に使用することは出来ません。ハードディスク等に全てのデータをインス
-     トールするか、あるいは CD-Audio 以外の演奏方法(MP3等)を使用してください。
-     CD-Audio を使う場合は２枚目の CD に音楽データが入っています。
-
- [零式(アリスの館４５６版)]
-   = マップデータ(MAP_DATA.DAT, UR_DATA.DATA)はセーブデータと同じディレクトリに
-     置いてください。
-
- [ATLACH=NACHA(アリスの館４５６版)]
-
- [人間狩り(アリスの館４５６版)]
-
- [アリスの館４５６]
-   - DALK
-
-   - 闘神都市
-
-   - DrStop!
-
-   - ランス１
-
-   - ランス２
-
-   - ランス３
-
- [王道勇者]
-
- [ディアボリカ]
-
- [AmbivalenZ(for Win95)]
-
- [夢幻泡影 (for Win95)]
-
- [ぱすてるチャイム]
-   = ぱすてるチャイムでは明らかにシナリオにおかしいところがあります。
-     そこで、これに対するパッチを作成しました。
-
-     patch というディレクトリの下に pastel.diff というパッチ当てのスクリプト
-     がありますので、ゲームのシナリオデータのあるディレクトリにコピーして
-     そのディレクトリに移動した後、 ./pastel.diff (シナリオファイル名) と
-     実行してください。
-     (例)
-      > ./pastel.diff pastel_sa.ald
-
-     古いデータは pastel_sa.ald.org として保存されます。
-     シナリオデータは Ver 1.00 と Ver 1.01 に適用できます。
-
-     (廉価版では直っている？)
-
- [ぷろすちゅーでんとGood]
-
- [守り神様]
-
- [ママトト]
-
- [HushByBaby]
-
- [Darcrows]
-
- [PERSIOM]
-   = DirectSound(3D Sound) には対応していません。
-
- [隠れ月]
-
- [SeeIn青]
-
- [廉価版・デアボリカ]
-
- [廉価版・アトラクナクア]
-
- [廉価版・かえるにょ・ぱにょん]
-
- [廉価版・零式]
-
- [かえるにょ国にょありす(２０世紀アリス)]
-   = 外部MIDIプレイヤーモードでは音楽がリピートされません。
-
- [これＤＰＳ？(２０世紀アリス)]
-
- [夜が来る！]
-   = 動きません
-
- [王子さま Lv1]
-   = 動きません
-
- [Only You 〜リ・クルス〜]
-
- [大悪司]
-   = オープニングが動かない
-
- [王子さま Lv1.5]
-
- [妻みぐい]
-   = オープニングが動かない
-
- [エスカレイヤー]
-   = オープニングが動かない
-
- [Rance5D]
-
- [妻みぐい２]
-   = オープニングが動かない
-
- [DALK外伝]
- [ままにょにょ]
-   = System4につき動きません
-
-
-/*
- * その他
- */
-
- * センチメンタルシーズン (Aliceの館 CDをベースに UNITBASE が移植したもの)
-   = http://www4.big.or.jp/~unitbase/sys35sdk/games.html
-   
- * Intruder (Aliceの館 CDをベースに UNITBASE が移植したもの)
-   = まだ完了していません
-
- * Crecent Moon がぁる (Aliceの館 CDをベースに UNITBASE が移植したもの)
-   = http://www4.big.or.jp/~unitbase/sys35sdk/games.html
-
- * あぶない天狗伝説 (Aliceの館 CD2をベースに UNITBASE が移植したもの)
-   = 掲載許可が下りません
-
- * OnlyYou (system3版をベースに TOTOさんが移植したもの)
-   = http://www1.interq.or.jp/t-takeda/index.html
-
- * ランス4.1 (system3版をベースに TOTOさんが移植したもの)
-   = http://www1.interq.or.jp/t-takeda/index.html
-   = スプライトの色がおかしい   
-
- * ランス4.2 (system3版をベースに TOTOさんが移植したもの
-   = http://www1.interq.or.jp/t-takeda/index.html
-   = スプライトの色がおかしい   
-
- * アリスの館３ (system3版をベースに TOTOさんが移植したもの)
-   = http://www1.interq.or.jp/t-takeda/index.html
-
- * 乙女戦記 (system3版をベースに TOTOさんが移植したもの)
-   = http://www1.interq.or.jp/t-takeda/index.html
-
- * 闘神都市２外伝 (system3版をベースに TOTOさんが移植したもの)
-   = http://www1.interq.or.jp/t-takeda/index.html
-
- * DPS全部 (system3版をベースに TOTOさんが移植したもの)
-   = http://www1.interq.or.jp/t-takeda/index.html
-
- * ProStudentG (system3版をベースに TOTOさんが移植したもの)
-   = http://www1.interq.or.jp/t-takeda/index.html
-
- * 学園ＫＩＮＧ (AliceCD Ver 1.??)
-   = CDが鳴らない
-     -> TOTOさんが、CD-DAに対応するためのシナリオパッチをつくっています。
-        http://www1.interq.or.jp/t-takeda/midi.html
-
-
- * メイドのススメ (AliceCD Ver 1.02)
-
- * ぶろぶろ (AliceCD Ver 1.02)
-
- * 学園漂流戦記 (AliceCD Ver 1.02)
-
- * 扉 (AliceCD Ver 2.02)
-
- * 妖精 (AliceCD Ver 2.02)
-
-/* 
- * 3rd party 製作 ゲーム
-*/
-
-#include "MISCGAME.TXT"

doc/MISCGAME.TXT

@@ -1,58 +0,0 @@
-
-                   その他の SYSTEM 3.5 のゲームについて
-
-   README にある動作確認ゲーム以外にも、ネット上で公開されているSYSTEM3.5対応
- のゲームのうち幾つかは動く事が確認されています。ここでは 1.4.0 preX での動作
- 状況です。1.4.0 公開時点で手に入るゲームを順次追加していっています。
- また、XXXが動かないんだけど調べてください、XXXはちゃんと動きました、といった
- 情報もおよせください。
-
-   OKは問題なく動く。GOODが多少の問題あるもののゲームをやるぶんで気にはなるけど
- 耐えられる範囲のもの。BADは動かないものです。
- 
-
-(作者の敬称略)
-【  ソフト名  】  【 ファイル名 】【   作者名   】【 動作  】
-国立ファーブル図
-書館司書〜
-ブックルちゃん〜   SSYO_100.LZH    大塚ヒロ          OK
-バルーンぽっぷ     BPOP_093.LZH    大塚ヒロ          OK 
-
-Self               self.lzh        よこやまなおき    OK
-おせろっと         othellotto.exe  よこやまなおき    OK
-キャロル           carol.lzh       よこやまなおき    GOOD(1)
-
-積層四目並べ       Te1.lzh         深叢　忍          OK
-16Piece Puzzle     16p1.lzh        深叢　忍          OK
-The Line           Line0.lzh       深叢　忍          OK
-
-Black Jack         bj120.lzh       かずき            OK
-
-マスカレイド       (in AliceCD202) ちあぼう          OK
-戦娘ver2.12        ikusa212.lzh    ちあぼう          OK
-
-できるかなー！     (in AliceCD202) KIMM SOFT         OK(2)
-
-恋は計算どおり♪   koi.lzh         SS                OK
-
-動体視力を鍛えるにょ game_191.lzh  LazyRichField    BAD(3)
-集中力を鍛えるにょ game_22.lh      LazyRichField    GOOD(4)
-
-
-1) 雪が降らない (grDrawFillCircle が未実装)
-   通信対戦が出来ない
-2) メッセージサイズ300ドットの表示は 100 ドットに制限しています
-3) DS 数字 となっている
-4) 色がおかしい
-
-最後にこれらのデータを公開している作者の方々のURLです。
-
-大塚ヒロさん       http://www.studioHIRO.com/
-よこやまなおきさん http://www3.justnet.ne.jp/~naoki-yokoyama/
-深叢 忍さん        http://www2s.biglobe.ne.jp/~nin/
-かずきさん         http://www.din.or.jp/~kazuki/
-桐ヶ屋 inc.（ちあぼう）さん   http://www.eucaly.net/~kiri
-KIMM SOFT／ネリワサヴィちーむ heavyd@syd.odn.ne.jp
-SSさん             http://www.sspzgr.net/
-LazyRichFieldさん  http://www2j.biglobe.ne.jp/~Lazy/staff/alice.htm
-

doc/README.color

@@ -1,56 +0,0 @@
-
-                      色がおかしいぞ？？？ 
-
-
- 起動してみて色がおかしいと思った方はこのドキュメントを読み進めて下さい。
-
-
-1. i386系
-
-   色がおかしいと言うことはまず無いと思いますが、ビデオカードの中には packed24
- と呼ばれる 1pixel につき 3byte を使って 1600万色モードを実現しているものが
- あります。例えば Matrox Mystique などがあります(通常は 1pixel につき 4byte
- を使って 1600万色モードを実現しています)。
- 
-   xdpyinfo とやって supported pixmap formats のリストに
-    depth 24, bits_per_pixel 24, scanline_pad 32
- とあれば packed24 です。
-
- この packed24 にも対応していますが、速度の面から 16bpp または32bpp で X server
- を起動することを推奨します。
-
-
-2. PPC系
-
-   linuxPPCでは X server として Xpmac と XF68_FBDev のどちらかが使われて
- います。LinuxPPC R4 あたりの X Server では次のような不具合があるそうなの
- でうまく回避して下さい。
-
- * Xpmac でアクセラレーションを有効にしたものを使うとXが固まるので、
-   xsystem35 を -no-shm オプション付で実行して下さい。設定ファイル(.xsys35rc)
-   に -no-shmに関する設定を書いておくこともできます。
-
-
-3. SGI系, Sparc系
-
-   これらの X Server は ピクセルのRGBのならびがi386系などとは逆になっています。
- 行儀の良いアプリケーションは X Server から情報を取り出して適切に処理する事で
- どのようなRGBの並びにも対応できるはずなのですが、xsystem35は手抜きをしていて
- ハードコーディングしています。これは速度(？)と利用数の問題と言う事で.. (^^;;;
-
- xdpyinfo として Visual のところで
-
-   class:    TrueColor
-   depth:    24 planes
-   red, green, blue masks:    0xff, 0xff00, 0xff0000
-
- のようになっていたら、BGR の並びと言うことになります。SGI 系と Sparc 系では
- これがデフォルトの動作ですが、sgi O2 や sparc の一部の機種では
-
-   class:    TrueColor
-   depth:    24 planes
-   red, green, blue masks:    0xff0000, 0xff00, 0xff
-
- となっている場合があります。この場合、configure に --disable-bgr をつけて
- コンパイルしてください。
-

fonts/CMakeLists.txt

@@ -10,12 +10,9 @@ find_program(PYFTSUBSET_FOUND pyftsubset)
 
 if (PYFTSUBSET_FOUND)
   add_custom_target(fonts
-    pyftsubset SourceHanSerifJP-Regular.otf --text-file=uchars.txt --output-file=${CMAKE_CURRENT_SOURCE_DIR}/mincho.otf
-    DEPENDS uchars.txt SourceHanSerifJP-Regular.otf)
-
-  add_custom_command(OUTPUT uchars.txt
-    COMMAND uchars > uchars.txt)
-
-  add_custom_command(OUTPUT SourceHanSerifJP-Regular.otf
-    COMMAND wget -O SourceHanSerifJP-Regular.otf https://github.com/adobe-fonts/source-han-serif/blob/release/SubsetOTF/JP/SourceHanSerifJP-Regular.otf?raw=true)
+    COMMAND uchars > uchars.txt
+    COMMAND wget -O SourceHanSerifJP-Regular.otf https://github.com/adobe-fonts/source-han-serif/blob/release/SubsetOTF/JP/SourceHanSerifJP-Regular.otf?raw=true
+    COMMAND pyftsubset SourceHanSerifJP-Regular.otf --text-file=uchars.txt --output-file=subset.otf
+    COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/adjust_metrics.py subset.otf ${CMAKE_CURRENT_SOURCE_DIR}/mincho.otf
+    )
 endif()

fonts/adjust_metrics.py

@@ -0,0 +1,22 @@
+#!/usr/bin/env python3
+import sys
+from fontTools.ttLib import TTFont
+
+if len(sys.argv) != 3:
+    print('Usage: adjust_metrics.py infile outfile')
+    exit(1)
+
+font = TTFont(sys.argv[1])
+
+hhea = font['hhea']
+os2 = font['OS/2']
+
+if hhea.ascent != os2.sTypoAscender:
+    print(f'Changing hhea.ascent from {hhea.ascent} to {os2.sTypoAscender}')
+    hhea.ascent = os2.sTypoAscender
+
+if hhea.descent != os2.sTypoDescender:
+    print(f'Changing hhea.descent from {hhea.descent} to {os2.sTypoDescender}')
+    hhea.descent = os2.sTypoDescender
+
+font.save(sys.argv[2])

game_compatibility.md

@@ -0,0 +1,83 @@
+Game Compatibility
+==================
+
+|                 Game                        |   Status    | Notes |
+| ------------------------------------------- | ----------- | ----- |
+| 鬼畜王ランス                                | Supported   |       |
+| Kichikuou Rance (EN)                        | Supported   |       |
+| RanceIV －教団の遺産－                      | Supported   | Win95 edition and [Ver2.05](https://hannylaboratory.blogspot.com/2023/01/blog-post_26.html) |
+| Rance4 -Legacy of the Sect- (EN)            | Supported   |       |
+| 兰斯IV －教团的遗产－ (CN)                  | Supported   |       |
+| ランス4.1                                   | Supported   | [Ver1.05](https://hannylaboratory.blogspot.com/2023/02/blog-post_9.html). Use system3-sdl2 for older versions |
+| ランス4.2                                   | Supported   | [Ver1.05](https://hannylaboratory.blogspot.com/2023/02/blog-post_9.html). Use system3-sdl2 for older versions |
+| いけないかつみ先生                          | Supported   | Emojis are not supported |
+| 闘神都市II                                  | Supported   | Win95 edition |
+| かえるにょ・ぱにょ～ん                      | Supported   | Normal / Low-priced edition |
+| 戦巫女                                      | Supported   | Normal / Low-priced edition |
+| 零式                                        | Supported   | From ALICEの館４・５・６ / Low-priced edition |
+| アトラク＝ナクア                            | Supported   | From ALICEの館４・５・６ / Low-priced edition |
+| Rance －光を求めて－                        | Supported   | From ALICEの館４・５・６ |
+| Rance II －反逆の少女達－                   | Supported   | From ALICEの館４・５・６ |
+| Rance III －リーザス陥落－                  | Supported   | From ALICEの館４・５・６ |
+| DALK                                        | Supported   | From ALICEの館４・５・６ |
+| 闘神都市                                    | Supported   | From ALICEの館４・５・６ |
+| Dr.STOP                                     | Supported   | From ALICEの館４・５・６ |
+| 人間狩り                                    | Supported   | From ALICEの館４・５・６ / アリスCD |
+| 女の子図鑑                                  | Unknown     | From ALICEの館４・５・６ |
+| 恋のおわり                                  | Unknown     |       |
+| 王道勇者                                    | Supported   |       |
+| AmbivalenZ                                  | Supported   | Win95 edition |
+| DiaboLiQuE                                  | Supported   | Normal / Low-priced edition |
+| 夢幻泡影                                    | Unknown     | Win98 edition |
+| ぱすてるチャイム                            | Supported   | See [patch/README.TXT](patch/README.TXT) |
+| ぷろすちゅーでんとGood                      | Supported   |       |
+| 守り神様                                    | Supported   |       |
+| ママトト                                    | Supported   |       |
+| HUSHABY BABY                                | Supported   |       |
+| DARCROWS                                    | Supported   |       |
+| 隠れ月                                      | Supported   |       |
+| PERSIOM                                     | Supported   | 3D sound is not supported |
+| SeeIn青                                     | Supported   |       |
+| かえるにょ国にょアリス                      | Supported   | From 20世紀アリス |
+| これD・P・S？                               | Supported   | From 20世紀アリス |
+| 夜が来る！                                  | Unsupported |       |
+| Only you ～リ・クルス～                     | Supported   |       |
+| 大悪司                                      | Supported   | Opening demo is not supported |
+| 王子さまＬｖ１                              | Supported   |       |
+| 王子さま１ヵ月後                            | Supported   | From 王子さまLV1.5 |
+| 白鳳の子分叩き                              | Supported   | From 王子さまLV1.5 |
+| チェシャのお部屋1.5                         | Supported   | From 王子さまLV1.5 |
+| 王子さま１／１６                            | Supported   | From 王子さまLV1.5 |
+| スパイ伊藤の「クイズ！俺にさぼらせろ」      | Supported   | From 王子さまLV1.5 |
+| 妻みぐい                                    | Supported   | Opening demo is not supported |
+| 超昂天使エスカレイヤー                      | Supported   | Opening demo is not supported |
+| ランス５Ｄ                                  | Supported   |       |
+| Rance 5D - The Lonely Girl (MangaGamer)     | Supported   |       |
+| 俺の下であがけ                              | Unknown     |       |
+| 楽園行                                      | Unknown     |       |
+| 妻みぐい２                                  | Supported   | Opening demo is not supported |
+| シェル・クレイル                            | Supported   |       |
+| ナイトデーモン                              | Supported   |       |
+| 学園KING                                    | Supported   | From アリスCD |
+| 学園KING 番外編                             | Supported   | From アリスCD |
+| 蒼海に墜ちて                                | Supported   | From アリスCD |
+| ぶろぶろ                                    | Supported   | From アリスCD |
+| 裸ぶろぶろ狂                                | Supported   | From アリスCD |
+| メイドのススメ                              | Supported   | From アリスCD |
+| 学園漂流戦記                                | Supported   | From アリスCD |
+| 学園漂流戦記２                              | Supported   | From アリスCD |
+| 当たって!!KUDAKERO 予告編                   | Supported   | From アリスCD |
+| 妖精                                        | Supported   | From アリスCD |
+| ［扉］                                      | Supported   | From アリスCD |
+| 叩き殺し太郎                                | Supported   | From アリスCD |
+| バルーンぽっぷ                              | Supported   | From アリスCD |
+| 高速ひよこ２                                | Supported   | From アリスCD |
+| おせろっと                                  | Supported   | From アリスCD |
+| マスカレイド                                | Supported   | From アリスCD |
+| キャロル ～聖なる鐘が響く夜～               | Supported   | From アリスCD, Online match is not supported |
+| できるかなー？                              | Supported   | From アリスCD |
+| Child Assassin                              | Unsupported | From アリスCD |
+| Klavier                                     | Supported   | From アリスCD |
+| 弱肉狂食                                    | Supported   | From アリスCD |
+| 眼鏡大戦２                                  | Supported   | From アリスCD |
+| 妄想くん                                    | Supported   | From アリスCD |

modules/AliceLogo/AliceLogo.c

@@ -16,21 +16,21 @@ static void Init() {
 	
 	*var = 1;
 	
-	DEBUG_COMMAND_YET("AliceLogo.Init %d,%d,%d,%p:\n", p1, p2, p3, var);
+	DEBUG_COMMAND_YET("AliceLogo.Init %d,%d,%d,%p:", p1, p2, p3, var);
 }
 
 static void SetWaveNum() {
 	int p1 = getCaliValue();
 	int p2 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("AliceLogo.SetWaveNum %d,%d:\n", p1, p2);
+	DEBUG_COMMAND_YET("AliceLogo.SetWaveNum %d,%d:", p1, p2);
 }
 
 static void Run() {
 	int p1 = getCaliValue();
 	int p2 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("AliceLogo.Run %d,%d:\n", p1, p2);
+	DEBUG_COMMAND_YET("AliceLogo.Run %d,%d:", p1, p2);
 }
 
 static const ModuleFunc functions[] = {

modules/CMakeLists.txt

@@ -26,7 +26,6 @@ add_library(modules STATIC
   SACT/SACT.c
   SACT/sactcg.c
   SACT/sactsound.c
-  SACT/sactbgm.c
   SACT/sacttimer.c
   SACT/sactstring.c
   SACT/sactcrypto.c
@@ -73,14 +72,12 @@ add_library(modules STATIC
   lib/graph_copy.c
   lib/graph_copy_amap.c
   lib/graph_copy_bright.c
-  lib/graph_copy_whiteout.c
   lib/graph_blend_amap.c
   lib/graph_blend_screen.c
   lib/graph_saturadd_amap.c
   lib/graph_draw_amap.c
   lib/graph_stretch.c
   lib/graph_cg.c
-  lib/graph_buller.c
   lib/gre_blend_useamap.c
   lib/gre_blend.c
   lib/gre_blend_screen.c
@@ -101,28 +98,7 @@ endif()
 
 target_compile_options(modules PRIVATE -Wno-pointer-sign)
 
-if (EMSCRIPTEN)
-  set(LIBS
-    "SHELL:-s USE_LIBJPEG=1"
-    "SHELL:-s USE_SDL=2")
-  target_compile_options(modules PRIVATE ${LIBS})
-  target_link_options(modules PRIVATE ${LIBS})
-endif()
-
-if (SDL2MIXER_FOUND)
-  if (ANDROID)
-    target_link_libraries(modules PRIVATE SDL2 SDL2_mixer)
-  else()
-    target_link_libraries(modules PRIVATE PkgConfig::SDL2MIXER)
-  endif()
-endif()
-
-if (HAVE_JPEG)
-  target_sources(modules PRIVATE
-    NightDemonDemo/ndd.c
-    NightDemonDemo/jpeg2surface.c
-    )
-  if (NOT EMSCRIPTEN)
-    target_link_libraries(modules PRIVATE JPEG::JPEG)
-  endif()
+target_link_libraries(modules PRIVATE sdl2 zlib)
+if (TARGET sdl2_mixer)
+  target_link_libraries(modules PRIVATE sdl2_mixer)
 endif()

modules/Confirm/Confirm.c

@@ -10,7 +10,7 @@
 static void Init() {
 	int p1 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("Confirm.Init %d:\n", p1);
+	DEBUG_COMMAND_YET("Confirm.Init %d:", p1);
 }
 
 static void ExistKeyFile() {
@@ -20,7 +20,7 @@ static void ExistKeyFile() {
 	
 	*var = 1;
 	
-	DEBUG_COMMAND_YET("Confirm.ExistKeyFile %s,%p,%p:\n",p1, p2, var);
+	DEBUG_COMMAND_YET("Confirm.ExistKeyFile %s,%p,%p:",p1, p2, var);
 }
 
 static void CheckProtectFile() {
@@ -30,7 +30,7 @@ static void CheckProtectFile() {
 	
 	*var = 1;
 
-	DEBUG_COMMAND_YET("Confirm.CheckProtectFile %s,%p,%p:\n", p1,p2,var);
+	DEBUG_COMMAND_YET("Confirm.CheckProtectFile %s,%p,%p:", p1,p2,var);
 }
 
 static void CreateKeyFile() {
@@ -40,7 +40,7 @@ static void CreateKeyFile() {
 	
 	*var = 1;
 
-	DEBUG_COMMAND_YET("Confirm.CreateKeyFile %s,%p,%p:\n", p1,p2,var);
+	DEBUG_COMMAND_YET("Confirm.CreateKeyFile %s,%p,%p:", p1,p2,var);
 }
 
 static const ModuleFunc functions[] = {

modules/Gpx/Gpx.c

@@ -38,7 +38,6 @@
 #include "ags.h"
 #include "cg.h"
 #include "image.h"
-#include "counter.h"
 #include "input.h"
 // #include "alpha_plane.h"
 #include "surface.h"
@@ -65,7 +64,7 @@ static int find_null_surface() {
 		if (suf[i] == NULL) return i;
 	}
 	
-	SYSERROR("no free surface\n");
+	SYSERROR("no free surface");
 	return 0;
 }
 
@@ -114,7 +113,7 @@ static int load_cg_main(int no) {
 	int sno;
 
 	if (sf == NULL) {
-		WARNING("load fail(cg==NULL,no=%d)\n", no);
+		WARNING("load fail(cg==NULL,no=%d)", no);
 		return 0;
 	}
 	
@@ -137,7 +136,11 @@ static void Init() {
 	// surface0 を pre_freesurfno として返さないように。
 	pre_freesurfno = 1;
 	
-	DEBUG_COMMAND("Gpx.Init %d:\n", p1);
+	DEBUG_COMMAND("Gpx.Init %d:", p1);
+}
+
+static void Gpx_reset(void) {
+	sf_free_all();
 }
 
 static void Create() {
@@ -168,7 +171,7 @@ static void Create() {
 		suf[no] = s;
 	}
 	
-	DEBUG_COMMAND("Gpx.Create %p,%d,%d,%d:\n", var, width, height, bpp);
+	DEBUG_COMMAND("Gpx.Create %p,%d,%d,%d:", var, width, height, bpp);
 }
 
 static void CreatePixelOnly() {
@@ -196,7 +199,7 @@ static void CreatePixelOnly() {
 		suf[no] = s;
 	}
 	
-	DEBUG_COMMAND("Gpx.CreatePixelOnly %d,%d,%d,%d:\n", *var, width, height, bpp);
+	DEBUG_COMMAND("Gpx.CreatePixelOnly %d,%d,%d,%d:", *var, width, height, bpp);
 }
 
 static void CreateAMapOnly() {
@@ -222,7 +225,7 @@ static void CreateAMapOnly() {
 		suf[no] = s;
 	}
 	
-	DEBUG_COMMAND("Gpx.CreateAMapOnly %p,%d,%d:\n", var, width, height);
+	DEBUG_COMMAND("Gpx.CreateAMapOnly %p,%d,%d:", var, width, height);
 }
 
 static void IsSurface() {
@@ -245,7 +248,7 @@ static void IsSurface() {
 		*var = (s->alpha && s->pixel) ? 1 : 0;
 	}
 	
-	DEBUG_COMMAND("Gpx.IsSurface %d,%p:\n", p1, var);
+	DEBUG_COMMAND("Gpx.IsSurface %d,%p:", p1, var);
 }
 
 static void IsPixel() {
@@ -267,7 +270,7 @@ static void IsPixel() {
 		*var = s->pixel ? 1 : 0;
 	}
 	
-	DEBUG_COMMAND("Gpx.IsPixel %d,%p:\n", p1, var);
+	DEBUG_COMMAND("Gpx.IsPixel %d,%p:", p1, var);
 }
 
 static void IsAlpha() {
@@ -289,7 +292,7 @@ static void IsAlpha() {
 		*var = s->alpha ? 1 : 0;
 	}
 	
-	DEBUG_COMMAND("Gpx.IsAlpha %d,%p:\n", p1, var);
+	DEBUG_COMMAND("Gpx.IsAlpha %d,%p:", p1, var);
 }
 
 static void GetWidth() {
@@ -311,7 +314,7 @@ static void GetWidth() {
 		*var = s->width;
 	}
 	
-	DEBUG_COMMAND("Gpx.GetWidth %d,%d:\n", p1, *var);
+	DEBUG_COMMAND("Gpx.GetWidth %d,%d:", p1, *var);
 }
 
 static void GetHeight() {
@@ -333,13 +336,13 @@ static void GetHeight() {
 		*var = s->height;
 	}
 	
-	DEBUG_COMMAND("Gpx.GetHeight %d,%d:\n", p1, *var);
+	DEBUG_COMMAND("Gpx.GetHeight %d,%d:", p1, *var);
 }
 
 static void GetCreatedSurface() { /* not used ? */
 	int *var = getCaliVariable();
 	
-	DEBUG_COMMAND_YET("Gpx.GetCreatedSurface %p:\n", var);
+	DEBUG_COMMAND_YET("Gpx.GetCreatedSurface %p:", var);
 }
 
 static void LoadCG() {
@@ -354,21 +357,21 @@ static void LoadCG() {
 	
 	*var = load_cg_main(p1 -1);
 	
-	DEBUG_COMMAND("Gpx.LoadCG %p,%d (%d):\n", var, p1, *var);
+	DEBUG_COMMAND("Gpx.LoadCG %p,%d (%d):", var, p1, *var);
 }
 
 static void GetCGPosX() { /* not useed ? */
 	int *var = getCaliVariable();
 	int p1 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("Gpx.GetCgPosX %p,%d:\n", var, p1);
+	DEBUG_COMMAND_YET("Gpx.GetCgPosX %p,%d:", var, p1);
 }
 
 static void GetCGPosY() { /* not useed ? */
 	int *var = getCaliVariable();
 	int p1 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("Gpx.GetCgPosY %p,%d:\n", var, p1);
+	DEBUG_COMMAND_YET("Gpx.GetCgPosY %p,%d:", var, p1);
 }
 
 static void Free() {
@@ -379,7 +382,7 @@ static void Free() {
 	*/
 	int p1 = getCaliValue();
 	
-	DEBUG_COMMAND("Gpx.Free %d:\n", p1);
+	DEBUG_COMMAND("Gpx.Free %d:", p1);
 	
 	if (p1 != 0) {
 		sf_free_one(p1);
@@ -392,7 +395,7 @@ static void FreeAll() {
 	*/
 	sf_free_all();
 	
-	DEBUG_COMMAND("Gpx.FreeAll:\n");
+	DEBUG_COMMAND("Gpx.FreeAll:");
 }
 
 static void Copy() {
@@ -418,7 +421,7 @@ static void Copy() {
 	int sh = getCaliValue();
 	surface_t *src, *dst;
 	
-	DEBUG_COMMAND("Gpx.Copy %d,%d,%d,%d,%d,%d,%d,%d:\n", ds, dx, dy, ss, sx, sy, sw, sh);
+	DEBUG_COMMAND("Gpx.Copy %d,%d,%d,%d,%d,%d,%d,%d:", ds, dx, dy, ss, sx, sy, sw, sh);
 	
 	src = sf_get(ss);
 	dst = sf_get(ds);
@@ -436,7 +439,7 @@ static void CopyBright() { /* not used ? */
 	int p8 = getCaliValue();
 	int p9 = getCaliValue();
 
-	DEBUG_COMMAND_YET("Gpx.CopyBright %d,%d,%d,%d,%d,%d,%d,%d,%d:\n", p1, p2, p3, p4, p5, p6, p7, p8, p9);
+	DEBUG_COMMAND_YET("Gpx.CopyBright %d,%d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8, p9);
 }
 
 static void CopyAMap() {
@@ -462,7 +465,7 @@ static void CopyAMap() {
 	int sh = getCaliValue();
 	surface_t *src, *dst;
 	
-	DEBUG_COMMAND("Gpx.CopyAMap %d,%d,%d,%d,%d,%d,%d,%d:\n", da, dx, dy, sa, sx, sy, sw, sh);
+	DEBUG_COMMAND("Gpx.CopyAMap %d,%d,%d,%d,%d,%d,%d,%d:", da, dx, dy, sa, sx, sy, sw, sh);
 	
 	src = sf_get(sa);
 	dst = sf_get(da);
@@ -480,7 +483,7 @@ static void Blend() { /* not used ? */
 	int p8 = getCaliValue();
 	int p9 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("Gpx.Blend %d,%d,%d,%d,%d,%d,%d,%d,%d:\n", p1, p2, p3, p4, p5, p6, p7, p8, p9);
+	DEBUG_COMMAND_YET("Gpx.Blend %d,%d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8, p9);
 }
 
 static void BlendSrcBright() { /* not used ? */
@@ -495,7 +498,7 @@ static void BlendSrcBright() { /* not used ? */
 	int p9 = getCaliValue();
 	int p10 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("Gpx.BlendSrcBright %d,%d,%d,%d,%d,%d,%d,%d,%d,%d:\n", p1, p2, p3, p4, p5, p6, p7, p8, p9, p10);
+	DEBUG_COMMAND_YET("Gpx.BlendSrcBright %d,%d,%d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8, p9, p10);
 }
 
 static void BlendAddSatur() { /* not used ? */
@@ -508,7 +511,7 @@ static void BlendAddSatur() { /* not used ? */
 	int p7 = getCaliValue();
 	int p8 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("Gpx.BlendAddStatur %d,%d,%d,%d,%d,%d,%d,%d:\n", p1, p2, p3, p4, p5, p6, p7, p8);
+	DEBUG_COMMAND_YET("Gpx.BlendAddStatur %d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8);
 }
 
 static void BlendAMap() {
@@ -534,7 +537,7 @@ static void BlendAMap() {
 	int sh = getCaliValue();
 	surface_t *src, *dst;
 	
-	DEBUG_COMMAND("Gpx.BlendAMap %d,%d,%d,%d,%d,%d,%d,%d:\n", ds, dx, dy, ss, sx, sy, sw, sh);
+	DEBUG_COMMAND("Gpx.BlendAMap %d,%d,%d,%d,%d,%d,%d,%d:", ds, dx, dy, ss, sx, sy, sw, sh);
 	
 	src = sf_get(ss);
 	dst = sf_get(ds);
@@ -551,7 +554,7 @@ static void BlendAMapSrcOnly() { /* not used ? */
 	int p7 = getCaliValue();
 	int p8 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("Gpx.BlendAMapSrcOnly %d,%d,%d,%d,%d,%d,%d,%d:\n", p1, p2, p3, p4, p5, p6, p7, p8);
+	DEBUG_COMMAND_YET("Gpx.BlendAMapSrcOnly %d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8);
 }
 
 static void BlendAMapColor() { /* not used ? */
@@ -567,7 +570,7 @@ static void BlendAMapColor() { /* not used ? */
 	int p10 = getCaliValue();
 	int p11 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("Gpx.BlendAMapColor %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d:\n", p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11);
+	DEBUG_COMMAND_YET("Gpx.BlendAMapColor %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11);
 }
 
 static void BlendAMapColorAlpha() { /* not used ? */
@@ -584,7 +587,7 @@ static void BlendAMapColorAlpha() { /* not used ? */
 	int p11 = getCaliValue();
 	int p12 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("Gpx.BlendAMapColorAlpha %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d:\n", p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12);
+	DEBUG_COMMAND_YET("Gpx.BlendAMapColorAlpha %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12);
 }
 
 static void BlendAMapAlpha() { /* not used ? */
@@ -598,7 +601,7 @@ static void BlendAMapAlpha() { /* not used ? */
 	int p8 = getCaliValue();
 	int p9 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("Gpx.BlendAMapAlpha %d,%d,%d,%d,%d,%d,%d,%d,%d:\n", p1, p2, p3, p4, p5, p6, p7, p8, p9);
+	DEBUG_COMMAND_YET("Gpx.BlendAMapAlpha %d,%d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8, p9);
 }
 
 static void BlendAMapBright() { /* not used ? */
@@ -612,7 +615,7 @@ static void BlendAMapBright() { /* not used ? */
 	int p8 = getCaliValue();
 	int p9 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("Gpx.BlendAMapBright %d,%d,%d,%d,%d,%d,%d,%d,%d:\n", p1, p2, p3, p4, p5, p6, p7, p8, p9);
+	DEBUG_COMMAND_YET("Gpx.BlendAMapBright %d,%d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8, p9);
 }
 
 static void BlendAMapAlphaSrcBright() { /* not used ? */
@@ -627,7 +630,7 @@ static void BlendAMapAlphaSrcBright() { /* not used ? */
 	int p9 = getCaliValue();
 	int p10 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("Gpx.BlendAMapBright %d,%d,%d,%d,%d,%d,%d,%d,%d,%d:\n", p1, p2, p3, p4, p5, p6, p7, p8, p9, p10);
+	DEBUG_COMMAND_YET("Gpx.BlendAMapBright %d,%d,%d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8, p9, p10);
 }
 
 static void BlendUseAMapColor() { /* not used ? */
@@ -644,7 +647,7 @@ static void BlendUseAMapColor() { /* not used ? */
 	int p11 = getCaliValue();
 	int p12 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("Gpx.BlendUseAMapColor %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d:\n", p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12);
+	DEBUG_COMMAND_YET("Gpx.BlendUseAMapColor %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12);
 }
 
 static void BlendScreen() { /* not used ? */
@@ -657,7 +660,7 @@ static void BlendScreen() { /* not used ? */
 	int p7 = getCaliValue();
 	int p8 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("Gpx.BlendScreen %d,%d,%d,%d,%d,%d,%d,%d:\n", p1, p2, p3, p4, p5, p6, p7, p8);
+	DEBUG_COMMAND_YET("Gpx.BlendScreen %d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8);
 }
 
 static void BlendMultiply() { /* not used ? */
@@ -670,7 +673,7 @@ static void BlendMultiply() { /* not used ? */
 	int p7 = getCaliValue();
 	int p8 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("Gpx.BlendMultiply %d,%d,%d,%d,%d,%d,%d,%d:\n", p1, p2, p3, p4, p5, p6, p7, p8);
+	DEBUG_COMMAND_YET("Gpx.BlendMultiply %d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8);
 }
 
 static void BlendScreenAlpha() { /* not used ? */
@@ -684,7 +687,7 @@ static void BlendScreenAlpha() { /* not used ? */
 	int p8 = getCaliValue();
 	int p9 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("Gpx.BlendScreenAlpha %d,%d,%d,%d,%d,%d,%d,%d,%d:\n", p1, p2, p3, p4, p5, p6, p7, p8, p9);
+	DEBUG_COMMAND_YET("Gpx.BlendScreenAlpha %d,%d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8, p9);
 }
 
 static void Fill() {
@@ -710,7 +713,7 @@ static void Fill() {
 	int b  = getCaliValue();
 	surface_t *dst;
 	
-	DEBUG_COMMAND("Gpx.Fill %d,%d,%d,%d,%d,%d,%d,%d:\n", ds, dx, dy, dw, dh, r, g, b);
+	DEBUG_COMMAND("Gpx.Fill %d,%d,%d,%d,%d,%d,%d,%d:", ds, dx, dy, dw, dh, r, g, b);
 	
 	dst = sf_get(ds);
 	gr_fill(dst, dx, dy, dw, dh, r, g, b);
@@ -728,7 +731,7 @@ static void FillAlphaColor() { /* not used ? */
 	int lv = getCaliValue();
 	surface_t *dst;
 	
-	DEBUG_COMMAND_YET("Gpx.FillAlphaColor %d,%d,%d,%d,%d,%d,%d,%d,%d:\n", ds, dx, dy, dw, dh, r, g, b, lv);
+	DEBUG_COMMAND_YET("Gpx.FillAlphaColor %d,%d,%d,%d,%d,%d,%d,%d,%d:", ds, dx, dy, dw, dh, r, g, b, lv);
 
 	dst = sf_get(ds);
 	gr_fill_alpha_color(dst, dx, dy, dw, dh, r, g, b, lv);
@@ -742,7 +745,7 @@ static void FillAMap() { /* not used ? */
 	int p5 = getCaliValue();
 	int p6 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("Gpx.FillAMap %d,%d,%d,%d,%d,%d:\n", p1, p2, p3, p4, p5, p6);
+	DEBUG_COMMAND_YET("Gpx.FillAMap %d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6);
 }
 
 static void FillAMapOverBorder() {
@@ -767,7 +770,7 @@ static void FillAMapOverBorder() {
 	int d = getCaliValue();
 	surface_t *dst;
 	
-	DEBUG_COMMAND("Gpx.FillAMapOverBorder %d,%d,%d,%d,%d,%d,%d:\n", ds, dx, dy, dw, dh, s, d);
+	DEBUG_COMMAND("Gpx.FillAMapOverBorder %d,%d,%d,%d,%d,%d,%d:", ds, dx, dy, dw, dh, s, d);
 
 	dst = sf_get(ds);
 	gr_fill_alpha_overborder(dst, dx, dy, dw, dh, s, d);
@@ -782,7 +785,7 @@ static void FillAMapUnderBorder() { /* not used ? */
 	int p6 = getCaliValue();
 	int p7 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("Gpx.FillAMapUnderBorder %d,%d,%d,%d,%d,%d,%d:\n", p1, p2, p3, p4, p5, p6, p7);
+	DEBUG_COMMAND_YET("Gpx.FillAMapUnderBorder %d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7);
 }
 
 static void SaturDP_DPxSA() { /* not used ? */
@@ -795,7 +798,7 @@ static void SaturDP_DPxSA() { /* not used ? */
 	int p7 = getCaliValue();
 	int p8 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("Gpx.SaturDP_DPxSA %d,%d,%d,%d,%d,%d,%d,%d:\n", p1, p2, p3, p4, p5, p6, p7, p8);
+	DEBUG_COMMAND_YET("Gpx.SaturDP_DPxSA %d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8);
 }
 
 static void ScreenDA_DAxSA() { /* not used ? */
@@ -808,7 +811,7 @@ static void ScreenDA_DAxSA() { /* not used ? */
 	int p7 = getCaliValue();
 	int p8 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("Gpx.ScreenDA_DAxSA %d,%d,%d,%d,%d,%d,%d,%d:\n", p1, p2, p3, p4, p5, p6, p7, p8);
+	DEBUG_COMMAND_YET("Gpx.ScreenDA_DAxSA %d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8);
 }
 
 static void AddDA_DAxSA() { /* not used ? */
@@ -821,7 +824,7 @@ static void AddDA_DAxSA() { /* not used ? */
 	int p7 = getCaliValue();
 	int p8 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("Gpx.AddDA_DAxSA %d,%d,%d,%d,%d,%d,%d,%d:\n", p1, p2, p3, p4, p5, p6, p7, p8);
+	DEBUG_COMMAND_YET("Gpx.AddDA_DAxSA %d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8);
 }
 
 static void SpriteCopyAMap() {
@@ -849,7 +852,7 @@ static void SpriteCopyAMap() {
 	int cl = getCaliValue();
 	surface_t *src, *dst;
 	
-	DEBUG_COMMAND("Gpx.SpriteCopyAMap %d,%d,%d,%d,%d,%d,%d,%d,%d:\n", da, dx, dy, sa, sx, sy, sw, sh, cl);
+	DEBUG_COMMAND("Gpx.SpriteCopyAMap %d,%d,%d,%d,%d,%d,%d,%d,%d:", da, dx, dy, sa, sx, sy, sw, sh, cl);
 	
 	src = sf_get(sa);
 	dst = sf_get(da);
@@ -876,7 +879,7 @@ static void BrightDestOnly() {
 	int r  = getCaliValue();
 	surface_t *dst;
 	
-	DEBUG_COMMAND("Gpx.BrightDestOnly %d,%d,%d,%d,%d,%d:\n", ds, dx, dy, dw, dh, r);
+	DEBUG_COMMAND("Gpx.BrightDestOnly %d,%d,%d,%d,%d,%d:", ds, dx, dy, dw, dh, r);
 	
 	dst = sf_get(ds);
 	
@@ -897,7 +900,7 @@ static void CopyTextureWrap() { /* not used ? */
 	int p11 = getCaliValue();
 	int p12 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("Gpx.CopyTextureWrap %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d:\n", p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12);
+	DEBUG_COMMAND_YET("Gpx.CopyTextureWrap %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12);
 }
 
 static void CopyTextureWrapAlpha() { /* not used ? */
@@ -915,7 +918,7 @@ static void CopyTextureWrapAlpha() { /* not used ? */
 	int p12 = getCaliValue();
 	int p13 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("Gpx.CopyTextureWrapAlpha %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d:\n", p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13);
+	DEBUG_COMMAND_YET("Gpx.CopyTextureWrapAlpha %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13);
 }
 
 static void CopyStretch() {
@@ -945,7 +948,7 @@ static void CopyStretch() {
 	int sh = getCaliValue();
 	surface_t *src, *dst;
 
-	DEBUG_COMMAND_YET("Gpx.CopyStretch %d,%d,%d,%d,%d,%d,%d,%d,%d,%d:\n", ds, dx, dy, dw, dh, ss, sx, sy, sw, sh);
+	DEBUG_COMMAND_YET("Gpx.CopyStretch %d,%d,%d,%d,%d,%d,%d,%d,%d,%d:", ds, dx, dy, dw, dh, ss, sx, sy, sw, sh);
 	
 	src = sf_get(ss);
 	dst = sf_get(ds);
@@ -965,7 +968,7 @@ static void CopyStretchBlend() { /* not used ? */
 	int p10 = getCaliValue();
 	int p11 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("Gpx.CopyStretchBlend %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d:\n", p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11);
+	DEBUG_COMMAND_YET("Gpx.CopyStretchBlend %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11);
 }
 
 static void CopyStretchBlendAMap() {
@@ -995,7 +998,7 @@ static void CopyStretchBlendAMap() {
 	int sh = getCaliValue();
 	surface_t *src, *dst;
 	
-	DEBUG_COMMAND("Gpx.CopyStretchBlendAMap %d,%d,%d,%d,%d,%d,%d,%d,%d,%d:\n", ds, dx, dy, dw, dh, ss, sx, sy, sw, sh);
+	DEBUG_COMMAND("Gpx.CopyStretchBlendAMap %d,%d,%d,%d,%d,%d,%d,%d,%d,%d:", ds, dx, dy, dw, dh, ss, sx, sy, sw, sh);
 
 	src = sf_get(ss);
 	dst = sf_get(ds);
@@ -1012,7 +1015,7 @@ static void StretchBlendScreen2x2() { /* not used ? */
 	int p7 = getCaliValue();
 	int p8 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("Gpx.StretchBlendScreen2x2 %d,%d,%d,%d,%d,%d,%d,%d:\n", p1, p2, p3, p4, p5, p6, p7, p8);
+	DEBUG_COMMAND_YET("Gpx.StretchBlendScreen2x2 %d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8);
 }
 
 
@@ -1046,7 +1049,7 @@ static void StretchBlendScreen2x2WDS() {
 	int sh  = getCaliValue();
 	surface_t *src1, *src2, *dst;
 	
-	DEBUG_COMMAND("Gpx.StretchBlendScreen2x2WDS %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d:\n", ds, dx, dy, ss1, sx1, sy1, ss2, sx2, sy2, sw, sh);
+	DEBUG_COMMAND("Gpx.StretchBlendScreen2x2WDS %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d:", ds, dx, dy, ss1, sx1, sy1, ss2, sx2, sy2, sw, sh);
 	
 	src1 = sf_get(ss1);
 	src2 = sf_get(ss2);
@@ -1083,7 +1086,7 @@ static void BlendScreenWDS() {
 	int sh  = getCaliValue();
 	surface_t *src1, *src2, *dst;
 	
-	DEBUG_COMMAND("Gpx.BlendScreenWDS %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d:\n", ds, dx, dy, ss1, sx1, sy1, ss2, sx2, sy2, sw, sh);
+	DEBUG_COMMAND("Gpx.BlendScreenWDS %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d:", ds, dx, dy, ss1, sx1, sy1, ss2, sx2, sy2, sw, sh);
 	
 	src1 = sf_get(ss1);
 	src2 = sf_get(ss2);
@@ -1146,22 +1149,21 @@ static void EffectCopy() {
 	case 11:
 	case 12:
 	case 13:
-		DEBUG_COMMAND("Gpx.EffectCopy %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%p:\n", no, dx, dy, ss1, sx1, sy1, ss2, sx2, sy2, sw, sh, time, var);
+		DEBUG_COMMAND("Gpx.EffectCopy %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%p:", no, dx, dy, ss1, sx1, sy1, ss2, sx2, sy2, sw, sh, time, var);
 		break;
 	default:
-		DEBUG_COMMAND_YET("Gpx.EffectCopy %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%p:\n", no, dx, dy, ss1, sx1, sy1, ss2, sx2, sy2, sw, sh, time, var);
+		DEBUG_COMMAND_YET("Gpx.EffectCopy %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%p:", no, dx, dy, ss1, sx1, sy1, ss2, sx2, sy2, sw, sh, time, var);
 	}
-	dib = sf_get(0);
 	dst = sf_get(ss1);
 	src = sf_get(ss2);
-	gpx_effect(no, dib, dx, dy, dst, sx1, sy1, src, sx2, sy2, sw, sh, time, var);
+	gpx_effect(no, dx, dy, dst, sx1, sy1, src, sx2, sy2, sw, sh, time, var);
 	
 }
 
 static void SetClickCancelFlag() { /* not used ? */
 	int p1 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("Gpx.SetClikCancelFlag %d:\n", p1);
+	DEBUG_COMMAND_YET("Gpx.SetClikCancelFlag %d:", p1);
 }
 
 static const ModuleFunc functions[] = {
@@ -1219,4 +1221,4 @@ static const ModuleFunc functions[] = {
 	{"StretchBlendScreen2x2WDS", StretchBlendScreen2x2WDS},
 };
 
-const Module module_Gpx = {"Gpx", functions, sizeof(functions) / sizeof(ModuleFunc)};
+const Module module_Gpx = {"Gpx", functions, sizeof(functions) / sizeof(ModuleFunc), Gpx_reset};

modules/Gpx/effectcopy.c

@@ -5,403 +5,47 @@
 #include "portab.h"
 #include "system.h"
 #include "surface.h"
-// #include "gleffectcopy.h"
-#include "counter.h"
+#include "sdl_core.h"
 #include "ags.h"
 #include "input.h"
 #include "graph.h"
 #include "ngraph.h"
 
-/* saved parameter */
-struct ecopyparam {
-	surface_t *src;
-	int sx;
-	int sy;
-	surface_t *dst;
-	int dx;
-	int dy;
-	int w;
-	int h;
-	surface_t *write;
-	int wx;
-	int wy;
-	int time;
-	boolean cancel;
-	int spCol;
-	int extp[10];
-	
-	// for ec11
-	surface_t *ss[8];
-	surface_t *sd[8];
-};
-typedef struct ecopyparam ecopyparam_t;
-static ecopyparam_t ecp;
-
-
-
-#define ECA7_D  16
-#define ECA12_D 256
-
-static void ec1_cb(int step);
-static void ec2_cb(int step);
-static void ec3_cb(int step);
-static void ec4_cb(int step);
-static void ec5_cb(int step);
-static void ec7_cb();
-static void ec11_cb(int step);
-static void ec11_prepare(void);
-static void ec12_cb(int step);
-static void ec13_cb(int step);
-
-static int get_ecounter(void) {
-	return get_high_counter(SYSTEMCOUNTER_MSEC);
-}
-
-#if 0
-void gle_set_check_clik() {
-}
-void gle_set_itimer() {
-}
-#endif
-
 void gpx_effect(int no,
-		surface_t *write, int wx, int wy,
+		int wx, int wy,
 		surface_t *dst, int dx, int dy,
 		surface_t *src, int sx, int sy,
 		int width, int height,
 		int time,
 		int *endtype) {
-	
-	ags_faderinfo_t i;
-	
+	surface_t *write = nact->ags.dib;
 	if (!gr_clip(dst, &dx, &dy, &width, &height, write, &wx, &wy)) return;
 	if (!gr_clip(src, &sx, &sy, &width, &height, write, &wx, &wy)) return;
-	
-	ecp.write = write;
-	ecp.wx  = wx;
-	ecp.wy  = wy;
-	ecp.dst = dst;
-	ecp.dx  = dx;
-	ecp.dy  = dy;	
-	ecp.src = src;
-	ecp.sx  = sx;
-	ecp.sy  = sy;
-	ecp.w = width;
-	ecp.h = height;
-	ecp.time = time;
-	
-	switch(no) {
-	case 1:
-		i.step_max = 64;
-		i.effect_time = time == 0 ? 2700 : time;
-		i.cancel = FALSE;
-		i.callback = ec1_cb;
-		ags_fader(&i);
+
+	*endtype = 0;
+
+	enum sdl_effect_type type = from_sact_effect(no);
+	if (type == EFFECT_INVALID) {
+		WARNING("Unimplemented effect %d", no);
+		type = EFFECT_CROSSFADE;
+	}
+	SDL_Rect rect = { wx, wy, width, height };
+	struct sdl_effect *eff = sdl_effect_init(&rect, dst, dx, dy, src, sx, sy, type);
+	if (!time)
+		time = (no == SACT_EFFECT_CROSSFADE_DOWN || no == SACT_EFFECT_CROSSFADE_UP) ? 1150 : 2700;
+	ags_runEffect(time, FALSE, (ags_EffectStepFunc)sdl_effect_step, eff);
+	sdl_effect_finish(eff);
+
+	switch (no) {
+	case SACT_EFFECT_FADEOUT:
+		gr_fill(write, wx, wy, width, height, 0, 0, 0);
 		break;
-	case 2:
-		i.step_max = 64;
-		i.effect_time = time == 0 ? 2700 : time;
-		i.cancel = FALSE;
-		i.callback = ec2_cb;
-		ags_fader(&i);
-		break;
-	case 3:
-		i.step_max = 64;
-		i.effect_time = time == 0 ? 2700 : time;
-		i.cancel = FALSE;
-		i.callback = ec3_cb;
-		ags_fader(&i);
-		break;
-	case 4:
-		i.step_max = 64;
-		i.effect_time = time == 0 ? 2700 : time;
-		i.cancel = FALSE;
-		i.callback = ec4_cb;
-		ags_fader(&i);
-		break;
-	case 5:
-		i.step_max = 64;
-		i.effect_time = time == 0 ? 2700 : time;
-		i.cancel = FALSE;
-		i.callback = ec5_cb;
-		ags_fader(&i);
-		break;
-	case 7:
-		ec7_cb();
-		break;
-	case 11:
-		ec11_prepare();
-		i.step_max = 6;
-		i.effect_time = time == 0 ? 2700 : time;
-		i.cancel = FALSE;
-		i.callback = ec11_cb;
-		ags_fader(&i);
-		break;
-	case 12:
-		i.step_max = ECA12_D + ecp.h;
-		i.effect_time = time == 0 ? 1150 : time;
-		i.cancel = FALSE;
-		i.callback = ec12_cb;
-		ags_fader(&i);
-		break;
-	case 13:
-		i.step_max = ECA12_D + ecp.h;
-		i.effect_time = time == 0 ? 1150 : time;
-		i.cancel = FALSE;
-		i.callback = ec13_cb;
-		ags_fader(&i);
+	case SACT_EFFECT_WHITEOUT:
+		gr_fill(write, wx, wy, width, height, 255, 255, 255);
 		break;
 	default:
 		gr_copy(write, wx, wy, src, sx, sy, width, height);
-		ags_updateArea(wx, wy, width, height);
-	}
-	
-	*endtype = 0;
-
-}
-
-void sf_blend_white_level(surface_t *dst, int dx, int dy, surface_t *src, int sx, int sy, int sw, int sh, int lv) {
-
-	int x, y;
-	BYTE *sp, *dp;
-	
-	sp = GETOFFSET_PIXEL(src, sx, sy);
-	dp = GETOFFSET_PIXEL(dst, dx, dy);
-	
-	switch(dst->depth) {
-	case 16:
-	{
-		WORD *yls, *yld;
-		
-		for (y = 0; y < sh; y++) {
-			yls = (WORD *)(sp + y * src->bytes_per_line);
-			yld = (WORD *)(dp + y * dst->bytes_per_line);
-			
-			for (x = 0; x < sw; x++) {
-				*yld = WHITELEVEL16(*yls, lv);
-				yls++; yld++;
-			}
-		}
 		break;
 	}
-	case 24:
-	case 32:
-	{
-		DWORD *yls, *yld;
-		
-		for (y = 0; y < sh; y++) {
-			yls = (DWORD *)(sp + y * src->bytes_per_line);
-			yld = (DWORD *)(dp + y * dst->bytes_per_line);
-			
-			for (x = 0; x < sw; x++) {
-				*yld = WHITELEVEL24(*yls, lv);
-				yls++; yld++;
-			}
-		}
-		break;
-	}
-	}
-}
-
-
-static void ec1_cb(int step) {
-	if (step == 64) {
-		gr_copy(ecp.write, ecp.wx, ecp.wy, ecp.src, ecp.sx, ecp.sy, ecp.w, ecp.h);
-	} else {
-		gre_Blend(ecp.write, ecp.wx, ecp.wy, ecp.dst, ecp.dx, ecp.dy, ecp.src, ecp.sx, ecp.sy, ecp.w, ecp.h, step * 4);
-	}
-	ags_updateArea(ecp.wx, ecp.wy, ecp.w, ecp.h);
-}
-
-static void ec2_cb(int step) {
-	if (step == 0) {
-		gr_copy_bright(ecp.write, ecp.wx, ecp.wy, ecp.dst, ecp.dx, ecp.dy, ecp.w, ecp.h, 255);
-	} else if (step == 64) {
-		gr_copy_bright(ecp.write, ecp.wx, ecp.wy, ecp.dst, ecp.dx, ecp.dy, ecp.w, ecp.h, 0);
-	} else {
-		gr_copy_bright(ecp.write, ecp.wx, ecp.wy, ecp.dst, ecp.dx, ecp.dy, ecp.w, ecp.h, 255 - step * 4);
-	}
-	ags_updateArea(ecp.wx, ecp.wy, ecp.w, ecp.h);
-}
-
-static void ec3_cb(int step) {
-	if (step != 64) {
-		gr_copy_bright(ecp.write, ecp.wx, ecp.wy, ecp.src, ecp.sx, ecp.sy, ecp.w, ecp.h, step * 4);
-	} else {
-		gr_copy_bright(ecp.write, ecp.wx, ecp.wy, ecp.src, ecp.sx, ecp.sy, ecp.w, ecp.h, 255);
-	}
-	ags_updateArea(ecp.wx, ecp.wy, ecp.w, ecp.h);
-}
-
-static void ec4_cb(int step) {
-	if (step != 64) {
-		sf_blend_white_level(ecp.write, ecp.wx, ecp.wy, ecp.dst, ecp.dx, ecp.dy, ecp.w, ecp.h, step * 4);
-	} else {
-		sf_blend_white_level(ecp.write, ecp.wx, ecp.wy, ecp.dst, ecp.dx, ecp.dy, ecp.w, ecp.h, 255);
-	}
-	ags_updateArea(ecp.wx, ecp.wy, ecp.w, ecp.h);
-}
-
-static void ec5_cb(int step) {
-	if (step == 0) {
-		sf_blend_white_level(ecp.write, ecp.wx, ecp.wy, ecp.src, ecp.sx, ecp.sy, ecp.w, ecp.h, 255);
-	} else if (step == 64) {
-		sf_blend_white_level(ecp.write, ecp.wx, ecp.wy, ecp.src, ecp.sx, ecp.sy, ecp.w, ecp.h, 0);
-	} else {
-		sf_blend_white_level(ecp.write, ecp.wx, ecp.wy, ecp.src, ecp.sx, ecp.sy, ecp.w, ecp.h, 255 - step * 4);
-	}
-	ags_updateArea(ecp.wx, ecp.wy, ecp.w, ecp.h);
-}
-
-#define EC_WAIT                                               \
-	if ((key |= sys_getInputInfo()) && ecp.cancel) break; \
-	key = sys_keywait(cnt - get_ecounter(), ecp.cancel);
-
-static void ec7_cb() {
-	int i, j, y, key = 0, cnt;
-	int waitcnt = ecp.time == 0 ? 40 : (ecp.time/60);
-	
-	cnt = get_ecounter();
-	for (i = 0; i < ECA7_D + ecp.h / ECA7_D -1; i++) {
-		cnt += waitcnt;
-		for (j = 0; j < min(i + 1, ECA7_D); j++) {
-			y = j + ECA7_D * (i-j);
-			if (y < 0 || y >= ecp.h) continue;
-			gr_copy(ecp.write, ecp.wx, ecp.wy + y, ecp.src, ecp.sx, ecp.sy + y, ecp.w, 1);
-		}
-		ags_updateArea(ecp.wx, ecp.wy, ecp.w, ecp.h);
-		EC_WAIT;
-	}
-	
-	ags_updateArea(ecp.wx, ecp.wy, ecp.w, ecp.h);
-}
-
-static void ec11_prepare() {
-	int i;
-	
-	ecp.ss[0] = sf_create_surface(ecp.w, ecp.h, ecp.write->depth);
-	ecp.sd[0] = sf_create_surface(ecp.w, ecp.h, ecp.write->depth);
-	gr_buller(ecp.ss[0], 0, 0, ecp.src, ecp.sx, ecp.sy, ecp.w, ecp.h, 1 << 2);
-	gr_buller(ecp.sd[0], 0, 0, ecp.dst, ecp.dx, ecp.dy, ecp.w, ecp.h, 1 << 2);
-	
-	for (i = 1; i < 6; i++) {
-		ecp.ss[i] = sf_create_surface(ecp.w, ecp.h, ecp.write->depth);
-		ecp.sd[i] = sf_create_surface(ecp.w, ecp.h, ecp.write->depth);
-		gr_buller(ecp.ss[i], 0, 0, ecp.ss[i-1], 0, 0, ecp.w, ecp.h, 1 << (i+2));
-		gr_buller(ecp.sd[i], 0, 0, ecp.sd[i-1], 0, 0, ecp.w, ecp.h, 1 << (i+2));
-	}
-}
-
-static void ec11_cb(int step) {
-	int i;
-	
-	if (step == 6) {
-		for (i = 0; i < 6; i++) {
-			sf_free(ecp.ss[i]);
-			sf_free(ecp.sd[i]);
-		}
-		gr_copy(ecp.write, ecp.wx, ecp.wy, ecp.src, ecp.sx, ecp.sy, ecp.w, ecp.h);
-		ags_updateArea(ecp.wx, ecp.wy, ecp.w, ecp.h);
-		return;
-	}
-	
-	gre_Blend(ecp.write, ecp.wx, ecp.wy, ecp.sd[step], 0, 0, ecp.ss[5-step], 0, 0, ecp.w, ecp.h, ((step+1)*256)/7);
-	
-	ags_updateArea(ecp.wx, ecp.wy, ecp.w, ecp.h);
-}
-
-#if 0
-static void ec11_cb(int step) {
-	static surface_t *ss;
-	static surface_t *sd;
-	
-	if (step == 0) {
-		ss = sf_create_surface(ecp.w, ecp.h, ecp.write->depth);
-		sd = sf_create_surface(ecp.w, ecp.h, ecp.write->depth);
-		gr_copy(ss, 0, 0, ecp.src, ecp.sx, ecp.sy, ecp.w, ecp.h);
-		gr_copy(sd, 0, 0, ecp.dst, ecp.dx, ecp.dy, ecp.w, ecp.h);
-		return;
-	}
-	if (step == 6) {
-		sf_free(ss);
-		sf_free(sd);
-		gr_copy(ecp.write, ecp.wx, ecp.wy, ecp.src, ecp.sx, ecp.sy, ecp.w, ecp.h);
-		ags_updateArea(ecp.wx, ecp.wy, ecp.w, ecp.h);
-		return;
-	}
-	
-	gr_buller(ss, 0, 0, ecp.src, ecp.sx, ecp.sy, ecp.w, ecp.h, 1 << (7-step));
-	gr_buller(sd, 0, 0, ecp.dst, ecp.dx, ecp.dy, ecp.w, ecp.h, 1 << (step+1));
-	gre_Blend(ecp.write, ecp.wx, ecp.wy, sd, 0, 0, ss, 0, 0, ecp.w, ecp.h, (step*256)/6);
-	ags_updateArea(ecp.wx, ecp.wy, ecp.w, ecp.h);
-}
-#endif
-
-static void ec12_cb(int step) {
-	int j, l;
-	int st_i, ed_i;
-	static int last_i = 0;
-	
-	if (step == 0) {
-		return;
-	}
-	
-	if (step == ECA12_D + ecp.h) {
-		gr_copy(ecp.write, ecp.wx, ecp.wy, ecp.src, ecp.sx, ecp.sy, ecp.w, ecp.h);
-		ags_updateArea(ecp.wx, ecp.wy, ecp.w, ecp.h);
-		return;
-	}
-	
-	st_i = max(0, step - ECA12_D + 1);
-	ed_i = min(ecp.h - 1, step);
-	l = ed_i - st_i + 1;
-	
-	for (j = st_i; j < ed_i; j++) {
-		gre_Blend(ecp.write, ecp.wx, ecp.wy + j, ecp.dst, ecp.dx, ecp.dy + j, ecp.src, ecp.sx, ecp.sy + j, ecp.w, 1, step - j);
-	}
-
-	if ((st_i - last_i) > 1) {
-		gr_copy(ecp.write, ecp.wx, ecp.wy + last_i, ecp.src, ecp.sx, ecp.sy+last_i, ecp.w, st_i - last_i);
-		ags_updateArea(ecp.wx, ecp.wy + last_i, ecp.w, st_i - last_i);
-	}
-	
-	ags_updateArea(ecp.wx, ecp.wy + st_i, ecp.w, l);
-	
-	last_i = st_i;
-}
-
-static void ec13_cb(int step) {
-	int j, l;
-	int st_i,ed_i;
-	static int last_i = 0;
-	int syy1 = ecp.dy + ecp.h -1;
-	int syy2 = ecp.sy + ecp.h -1;
-	int dyy  = ecp.wy + ecp.h -1;
-	
-	if (step == 0) {
-		return;
-	}
-	
-	if (step == ECA12_D + ecp.h) {
-		gr_copy(ecp.write, ecp.wx, ecp.wy, ecp.src, ecp.sx, ecp.sy, ecp.w, ecp.h);
-		ags_updateArea(ecp.wx, ecp.wy, ecp.w, ecp.h);
-		return;
-	}
-	
-	st_i = max(0, step - ECA12_D + 1);
-	ed_i = min(ecp.h -1, step);
-	l = ed_i - st_i+1;
-	
-	for (j = st_i; j <= ed_i; j++) {
-		gre_Blend(ecp.write, ecp.wx, dyy - j, ecp.dst, ecp.dx, syy1 - j, ecp.src, ecp.sx, syy2 - j, ecp.w, 1, step - j);
-	}
-	
-	if ((st_i - last_i) > 1) {
-		gr_copy(ecp.write, ecp.wx, dyy - st_i + 1, ecp.src, ecp.sx, syy2 - st_i + 1, ecp.w, st_i - last_i);
-		ags_updateArea(ecp.wx, dyy - st_i + 1, ecp.w, st_i - last_i);
-	}
-	
-	ags_updateArea(ecp.wx, dyy-ed_i, ecp.w, l);
-	
-	last_i = st_i;
+	ags_updateArea(wx, wy, width, height);
 }

modules/Gpx/effectcopy.h

@@ -4,7 +4,7 @@
 #include "surface.h"
 
 extern void gpx_effect(int no,
-		       surface_t *write, int wx, int wy,
+		       int wx, int wy,
 		       surface_t *dst, int dx, int dy,
 		       surface_t *src, int sx, int sy,
 		       int width, int height,