[NOT FOR MERGE] Add opt-in virtual mouse pointer for touch devices

Provide a trackpad-style on-screen cursor for touch environments (mainly
Android), where touching the screen previously jumped the pointer to the
touched location (absolute) and SDL hardware cursors are invisible.

When enabled, a finger drag moves an arrow cursor relatively, a tap
left-clicks (held briefly so polling games detect it), two fingers
right-click, and a stationary long press starts a left-button drag. Real
mouse motion is ignored (including the spurious startup (0,0) event), and
program-driven cursor moves are followed via the internal pointer location
instead of warping the OS cursor.

The feature is disabled by default and enabled via the -virtualpointer
command-line option, the virtualpointer profile setting, or the "Virtual
mouse pointer" toggle in the Android launcher (persisted in
SharedPreferences and passed to the engine as -virtualpointer).

The gesture handling lives in event.c and the cursor rendering in the new
platform-independent virtual_pointer module, so it works on any touch
target.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

.github/ISSUE_TEMPLATE/bug_report.md

@@ -10,6 +10,7 @@ assignees: ''
 ### Environment
  - xsystem35 version:
  - OS:
+ - Game title:
 
 ### Steps to reproduce the behavior
 1. 
@@ -22,3 +23,4 @@ assignees: ''
 <!-- If applicable, add screenshots to help explain your problem. -->
 
 ### Additional context
+<!-- Note: Please do not post copyrighted game files. -->

.github/workflows/android.yml

@@ -6,7 +6,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v6
 
     - name: Install Deps
       run: sudo apt install ninja-build
@@ -22,7 +22,7 @@ jobs:
         KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
 
     - name: Upload artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v7
       with:
-        name: xsystem35-apk
         path: android/app/build/outputs/apk/release/app-release.apk
+        archive: false

.github/workflows/emscripten.yml

@@ -2,7 +2,7 @@ name: Emscripten Build
 on: [push, pull_request]
 
 env:
-  EM_VERSION: 3.1.50
+  EM_VERSION: latest
   EM_CACHE_FOLDER: 'emsdk-cache'
 
 jobs:
@@ -10,32 +10,35 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v6
 
     - name: Setup cache
       id: cache-system-libraries
-      uses: actions/cache@v3
+      uses: actions/cache@v5
       with:
         path: ${{env.EM_CACHE_FOLDER}}
         key: ${{env.EM_VERSION}}-${{ runner.os }}
 
     - name: Setup Emscripten toolchain
-      uses: mymindstorm/setup-emsdk@v13
+      uses: emscripten-core/setup-emsdk@v16
       with:
         version: ${{ env.EM_VERSION }}
         actions-cache-folder: ${{env.EM_CACHE_FOLDER}}
 
+    - name: Work around emscripten-core/emscripten#26534
+      run: npm install -g typescript@5
+
     - name: Build
       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@v3
+      uses: actions/upload-artifact@v7
       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@v3
+    - uses: actions/checkout@v6
 
     - name: Install Deps
       run: |
         sudo apt update
-        sudo apt install libgtk-3-dev libsdl2-dev libsdl2-ttf-dev libsdl2-mixer-dev libwebp-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 asciidoctor
 
     - 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

@@ -15,7 +15,9 @@ jobs:
           - sys: ucrt64
             package: "xsystem35-64bit"
             cmake_args: ""
-            deps: "cjson:p"
+            deps: >-
+              cjson:p
+              portmidi:p
     defaults:
       run:
         shell: msys2 {0}
@@ -34,22 +36,23 @@ jobs:
           ${{ matrix.deps }}
 
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v6
 
     - name: Copy licenses
       run: |
         ls /${{ matrix.sys }}/share/licenses
         mkdir dist
         cp -r /${{ matrix.sys }}/share/licenses dist/
+        cp licenses/* dist/licenses/
 
     - name: Install dev dependencies
-      run: pacboy --noconfirm -S --needed gcc:p cmake:p ninja:p
+      run: pacboy --noconfirm -S --needed gcc:p cmake:p ninja:p asciidoctor:p
 
     - name: Build
       run: |
         mkdir -p out/release
         cd out/release
-        cmake -G"Ninja" -DCMAKE_BUILD_TYPE=Release ${{ matrix.cmake_args }} ../../
+        cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_COMPILE_WARNING_AS_ERROR=YES ${{ matrix.cmake_args }} ../../
         ninja
 
     - name: Test
@@ -58,10 +61,11 @@ jobs:
 
     - name: Package
       run: |
-        cp out/release/src/xsystem35.exe *.md COPYING xsys35rc.sample dist/
+        cp out/release/src/xsystem35.exe out/release/doc/*.html *.md COPYING xsys35rc.sample dist/
 
     - name: Upload
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v7
       with:
         name: ${{ matrix.package }}
         path: dist
+        compression-level: 9  # because we use it for releases

.gitignore

@@ -1,10 +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,174 @@
+# Changelog
+
+## 2.18.0 - 2026-06-23
+- Added support for the intro demo of Daiakuji.
+- Replaced the bundled mincho font with IPA Mincho.
+
+## 2.17.1 - 2026-01-10
+- Fixed an issue where Rance 5D could not save files on non-Windows systems.
+- Improved fast-forward behavior using the Ctrl key in Rance 5D.
+- The `SI 2` command now returns 0 if a playlist file is not provided.
+
+## 2.17.0 - 2025-11-09
+- Added "Streamer Mode" to mosaic specified (NSFW) images. This is enabled via the `-censor <file>` command-line option.
+- Windows: Fixed an issue where Rance 5D could not save files if the `Save` directory did not exist.
+
+## 2.16.1 - 2025-08-28
+- Fixed text rendering issue in SACT log (#71)
+- Windows: The 32-bit version no longer supports the portmidi MIDI backend
+
+## 2.16.0 - 2025-06-13
+- Fixed map tile color issue in Graymerca (#67)
+- Windows: Implemented number input dialog for the `NI` command (#68)
+- Android: Added "Clear Save Files" launcher menu command
+
+## 2.15.1 - 2025-05-14
+- Fixed a text rendering issue in Rance 5D (#66)
+
+## 2.15.0 - 2025-04-21
+- Fixed color palette bug introduced in v2.14.2.
+- Fixed uncancellable message waiting mode.
+- Android: "Install from ZIP" button is moved to the top-right option menu.
+- Android: Improved extraction logic of track numbers from audio file names.
+
+## 2.14.3 - 2025-04-01
+- Fixed build for big endian architectures.
+
+## 2.14.2 - 2025-03-09
+- Android: Back button to exit the game (#50)
+- Improved touch input usability in ママトト (#64)
+
+## 2.14.1 - 2025-02-07
+- Fixed font selection and text decoration not working in selection menus.
+- Fixed a graphic issue in DALK intro.
+
+## 2.14.0 - 2025-01-09
+- New supported games: 俺の下であがけ and 楽園行.
+- Windows: On Windows 10 version 1903 or above, now xsystem35 can handle
+  Japanese filenames correctly even if the system locale is not Japanese.
+
+## 2.13.0 - 2024-12-07
+- Windows: `Option` -> `Auto Copy Text to Clipboard` menu command has been added.
+  When enabled, in-game text will be copied to the clipboard automatically. This
+  can be used with text hooker tools that support clipboard monitoring.
+
+## 2.12.1 - 2024-12-02
+- Windows: Fixed missing DLL error (#60)
+
+## 2.12.0 - 2024-11-26
+- Implemented playback of the opening movie for 妻みぐい２.
+
+## 2.11.7 - 2024-11-12
+- Fixed crash when canceling menu with two-finger touch (#58)
+- Fixed screen artifact in Rance 3 immediately after selecting "Game Start"
+
+## 2.11.6 - 2024-07-22
+- Fixed strange behavior when canceling the battle selection menu in Kichikuou Rance. (#56)
+- Use system mouse cursors whenever possible. They look better on high dpi displays.
+- Added manual page for the xsystem35 command.
+
+## 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

@@ -1,10 +1,14 @@
-cmake_minimum_required(VERSION 3.13)
+cmake_minimum_required(VERSION 3.13...4.0)
 
 project(xsystem35 LANGUAGES C)
 set(CMAKE_C_STANDARD 99)
 enable_testing()
+set(CMAKE_EXPORT_COMPILE_COMMANDS TRUE)
+
+set(XSYSTEM35_VERSION "2.18.0")
 
 include(CheckSymbolExists)
+include(FetchContent)
 
 # A wrapper around pkg_check_modules() that skips the check if ENABLE_<prefix> is false
 macro (optional_pkg_check_modules prefix)
@@ -25,6 +29,27 @@ function(add_static_library name pkg)
           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.5.0.tar.gz
+    URL_HASH SHA1=b21aa842136dc59a72a38776a5aa73f4d0b00ac5
+    )
+  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)
@@ -36,20 +61,23 @@ if (EMSCRIPTEN)
         INTERFACE_COMPILE_OPTIONS ${option}
         INTERFACE_LINK_OPTIONS ${option})
   endfunction()
-  add_emscripten_library(zlib "SHELL:-s USE_ZLIB=1")
-  add_emscripten_library(sdl2 "SHELL:-s USE_SDL=2")
-  add_emscripten_library(sdl2_ttf "SHELL:-s USE_SDL_TTF=2")
+  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)
   add_library(sdl2 ALIAS SDL2)
   add_library(sdl2_ttf ALIAS SDL2_ttf)
   add_library(sdl2_mixer ALIAS SDL2_mixer)
-  set(SDL2MIXER_FOUND 1)
   find_library(ndk_log log)
   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)
@@ -66,22 +94,18 @@ else()  # non-emscripten, non-android
 
   pkg_check_modules(SDL2 REQUIRED IMPORTED_TARGET sdl2)
   pkg_check_modules(SDL2TTF REQUIRED IMPORTED_TARGET SDL2_ttf)
-  optional_pkg_check_modules(SDL2MIXER IMPORTED_TARGET SDL2_mixer)
+  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++>)
-    if (SDL2MIXER_FOUND)
-      add_static_library(sdl2_mixer SDL2MIXER)
-    endif()
+    add_static_library(sdl2_mixer SDL2MIXER)
   else()
     add_library(sdl2 ALIAS PkgConfig::SDL2)
     add_library(sdl2_ttf ALIAS PkgConfig::SDL2TTF)
-    if (SDL2MIXER_FOUND)
-      add_library(sdl2_mixer ALIAS PkgConfig::SDL2MIXER)
-    endif()
+    add_library(sdl2_mixer ALIAS PkgConfig::SDL2MIXER)
     set(DEFAULT_FONT_PATH ${CMAKE_INSTALL_PREFIX}/share/xsystem35/fonts/)
   endif()
 
@@ -114,22 +138,24 @@ else()  # non-emscripten, non-android
     endif()
   endif()
 
-  find_library(PORTMIDI portmidi)
-  if (PORTMIDI)
-    set(HAVE_PORTMIDI 1)
-    set(ENABLE_MIDI_PORTMIDI 1)
+  if (WIN32)
+    optional_pkg_check_modules(PORTMIDI IMPORTED_TARGET portmidi)
+    if (PORTMIDI_FOUND)
+      set(HAVE_PORTMIDI 1)
+      add_static_library(portmidi_static PORTMIDI)
+      set(PORTMIDI portmidi_static)
+    endif()
+  else ()
+    find_library(PORTMIDI portmidi)
+    if (PORTMIDI)
+      set(HAVE_PORTMIDI 1)
+    endif()
   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)
@@ -139,87 +165,38 @@ 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
 
-list(APPEND SRC_CDROM cdrom.bgm.c)
-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)
 else()
-  list(APPEND SRC_CDROM cdrom.empty.c)
-endif()
-if (SDL2MIXER_FOUND)
-  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()
-  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)
-  endif()
+  list(APPEND SUMMARY_MIDI "SDL_mixer")
+  set(ENABLE_MIDI_SDLMIXER 1)
 
-  if (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
-    check_symbol_exists(SNDCTL_SEQ_NRSYNTHS "machine/soundcard.h" ENABLE_MIDI_SEQMIDI)
-  elseif (CMAKE_SYSTEM_NAME MATCHES "(NetBSD|OpenBSD)")
-    check_symbol_exists(SNDCTL_SEQ_NRSYNTHS "soundcard.h" ENABLE_MIDI_SEQMIDI)
-  else ()
-    check_symbol_exists(SNDCTL_SEQ_NRSYNTHS "sys/soundcard.h" ENABLE_MIDI_SEQMIDI)
-  endif()
-
-  if (ENABLE_MIDI_SEQMIDI)
-    list(APPEND SUMMARY_MIDI "OSS sequencer")
-    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")
+    set(ENABLE_MIDI_PORTMIDI 1)
   endif()
 endif()
 
@@ -242,12 +219,14 @@ 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)
 add_subdirectory(tools)
 add_subdirectory(fonts)
+if (NOT ANDROID AND NOT EMSCRIPTEN)
+  add_subdirectory(doc)
+endif()
 if (ENABLE_NLS)
   add_subdirectory(po)
 endif()

README.md

@@ -16,9 +16,10 @@ 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:
+can play music from audio files, eliminating the need to insert CDs. Supported
+audio file formats are MP3 and Ogg. 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
@@ -60,11 +61,25 @@ and examine or modify game variables. There are two ways to use the debugger:
   launch the debugger with a console interface. Type `help` to see a list of
   available commands.
 
+### Streamer Mode
+
+xsystem35 introduces a "Streamer Mode" to make playing games with NSFW content
+safer for streaming or public viewing. When enabled with the `-censor <file>`
+option, images specified in the provided file will be automatically mosaiced.
+
+The `misc/censor/` directory contains example censor list files for some games.
+
 ## 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.
+[Releases](https://github.com/kichikuou/xsystem35-sdl2/releases) page.
+
+Note for Windows:
+- The 64-bit version supports Windows 10 or later. For older versions of
+  Windows, please use the 32-bit version.
+- Debugging is supported only in the 64-bit version.
+
+For other platforms, refer to the [Building](#building) section.
 
 ## Running
 ### Windows
@@ -73,7 +88,7 @@ Copy `xsystem35.exe` to the game folder and run it.
 
 ### Android
 
-See [android/README.md](android/README.md#use).
+See [android/README.md](android/README.md#usage).
 
 ### Other Platforms
 
@@ -84,11 +99,13 @@ $ cd /path/to/game_directory
 $ xsystem35
 ```
 
+See [xsystem35 command manual](doc/xsystem35.6.adoc) for detailed usage.
+
 ## Building
 ### Linux (Debian / Ubuntu)
 
 ```bash
-$ sudo apt install build-essential cmake libgtk-3-dev libsdl2-dev libsdl2-ttf-dev libsdl2-mixer-dev libwebp-dev libcjson-dev
+$ sudo apt install build-essential cmake libgtk-3-dev libsdl2-dev libsdl2-ttf-dev libsdl2-mixer-dev libwebp-dev libportmidi-dev libcjson-dev asciidoctor
 $ mkdir -p out/debug
 $ cd out/debug
 $ cmake -DCMAKE_BUILD_TYPE=Debug ../../
@@ -100,7 +117,7 @@ $ make && make install
 [Homebrew](https://brew.sh/) is required.
 
 ```bash
-$ brew install cmake pkg-config sdl2 sdl2_mixer sdl2_ttf webp cjson
+$ brew install cmake pkg-config sdl2 sdl2_mixer sdl2_ttf webp portmidi cjson asciidoctor
 $ mkdir -p out/debug
 $ cd out/debug
 $ cmake -DCMAKE_BUILD_TYPE=Debug ../../
@@ -112,7 +129,7 @@ $ make && make install
 [MSYS2](https://www.msys2.org) is required.
 
 ```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
+$ 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-portmidi mingw-w64-ucrt-x86_64-cjson
 $ mkdir -p out/debug
 $ cd out/debug
 $ cmake -G"MSYS Makefiles" -DCMAKE_BUILD_TYPE=Debug ../../

android/README.md

@@ -1,48 +1,25 @@
 # xsystem35 for Android
 
+Minimum supported Android version: 5.0
+
 ## Download
 You can download prebuilt APKs
 [here](https://github.com/kichikuou/xsystem35-sdl2/releases).
 
-## Build
-Prerequisites:
-- Android SDK >=28
-- Android NDK >=r15c
+### Installing with Obtainium
+Alternatively, you can install `xsystem35-sdl2` using [Obtainium](https://github.com/ImranR98/Obtainium). Obtainium will detect new releases and allow you to update the app directly.
 
-### Using Android Studio
-Open this directory as an Android Studio project.
+1. Install Obtainium on your Android device.
+2. Click the badge below to add the app to Obtainium:
 
-### Command Line Build
-Set environment variables and run the `gradlew` script in this directory.
-
-Example build instructions (for Debian bookworm):
-```sh
-# Install necessary packages
-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-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 'cmake;3.22.1'
-export ANDROID_NDK_HOME=$ANDROID_SDK_ROOT/ndk-bundle
-
-# 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
-```
+   [<img src="https://raw.githubusercontent.com/ImranR98/Obtainium/main/assets/graphics/badge_obtainium.png" alt="Get it on Obtainium" height="60">](https://apps.obtainium.imranr.dev/redirect?r=obtainium://app/%7B%22id%22%3A%22io.github.kichikuou.xsystem35%22%2C%22url%22%3A%22https%3A%2F%2Fgithub.com%2Fkichikuou%2Fxsystem35-sdl2%22%2C%22author%22%3A%22kichikuou%22%2C%22name%22%3A%22xsystem35%22%2C%22categories%22%3A%5B%22games%22%5D%7D)
 
 ## 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 will be displayed. Since no games
-   have been installed yet, only the "Install from ZIP" button will be visible.
-   Tap it.
+2. Open the app. Tap the option menu (three dots in the top right corner) and
+   select "Install from ZIP".
 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.
@@ -51,10 +28,12 @@ cd xsystem35-sdl2/android
 - 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:
+- Music files (`.mp3`, `.ogg`, or `.wav`) whose filenames have a number either
+  at the beginning or just before the extension are recognized as BGM files.
+  For example:
   - `Track2.mp3`
   - `15.ogg`
+  - `02 - Title.mp3`
   - `rance4_03.wav` (Note: The filename shouldn't be `rance403.wav`, as it
     would be treated as the 403rd track.)
 
@@ -71,3 +50,32 @@ Note: This ZIP format is also compatible with
   [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.
+
+## Building from Source
+
+### Using Android Studio
+Open this directory as an Android Studio project.
+
+### Command Line Build
+Set environment variables and run the `gradlew` script in this directory.
+
+Example build instructions (for Debian bookworm):
+```sh
+# Install necessary packages
+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-11076708_latest.zip
+unzip commandlinetools-linux-11076708_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 'cmake;3.22.1'
+export ANDROID_NDK_HOME=$ANDROID_SDK_ROOT/ndk-bundle
+
+# 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
+```

android/app/build.gradle

@@ -14,10 +14,10 @@ android {
     }
     compileSdkVersion 34
     defaultConfig {
-        minSdkVersion 19
+        minSdkVersion 21
         targetSdkVersion 34
-        versionCode 18
-        versionName "2.11.0" + gitRevision()
+        versionCode 36
+        versionName "2.18.0" + gitRevision()
         externalNativeBuild {
             cmake {
                 arguments "-DANDROID_APP_PLATFORM=android-19", "-DANDROID_STL=c++_static"

android/app/jni/CMakeLists.txt

@@ -7,18 +7,18 @@ set(PROJECT_ROOT_DIR ../../..)
 include(FetchContent)
 FetchContent_Declare(
   SDL
-  URL https://github.com/libsdl-org/SDL/releases/download/release-2.28.5/SDL2-2.28.5.tar.gz
-  URL_HASH SHA1=50af6b564890d702e57e2a72d6429b43778ed29a
+  URL https://github.com/libsdl-org/SDL/releases/download/release-2.32.10/SDL2-2.32.10.tar.gz
+  URL_HASH SHA1=ce98fa93e31836a751feca374ab28a0770b63c16
 )
 FetchContent_Declare(
   SDL_ttf
-  URL https://github.com/libsdl-org/SDL_ttf/releases/download/release-2.20.1/SDL2_ttf-2.20.1.tar.gz
-  URL_HASH SHA1=f774ff407915ae4afa3d03e5a9395283d9090f28
+  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
 )
 FetchContent_Declare(
   SDL_mixer
-  URL https://github.com/libsdl-org/SDL_mixer/releases/download/release-2.6.2/SDL2_mixer-2.6.2.tar.gz
-  URL_HASH SHA1=036fc7839a6b8dc1af3dbfed4e2531224bbacdd7
+  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
 )
 
 set(SDL2TTF_SAMPLES OFF CACHE BOOL "Build the SDL2_ttf sample program(s)" FORCE)
@@ -29,12 +29,11 @@ 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)
-FetchContent_MakeAvailable(SDL_ttf)
-FetchContent_MakeAvailable(SDL_mixer)
+FetchContent_MakeAvailable(SDL SDL_ttf SDL_mixer)
 
 # The main CMakeLists.txt of xsystem35
 add_subdirectory(${PROJECT_ROOT_DIR} xsystem35)
@@ -43,10 +42,11 @@ add_subdirectory(${PROJECT_ROOT_DIR} xsystem35)
 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}/fonts/mincho.ttf ${ASSETS_DIR}/mincho.ttf)
 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 ${PROJECT_ROOT_DIR}/licenses/MTLc3m.txt ${ASSETS_DIR}/licenses/MTLc3m)
+file(COPY_FILE ${PROJECT_ROOT_DIR}/licenses/mincho.txt ${ASSETS_DIR}/licenses/mincho)
+file(COPY_FILE ${PROJECT_ROOT_DIR}/licenses/nanojpeg.txt ${ASSETS_DIR}/licenses/nanojpeg)
 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)

android/app/proguard-rules.pro

@@ -15,3 +15,84 @@
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
+
+-keep,includedescriptorclasses,allowoptimization class org.libsdl.app.SDLInputConnection {
+    void nativeCommitText(java.lang.String, int);
+    void nativeGenerateScancodeForUnichar(char);
+}
+
+-keep,includedescriptorclasses class org.libsdl.app.SDLActivity {
+    # for some reason these aren't compatible with allowoptimization modifier
+    boolean supportsRelativeMouse();
+    void setWindowStyle(boolean);
+}
+
+-keep,includedescriptorclasses,allowoptimization class org.libsdl.app.SDLActivity {
+    java.lang.String nativeGetHint(java.lang.String); # Java-side doesn't use this, so it gets minified, but C-side still tries to register it
+    boolean onNativeSoftReturnKey();
+    void onNativeKeyboardFocusLost();
+    boolean isScreenKeyboardShown();
+    android.util.DisplayMetrics getDisplayDPI();
+    java.lang.String clipboardGetText();
+    boolean clipboardHasText();
+    void clipboardSetText(java.lang.String);
+    int createCustomCursor(int[], int, int, int, int);
+    void destroyCustomCursor(int);
+    android.content.Context getContext();
+    boolean getManifestEnvironmentVariables();
+    android.view.Surface getNativeSurface();
+    void initTouch();
+    boolean isAndroidTV();
+    boolean isChromebook();
+    boolean isDeXMode();
+    boolean isTablet();
+    void manualBackButton();
+    int messageboxShowMessageBox(int, java.lang.String, java.lang.String, int[], int[], java.lang.String[], int[]);
+    void minimizeWindow();
+    int openURL(java.lang.String);
+    void requestPermission(java.lang.String, int);
+    int showToast(java.lang.String, int, int, int, int);
+    boolean sendMessage(int, int);
+    boolean setActivityTitle(java.lang.String);
+    boolean setCustomCursor(int);
+    void setOrientation(int, int, boolean, java.lang.String);
+    boolean setRelativeMouseEnabled(boolean);
+    boolean setSystemCursor(int);
+    boolean shouldMinimizeOnFocusLoss();
+    boolean showTextInput(int, int, int, int);
+}
+
+-keep,includedescriptorclasses,allowoptimization class org.libsdl.app.HIDDeviceManager {
+    boolean initialize(boolean, boolean);
+    boolean openDevice(int);
+    int sendOutputReport(int, byte[]);
+    int sendFeatureReport(int, byte[]);
+    boolean getFeatureReport(int, byte[]);
+    void closeDevice(int);
+}
+
+-keep,includedescriptorclasses,allowoptimization class org.libsdl.app.SDLAudioManager {
+    int[] getAudioOutputDevices();
+    int[] getAudioInputDevices();
+    int[] audioOpen(int, int, int, int, int);
+    void audioWriteFloatBuffer(float[]);
+    void audioWriteShortBuffer(short[]);
+    void audioWriteByteBuffer(byte[]);
+    void audioClose();
+    int[] captureOpen(int, int, int, int, int);
+    int captureReadFloatBuffer(float[], boolean);
+    int captureReadShortBuffer(short[], boolean);
+    int captureReadByteBuffer(byte[], boolean);
+    void captureClose();
+    void audioSetThreadPriority(boolean, int);
+    native int nativeSetupJNI();
+    native void removeAudioDevice(boolean, int);
+    native void addAudioDevice(boolean, int);
+}
+
+-keep,includedescriptorclasses,allowoptimization class org.libsdl.app.SDLControllerManager {
+    void pollInputDevices();
+    void pollHapticDevices();
+    void hapticRun(int, float, int);
+    void hapticStop(int);
+}

android/app/src/main/AndroidManifest.xml

@@ -80,7 +80,7 @@
             android:label="@string/app_name"
             android:alwaysRetainTaskState="true"
             android:configChanges="layoutDirection|locale|orientation|uiMode|screenLayout|screenSize|smallestScreenSize|keyboard|keyboardHidden|navigation"
-            android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+            android:theme="@style/AppTheme"
             android:hardwareAccelerated="true"
             >
 

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

@@ -30,9 +30,11 @@ 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"
     }
 
@@ -59,9 +61,13 @@ class GameActivity : SDLActivity() {
     }
 
     override fun getArguments(): Array<String> {
-        return arrayOf(
+        val args = mutableListOf(
             "-gamedir", intent.getStringExtra(EXTRA_GAME_ROOT)!!,
-            "-devcd", Launcher.PLAYLIST_FILE)
+            "-savedir", intent.getStringExtra(EXTRA_SAVE_DIRECTORY)!!)
+        val prefs = getSharedPreferences(Launcher.PREFS_NAME, MODE_PRIVATE)
+        if (prefs.getBoolean(Launcher.PREF_VIRTUAL_POINTER, false))
+            args.add("-virtualpointer")
+        return args.toTypedArray()
     }
 
     override fun setTitle(title: CharSequence?) {

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

@@ -25,9 +25,7 @@ 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
@@ -41,13 +39,15 @@ interface LauncherObserver {
     fun onInstallFailure(msgId: Int)
 }
 
-private const val SAVE_DIR = "save"
-
 class Launcher private constructor(private val rootDir: File) {
     companion object {
+        const val SAVE_DIR = "save"
+        const val PREFS_NAME = "settings"
+        const val PREF_VIRTUAL_POINTER = "virtual_pointer"
         const val TITLE_FILE = "title.txt"
-        const val PLAYLIST_FILE = "playlist2.txt"
-        const val OLD_PLAYLIST_FILE = "playlist.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) {
@@ -79,14 +79,14 @@ class Launcher private constructor(private val rootDir: File) {
         isInstalling = true
         GlobalScope.launch(Dispatchers.Main) {
             try {
-                withContext(Dispatchers.IO) {
+                val gameDir = withContext(Dispatchers.IO) {
                     extractFiles(input, dir) { msg ->
                         GlobalScope.launch(Dispatchers.Main) {
                             observer?.onInstallProgress(msg)
                         }
                     }
                 }
-                observer?.onInstallSuccess(dir, archiveName)
+                observer?.onInstallSuccess(gameDir, archiveName)
             } catch (e: InstallFailureException) {
                 observer?.onInstallFailure(e.msgId)
             } catch (e: Exception) {
@@ -114,9 +114,11 @@ 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.
@@ -127,6 +129,7 @@ class Launcher private constructor(private val rootDir: File) {
         if (!saveDirFound) {
             File(rootDir, SAVE_DIR).mkdir()
         }
+        observer?.onGameListChange()
     }
 
     private fun createDirForGame(): File {
@@ -179,7 +182,7 @@ class Launcher private constructor(private val rootDir: File) {
         }
     }
 
-    private fun extractFiles(input: InputStream, outDir: File, progressCallback: (String) -> Unit) {
+    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)
@@ -193,92 +196,73 @@ class Launcher private constructor(private val rootDir: File) {
             }
             configWriter.maybeAdd(zipEntry.name)
         }
-        if (!configWriter.readyToWrite()) {
+        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.2.0 had a bug where playlist had an extra empty line at
-    // the beginning of the file. This migrates playlist.txt created by an old
-    // version of xsystem35-sdl2 to playlist2.txt.
+    // 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())
-            return
-        var tracks = oldPlaylist.readLines()
-        if (tracks.isNotEmpty())
-            tracks = tracks.subList(1, tracks.size)
-        File(dir, PLAYLIST_FILE).writeText(tracks.joinToString("\n"))
-        oldPlaylist.delete()
+        if (oldPlaylist.exists()) {
+            oldPlaylist.renameTo(File(dir, PLAYLIST_FILE))
+        }
     }
 
     class InstallFailureException(val msgId: Int) : Exception()
 
-    // A helper class which generates xsystem35.gr and playlist.txt in the game root directory.
+    // 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"
-        )
-        private val audioRegex = """.*?(\d+)\.(wav|mp3|ogg)""".toRegex(RegexOption.IGNORE_CASE)
+        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+).*|.*?(\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.lowercase(Locale.US)]?.let {
-                grb.appendLine("$it $path")
-                return
-            }
             aldRegex.matchEntire(name)?.let {
-                val ext = it.groupValues[4].uppercase(Locale.US)
-                val type = if (ext == "ALD") {
-                    aldType[it.groupValues[2].lowercase(Locale.US)]
-                } else {
-                    ext
-                }
-                val id = it.groupValues[3].uppercase(Locale.US)
-                if (type != null) {
-                    grb.appendLine("$type$id $path")
-                    basename = it.groupValues[1]
-                }
+                gameDir = File(path).parent
+                ready = true
             }
             audioRegex.matchEntire(name)?.let {
-                val track = it.groupValues[1].toInt()
+                val track = it.groupValues[2].toIntOrNull() ?: it.groupValues[3].toInt()
                 if (0 < track && track <= audioFiles.size)
                     audioFiles[track - 1] = path
             }
         }
 
-        fun readyToWrite() = basename != null
-
         fun write(outDir: File) {
-            for (id in 'A' .. 'Z') {
-                grb.appendLine("Save$id ../save/${basename}s${id.lowercase(Locale.US)}.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)
         }
     }
+
+    fun clearSaveData(): Boolean {
+        var success = true
+        File(rootDir, SAVE_DIR).listFiles()?.forEach { file ->
+            if (!file.deleteRecursively()) success = false
+        }
+        return success
+    }
 }
 
 private fun forEachZipEntry(input: InputStream, action: (ZipEntry, ZipInputStream) -> Unit): Boolean {

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

@@ -22,6 +22,7 @@ import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
 import android.provider.OpenableColumns
+import android.text.Html
 import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
@@ -53,6 +54,8 @@ class LauncherActivity : Activity(), LauncherObserver {
 
         onGameListChange()
         val listView = findViewById<ListView>(R.id.list)
+        listView.emptyView = findViewById(R.id.empty)
+        findViewById<TextView>(R.id.usage).text = Html.fromHtml(getString(R.string.usage))
         listView.setOnItemClickListener { _, _, position, _ ->
             onListItemClick(position)
         }
@@ -75,33 +78,34 @@ class LauncherActivity : Activity(), LauncherObserver {
     }
 
     private fun onListItemClick(position: Int) {
-        if (position < launcher.games.size) {
-            startGame(launcher.games[position].path, null)
-        } else {
-            val i = Intent(Intent.ACTION_GET_CONTENT)
-            i.type = CONTENT_TYPE_ZIP
-            startActivityForResult(Intent.createChooser(i, getString(R.string.choose_a_file)), INSTALL_REQUEST)
-        }
+        startGame(launcher.games[position].path, null)
     }
 
     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))
-                    .setPositiveButton(R.string.ok) {_, _ -> uninstall(position)}
-                    .setNegativeButton(R.string.cancel) {_, _ -> }
-                    .show()
-        }
+        AlertDialog.Builder(this).setTitle(R.string.confirm)
+                .setMessage(getString(R.string.uninstall_dialog_message, launcher.games[position].title))
+                .setPositiveButton(R.string.ok) {_, _ -> uninstall(position)}
+                .setNegativeButton(R.string.cancel) {_, _ -> }
+                .show()
         return true
     }
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         menuInflater.inflate(R.menu.launcher_menu, menu)
+        val prefs = getSharedPreferences(Launcher.PREFS_NAME, MODE_PRIVATE)
+        menu.findItem(R.id.virtual_pointer).isChecked =
+            prefs.getBoolean(Launcher.PREF_VIRTUAL_POINTER, false)
         return true
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         return when (item.itemId) {
+            R.id.install_from_zip -> {
+                val i = Intent(Intent.ACTION_GET_CONTENT)
+                i.type = CONTENT_TYPE_ZIP
+                startActivityForResult(Intent.createChooser(i, getString(R.string.choose_a_file)), INSTALL_REQUEST)
+                true
+            }
             R.id.export_savedata -> {
                 val i = Intent(Intent.ACTION_CREATE_DOCUMENT)
                 i.type = CONTENT_TYPE_ZIP
@@ -116,11 +120,39 @@ class LauncherActivity : Activity(), LauncherObserver {
                                        SAVEDATA_IMPORT_REQUEST)
                 true
             }
+            R.id.clear_savedata -> {
+                AlertDialog.Builder(this)
+                    .setTitle(R.string.confirm)
+                    .setMessage(R.string.clear_save_data_confirm)
+                    .setPositiveButton(R.string.ok) { _, _ ->
+                        if (launcher.clearSaveData()) {
+                            Toast.makeText(this, R.string.save_data_clear_success, Toast.LENGTH_SHORT).show()
+                        } else {
+                            errorDialog(R.string.save_data_clear_error)
+                        }
+                    }
+                    .setNegativeButton(R.string.cancel, null)
+                    .show()
+                true
+            }
+            R.id.help -> {
+                AlertDialog.Builder(this)
+                    .setMessage(Html.fromHtml(getString(R.string.usage)))
+                    .show()
+                true
+            }
             R.id.licenses -> {
                 val intent = Intent(this, LicensesMenuActivity::class.java)
                 startActivity(intent)
                 true
             }
+            R.id.virtual_pointer -> {
+                val enabled = !item.isChecked
+                item.isChecked = enabled
+                getSharedPreferences(Launcher.PREFS_NAME, MODE_PRIVATE).edit()
+                    .putBoolean(Launcher.PREF_VIRTUAL_POINTER, enabled).apply()
+                true
+            }
             else -> super.onOptionsItemSelected(item)
         }
     }
@@ -157,7 +189,6 @@ class LauncherActivity : Activity(), LauncherObserver {
 
     override fun onGameListChange() {
         val items = launcher.titles.toMutableList()
-        items.add(getString(R.string.install_from_zip))
         val listView = findViewById<ListView>(R.id.list)
         listView.adapter = ArrayAdapter(this, android.R.layout.simple_list_item_1, items)
     }
@@ -180,6 +211,7 @@ class LauncherActivity : Activity(), LauncherObserver {
         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)
     }

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

@@ -13,10 +13,11 @@ class LicensesMenuActivity : Activity() {
         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("NanoJPEG", "nanojpeg", "https://keyj.emphy.de/nanojpeg/"),
         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/"),
+        Entry("IPA明朝", "mincho", "https://moji.or.jp/ipafont/"),
     )
 
     override fun onCreate(savedInstanceState: Bundle?) {

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

@@ -277,6 +277,7 @@ public class HIDDeviceManager {
             0x044f, // Thrustmaster
             0x045e, // Microsoft
             0x0738, // Mad Catz
+            0x0b05, // ASUS
             0x0e6f, // PDP
             0x0f0d, // Hori
             0x10f5, // Turtle Beach
@@ -285,6 +286,7 @@ public class HIDDeviceManager {
             0x24c6, // PowerA
             0x2dc8, // 8BitDo
             0x2e24, // Hyperkin
+            0x3537, // GameSir
         };
 
         if (usbInterface.getId() == 0 &&
@@ -358,6 +360,12 @@ public class HIDDeviceManager {
     private void initializeBluetooth() {
         Log.d(TAG, "Initializing Bluetooth");
 
+        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");
@@ -583,7 +591,13 @@ public class HIDDeviceManager {
                 } else {
                     flags = 0;
                 }
-                mUsbManager.requestPermission(usbDevice, PendingIntent.getBroadcast(mContext, 0, new Intent(HIDDeviceManager.ACTION_USB_PERMISSION), flags));
+                if (Build.VERSION.SDK_INT >= 33 /* Android 14.0 (U) */) {
+                   Intent intent = new Intent(HIDDeviceManager.ACTION_USB_PERMISSION);
+                   intent.setPackage(mContext.getPackageName());
+                   mUsbManager.requestPermission(usbDevice, PendingIntent.getBroadcast(mContext, 0, intent, flags));
+               } else {
+                   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/SDL.java

@@ -38,6 +38,10 @@ public class SDL {
     }
 
     public static void loadLibrary(String libraryName) throws UnsatisfiedLinkError, SecurityException, NullPointerException {
+        loadLibrary(libraryName, mContext);
+    }
+
+    public static void loadLibrary(String libraryName, Context context) throws UnsatisfiedLinkError, SecurityException, NullPointerException {
 
         if (libraryName == null) {
             throw new NullPointerException("No library name provided.");
@@ -53,10 +57,10 @@ public class SDL {
             // To use ReLinker, just add it as a dependency.  For more information, see 
             // https://github.com/KeepSafe/ReLinker for ReLinker's repository.
             //
-            Class<?> relinkClass = mContext.getClassLoader().loadClass("com.getkeepsafe.relinker.ReLinker");
-            Class<?> relinkListenerClass = mContext.getClassLoader().loadClass("com.getkeepsafe.relinker.ReLinker$LoadListener");
-            Class<?> contextClass = mContext.getClassLoader().loadClass("android.content.Context");
-            Class<?> stringClass = mContext.getClassLoader().loadClass("java.lang.String");
+            Class<?> relinkClass = context.getClassLoader().loadClass("com.getkeepsafe.relinker.ReLinker");
+            Class<?> relinkListenerClass = context.getClassLoader().loadClass("com.getkeepsafe.relinker.ReLinker$LoadListener");
+            Class<?> contextClass = context.getClassLoader().loadClass("android.content.Context");
+            Class<?> stringClass = context.getClassLoader().loadClass("java.lang.String");
 
             // Get a 'force' instance of the ReLinker, so we can ensure libraries are reinstalled if 
             // they've changed during updates.
@@ -66,7 +70,7 @@ public class SDL {
 
             // Actually load the library!
             Method loadMethod = relinkInstanceClass.getDeclaredMethod("loadLibrary", contextClass, stringClass, stringClass, relinkListenerClass);
-            loadMethod.invoke(relinkInstance, mContext, libraryName, null, null);
+            loadMethod.invoke(relinkInstance, context, libraryName, null, null);
         }
         catch (final Throwable e) {
             // Fall back

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

@@ -60,8 +60,8 @@ import java.util.Locale;
 public class SDLActivity extends Activity implements View.OnSystemUiVisibilityChangeListener {
     private static final String TAG = "SDL";
     private static final int SDL_MAJOR_VERSION = 2;
-    private static final int SDL_MINOR_VERSION = 28;
-    private static final int SDL_MICRO_VERSION = 5;
+    private static final int SDL_MINOR_VERSION = 32;
+    private static final int SDL_MICRO_VERSION = 10;
 /*
     // Display InputType.SOURCE/CLASS of events and devices
     //
@@ -89,7 +89,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
                 | InputDevice.SOURCE_CLASS_POSITION
                 | InputDevice.SOURCE_CLASS_TRACKBALL);
 
-        if (s2 != 0) cls += "Some_Unkown";
+        if (s2 != 0) cls += "Some_Unknown";
 
         s2 = s_copy & InputDevice.SOURCE_ANY; // keep source only, no class;
 
@@ -163,7 +163,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
         if (s == FLAG_TAINTED) src += " FLAG_TAINTED";
         s2 &= ~FLAG_TAINTED;
 
-        if (s2 != 0) src += " Some_Unkown";
+        if (s2 != 0) src += " Some_Unknown";
 
         Log.v(TAG, prefix + "int=" + s_copy + " CLASS={" + cls + " } source(s):" + src);
     }
@@ -281,7 +281,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
     // Load the .so
     public void loadLibraries() {
        for (String lib : getLibraries()) {
-          SDL.loadLibrary(lib);
+          SDL.loadLibrary(lib, this);
        }
     }
 
@@ -790,6 +790,9 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
                                 window.clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
                                 SDLActivity.mFullscreenModeActive = false;
                             }
+                            if (Build.VERSION.SDK_INT >= 28 /* Android 9 (Pie) */) {
+                                window.getAttributes().layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES;
+                            }
                         }
                     } else {
                         Log.e(TAG, "error handling message, getContext() returned no Activity");
@@ -995,8 +998,8 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
         /* No valid hint, nothing is explicitly allowed */
         if (!is_portrait_allowed && !is_landscape_allowed) {
             if (resizable) {
-                /* All orientations are allowed */
-                req = ActivityInfo.SCREEN_ORIENTATION_FULL_SENSOR;
+                /* All orientations are allowed, respecting user orientation lock setting */
+                req = ActivityInfo.SCREEN_ORIENTATION_FULL_USER;
             } else {
                 /* Fixed window and nothing specified. Get orientation from w/h of created window */
                 req = (w > h ? ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE : ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT);
@@ -1005,8 +1008,8 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
             /* At least one orientation is allowed */
             if (resizable) {
                 if (is_portrait_allowed && is_landscape_allowed) {
-                    /* hint allows both landscape and portrait, promote to full sensor */
-                    req = ActivityInfo.SCREEN_ORIENTATION_FULL_SENSOR;
+                    /* hint allows both landscape and portrait, promote to full user */
+                    req = ActivityInfo.SCREEN_ORIENTATION_FULL_USER;
                 } else {
                     /* Use the only one allowed "orientation" */
                     req = (is_landscape_allowed ? orientation_landscape : orientation_portrait);

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

@@ -546,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);
+                    }
                 }
             }
         }

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

@@ -6,4 +6,12 @@
     <ListView android:id="@+id/list"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
+    <ScrollView android:id="@+id/empty"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <TextView android:id="@+id/usage"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:padding="20dp" />
+    </ScrollView>
 </LinearLayout>

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

@@ -1,11 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/install_from_zip"
+        android:title="@string/action_install_from_zip" />
     <item
         android:id="@+id/export_savedata"
         android:title="@string/action_export_save_data" />
     <item
         android:id="@+id/import_savedata"
         android:title="@string/action_import_save_data" />
+    <item
+        android:id="@+id/clear_savedata"
+        android:title="@string/action_clear_save_data" />
+    <item
+        android:id="@+id/virtual_pointer"
+        android:checkable="true"
+        android:title="@string/action_virtual_pointer" />
+    <item
+        android:id="@+id/help"
+        android:title="@string/action_help" />
     <item
         android:id="@+id/licenses"
         android:title="@string/action_licenses" />

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

@@ -2,21 +2,44 @@
 <resources>
     <string name="app_name">xsystem35</string>
     <string name="action_export_save_data">セーブデータをエクスポート</string>
+    <string name="action_help">使い方</string>
     <string name="action_import_save_data">セーブデータをインポート</string>
+    <string name="action_install_from_zip">ZIPからインストール</string>
     <string name="action_licenses">オープンソースライセンス</string>
+    <string name="action_clear_save_data">セーブデータをクリア</string>
+    <string name="action_virtual_pointer">仮想マウスポインタ</string>
     <string name="cancel">キャンセル</string>
     <string name="cannot_find_ald">System 3.x のファイル (*.ald) が見つかりません。</string>
     <string name="choose_a_file">ファイルを選択</string>
+    <string name="clear_save_data_confirm">セーブデータをすべて削除します。元には戻せません。本当によろしいですか？</string>
+    <string name="confirm">確認</string>
     <string name="error_dialog_title">エラー</string>
     <string name="install_dialog_title">インストール中…</string>
-    <string name="install_from_zip">ZIP からインストール</string>
     <string name="install_progress">%s を展開中</string>
     <string name="no_data_to_import">ZIP アーカイブ中に save/ フォルダが見つかりません。</string>
     <string name="save_data_export_error">セーブデータのエクスポートに失敗しました。</string>
     <string name="save_data_export_success">エクスポートに成功しました。</string>
     <string name="save_data_import_success">インポートに成功しました。</string>
+    <string name="save_data_clear_success">セーブデータをクリアしました。</string>
+    <string name="save_data_clear_error">セーブデータのクリアに失敗しました。</string>
     <string name="uninstall_dialog_message">「%s」をアンインストールしますか？</string>
-    <string name="uninstall_dialog_title">確認</string>
     <string name="unsupported_zip">この形式の ZIP はサポートしていません。</string>
     <string name="zip_extraction_error">ZIP の展開に失敗しました。</string>
+    <string name="usage">
+        <![CDATA[
+            <h1>ゲームのインストール方法</h1>
+            <p>1. PC上で、ゲームのファイルが入ったZIPを用意します。例えば以下のようなファイルを含めます:</p>
+            <div>
+                ・鬼畜王SA.ALD<br>
+                ・鬼畜王GA.ALD<br>
+                ・鬼畜王GB.ALD<br>
+                ・鬼畜王WA.ALD<br>
+                ・02.mp3<br>
+                ・03.mp3<br>
+                ・…<br>
+            </div>
+            <p>2. ZIPファイルを (例えばUSB経由で) PCからデバイスに転送します。</p>
+            <p>3. この画面の右上のメニューボタンをタップして「ZIPからインストール」を選択し、転送したZIPを選びます。</p>
+        ]]>
+    </string>
 </resources>

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

@@ -1,22 +1,46 @@
 <resources>
     <string name="app_name">xsystem35</string>
+    <string name="action_clear_save_data">Clear Save Files</string>
     <string name="action_export_save_data">Export Save Files</string>
+    <string name="action_help">Help</string>
     <string name="action_import_save_data">Import Save Files</string>
+    <string name="action_install_from_zip">Install from ZIP</string>
     <string name="action_licenses">Open source licenses</string>
+    <string name="action_virtual_pointer">Virtual mouse pointer</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>
+    <string name="clear_save_data_confirm">Are you sure you want to clear all save files? This cannot be undone.</string>
+    <string name="confirm">Confirm</string>
     <string name="error_dialog_title">Error</string>
     <string name="install_dialog_title">Installing…</string>
-    <string name="install_from_zip">Install from ZIP</string>
     <string name="install_progress">Extracting %s</string>
     <string name="no_data_to_import">No save/ folder in the ZIP archive.</string>
     <string name="ok">OK</string>
+    <string name="save_data_clear_error">Failed to clear save files.</string>
+    <string name="save_data_clear_success">Save files cleared.</string>
     <string name="save_data_export_error">Failed to export save files.</string>
     <string name="save_data_import_success">Imported successfully.</string>
     <string name="save_data_export_success">Exported successfully.</string>
     <string name="uninstall_dialog_message">Uninstall \"%s\"?</string>
-    <string name="uninstall_dialog_title">Confirm</string>
     <string name="unsupported_zip">This type of ZIP is not supported.</string>
     <string name="zip_extraction_error">Failed to extract ZIP.</string>
+    <string name="usage">
+        <![CDATA[
+            <h1>How to install a game</h1>
+            <p>1. On your PC, prepare a ZIP containing the game files. For example, it should contain the following files:</p>
+            <div>
+                * KICHIKUSA.ALD<br>
+                * KICHIKUGA.ALD<br>
+                * KICHIKUGB.ALD<br>
+                * KICHIKUWA.ALD<br>
+                * System39.ain<br>
+                * 02.mp3<br>
+                * 03.mp3<br>
+                * …<br>
+            </div>
+            <p>2. Transfer the ZIP file from your PC to the device (e.g. via USB).</p>
+            <p>3. Tap the menu button at the upper-right of this screen, select &quot;Install from ZIP,&quot; and choose the ZIP you transferred.</p>
+        ]]>
+    </string>
 </resources>

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

@@ -1,8 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="android:Theme.Holo.Light.DarkActionBar">
+    <style name="AppTheme" parent="android:Theme.NoTitleBar.Fullscreen">
         <!-- Customize your theme here. -->
     </style>
-
 </resources>

android/build.gradle

@@ -7,7 +7,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.1'
+        classpath 'com.android.tools.build:gradle:8.7.3'
         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 @@
 #Thu Nov 11 18:20:34 PST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

config.h.in

@@ -1,26 +1,16 @@
 #cmakedefine PACKAGE "@PACKAGE@"
-#define VERSION "2.11.0"
+#define VERSION "@XSYSTEM35_VERSION@"
 
 #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@
 #cmakedefine ENABLE_MIDI_SDLMIXER @ENABLE_MIDI_SDLMIXER@
-#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 HAVE_GETLOGIN @HAVE_GETLOGIN@
 #cmakedefine HAVE_MMAP @HAVE_MMAP@
@@ -28,4 +18,4 @@
 #cmakedefine HAVE_WEBP @HAVE_WEBP@
 
 #define DEFAULT_GOTHIC_TTF "@DEFAULT_FONT_PATH@MTLc3m.ttf"
-#define DEFAULT_MINCHO_TTF "@DEFAULT_FONT_PATH@mincho.otf"
+#define DEFAULT_MINCHO_TTF "@DEFAULT_FONT_PATH@mincho.ttf"

doc/CMakeLists.txt

@@ -0,0 +1,42 @@
+set(SOURCES
+  xsystem35.6.adoc
+  xsystem35.gr.5.adoc
+)
+
+find_program(ASCIIDOCTOR asciidoctor)
+if (NOT ASCIIDOCTOR)
+  message(WARNING "asciidoctor not found, manpages will not be generated")
+else()
+  if (WIN32)
+    set(BACKEND html)
+  else()
+    set(BACKEND manpage)
+    include(GNUInstallDirs)
+  endif()
+
+  set(MANUALS "")
+  foreach(SRC ${SOURCES})
+    string(REGEX MATCH "^(.*)\\.([0-9])\\.adoc$" _ ${SRC})
+    set(NAME ${CMAKE_MATCH_1})
+    set(SECTION ${CMAKE_MATCH_2})
+    if (WIN32)
+      set(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.html)
+    else()
+      set(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.${SECTION})
+      install(FILES ${OUTPUT} DESTINATION ${CMAKE_INSTALL_MANDIR}/man${SECTION})
+    endif()
+    add_custom_command(
+      OUTPUT ${OUTPUT}
+      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${SRC}
+      COMMAND ${ASCIIDOCTOR}
+        --attribute xsystem35-version=${XSYSTEM35_VERSION}
+        --backend ${BACKEND}
+        --out-file ${OUTPUT}
+        ${CMAKE_CURRENT_SOURCE_DIR}/${SRC}
+    )
+    list(APPEND MANUALS ${OUTPUT})
+  endforeach()
+
+  add_custom_target(manual ALL DEPENDS ${MANUALS})
+endif()
+

doc/GRFMT.TXT

@@ -1,80 +0,0 @@
-                  ゲームリソースファイル(*.gr)の書き方
-
-
-   xsystem35ではゲームデータの置き場所をテキストファイルに保存しておき、
- それをxsystem35に指定してやる事でデータの置き場所を知らせます。
-
-# このファイルのファイル名はxsystem35を起動する時に指定できますので、hoge.gr
-# である必要は無く、自由につける事が出来ます。
-
- ここでは、このテキストファイル(ゲームリソースファイル)の書式を説明します。
-
-
-  １つのデータにつき１行で記述します。例を見て下さい。
-
-  ScenarioA /home/chikama/game/rance4/rance4_sa.ald
-
-    キーワード データのフルパス
-
- の順に書きます。キーワードは行の先頭から書き、データのフルパスとの間は半角
- スペースです。(セーブデータのみ、ホームディレクトリを表す ~ を評価します。)
- 
- キーワードには次の７つがあります。
-
-    Scenario : シナリオ
-    Graphics : グラフィック
-    Wave     : PCMデータ
-    Midi     : MIDIデータ
-    Data     : その他データ
-    Save     : セーブデータ
-    Resource : リソースファイル(マウスカーソル形状)
-    Ain      : DLL とその関数の情報のかかれた System39.ain
-    BGM      : BGMデータ(エスカレイヤー以降のBGMデータファイル)
-    WAI      : PCMデータの追加情報 (mixer channel 情報等)
-    BGI      : BGMデータの追加情報 (ループ位置等)
-    SACT01   : SACT.DLL用データ (SACTEFAM.KLD)
-    ALK      : デモ用アーカイブファイル
-    Init     : System39.ini
-   
- 同じ種類のデータが複数ある場合はキーワードの次にA,B,C...をつけます。
- (Ain を除く)
-
-   CD-ROM上のどれがどの種類のファイルかは、ファイル名で判別します。
- *SA.ALD ならシナリオの１番目、*GA.ALDはグラフィック、*WA.ALDはPCM、
- *MA.ALD はMIDI、*DA.ALDはその他データです。
-
-   Ain は System39.ain へのパスを書きます。例えば
- Ain /home/chikama/game/20cKaeru/System39.ain
- のように書きます。
-
-   Init は System39.ini へのパスを書きます。例えば
- Init /home/chikama/game/esuka/System39.ini
- のように書きます。
-
-   WAI/BGI は通常１ファイルだけですので
- WAIA /home/chikama/game/esuka/DOKI_WA.WAI
- BGIA /home/chikama/game/esuka/DOKI_BA.BGI
- のように書きます。
-  
-   SACT01 は SACTシステム固有のデータファイル(SACTEFAM.KLD)へのパスを
- 指定します。
- SACT01 /home/chikama/game/rance5d/SACTEFAM.KLD
-
-   ALK はデモ用のデータが入ったアーカイブファイルです。
- ALK01 /home/chikama/game/nd/NightDemonDemo1.alk
- ALK02 /home/chikama/game/nd/NightDemonDemo2.alk
- ALK03 /home/chikama/game/nd/NightDemonDemo3.alk
- のように書きます。
-
-
-  また、これらの範疇にはいらないデータ、たとえば、かえるにょぱにょんの
- floor_1.mapなどはリソースファイルを介しませんので、ゲームリソース
- ファイルには書かず、「セーブデータを置いたディレクトリと同じ場所」に
- コピーして下さい。
-
-   また、Save? のみ、'~' (ホームディレクトリ)を評価しますので、
- SaveA ~/savedata/kichiku/kichiku_sa.ald
- のように書く事が出来ます。
-
- コメントを書く場合は行頭に # をつけます。また空白行は無視されます。
-

doc/README

@@ -1,314 +0,0 @@
-
-        System 3.5 for X Window System     Version 1.7 (開発版)
-
-0. 目次
-
-   1. はじめに
-   2. 開発環境と動作確認環境
-    2.a. 開発環境
-    2.b. 動作確認環境
-    2.c. 多分動くと思われる環境
-   3. xystem35の設定ファイル
-   4. ゲームの実行と終了
-    4.a. ゲームの実行
-    4.b. ゲームの終了
-    4.c. xsystem35メニュー
-    4.d. キーボード操作
-   5. コマンドラインオプション
-   6. その他情報
-    6.a. SYSV IPC
-    6.b. SharedMemoryの大きさについて
-    6.c. locale と X
-   7. 著作権とライセンス
-   8. サポート
-
-
-1. はじめに
-
-   このソフトは AliceSoft の Syetem3.5/3.6/3.8/3.9 上で動くゲームを
- X Window System 上で動かすためのプログラムです。
-
- * 動作確認ゲーム
-
-     鬼畜王ランス
-     ランス４ (for Win95)
-     闘神都市II (for Win95)
-     夢幻泡影 (for Win95)
-     かえるにょぱにょ〜ん (初版、廉価版)
-     いけないかつみ先生
-     戦巫女 (初版、廉価版)
-     零式 (館４５６版、廉価版)
-     ATLACH=NACHA (館４５６版、廉価版)
-     人間狩り
-     王道勇者
-     ディアボリカ (初版、廉価版)
-     AmbivalenZ(for Win95)
-     ぱすてるチャイム
-     ぷろすちゅーでんとGood
-     守り神様
-     ママトト
-
-     アリスの館４５６
-        DALK
-        闘神都市
-        DrStop!
-        ランス１
-        ランス２
-        ランス３
-
-     アリスＣＤ Ver 1.02
-        メイドのすすめ
-        ぶろぶろ
-        学園漂流戦記
-
-     Hushaby Baby
-     Darcrows
-     PERSIOM
-     隠れ月
-     SeeIn青
-
-     20世紀アリス
-        これDPS？
-        かえるにょ国にょアリス
-
-     アリスＣＤ Ver 2.02
-        扉
-        妖精
-
-     OnlyYou リ・クルス
-     王子さま Lv1.5
-
- * 動かないゲーム
-
-     夜が来る！
-     王子さま Lv1
-     DALK外伝 (System4)
-     ままにょにょ (System4)
-
- * 一部動作可能
-
-     大悪司 (オープニング不可)
-     妻みぐい (オープニング不可)
-     エスカレイヤー (オープニング不可)
-     Rance5D
-     妻みぐい２ (オープニング不可)
-     シェル・クレイル
-     NightDemon (オープニング不可)
-     
-
-   各ゲームについての補足事項は doc/GAMES.TXT を御覧ください。
-     
-   また、ネット上で公開されているSYSTEM3.5用のゲームのうち、いくつかは
-  動作が確認されています。くわしくは MISCGAME.TXT を御覧下さい。
-
-
-2. 開発環境と動作確認環境
-
- 2.a. 開発環境
-
-   Kondara-1.2 (Linux/i386)
-
- 2.b. 動作確認環境
-
-   DigitalUnix 4.0F (alpha)
-   SunOS 5.8 (sparc)
-
- 2.c. 多分動くと思われる環境
-
-   Linux(!i386)
-   FreeBSD/NetBSD/OpenBSD (i386 etc)
-   Irix 6.X
-   Solaris 2.X 以降 (sparc/i386)
-
-
-3. xystem35の設定ファイル
-
-   xsystem35ではフォントの設定などを、カレントディレクトリとホームディレクトリに
- ある .xsys35rcというファイルから読み込みます。カレントディレクトリの .xsys35rc
- に書かれた設定のほうが優先されるため、一般的な設定はホームディレクトリの
- .xsys35rcに書き、特定のゲームで書き換えたい項目はゲームを置いたディレクトリの
- .xsys35rcに書くといいでしょう。
-
-   サンプルとなるファイルを xsys35rc.sample として用意しました。
-
-   また、gtk widgetのリソースは ~/.gtk/gtkrc または ~/.gtkrc から読み込みます。
- 読み込み先は .xsys35rc で指定できます。
-
-   ゲームで使用するフォントは X のフォントの仕組を使う方法と、TrueTypeFontを
- 外部ライブラリを使って直接表示する方法の２種類が選べます。
- 
- ~/.xsys35rc の ttfont_mincho: と ttfont_gothic: の場所にフォントファイルを
- 指定し、font_device: ttf と指定してください。詳しくはサンプルファイル
- (xsys35rc.sample)を見て下さい。
-
-
-4. ゲームの実行と終了
-
- 4.a. ゲームの実行
-
-    instgameを使ってゲームデータをインストールすると、インストールした
-  ディレクトリにの一つ上に ???????.gr というファイル(ゲームリソースファイル)
-  が自動的に作成されますので
-
-  % xsystem35 -gamefile ~/game/???????.gr
-
-  のように実行します。-gamefile オプションをつけない場合は、カレントディレク
-  トリの xsystem35.gr を参照します。
-
-    またいずれも見つからない場合は、カレントディレクトリにあるファイルをゲーム
-  データとして設定します。例えば testSA.ALD というファイルがカレントディレク
-  トリにあると、それをシナリオデータとして使います。またセーブデータは適当な
-  名前で 10個確保されます。
-
-  ゲームリソースファイルの書き方については、doc/GRFMT.TXT を御覧下さい。
-
- 4.b. ゲームの終了
-
-   * 起動した端末で Ctrl+C を押すと、すぐに終了します。
-
-   * ゲーム中にマウスの真中のボタンを押すと、メニューが出て来ますので、
-   そこから 'Exit' を選んで終了させて下さい。Window Manager のCloseボタンでも
-   同じように動作します。
-
-   * ESC + SPACE + RET キーを同時に押すと、すぐに終了します。
-
- 4.c. xsystem35メニュー
-
-   ゲーム中にマウスの真中ボタンを押すとメニューが出て来ます。
-
-  メッセージスキップ(MessageSkip):
-        次の選択肢までメッセージを飛ばします。マウスの右クリックで
-        止まります。シナリオによっては停止しない場合もあります。
-  
-  マウスカーソル移動(MouseAutoMove):
-        選択ウィンドなどでマウスが自動的に移動するのを制御します。
-
-  ボリュームバランス(VolumeValance):
-        SACTシステムで音声の人物毎に音量を変えることができます。
-        (ゲームがそう出来るように対応している場合のみ)
-
-  情報(About):
-        このゲームについて。
-
-  終了(Exit):
-        ゲームを終了します。
-
- 4.d. キーボード操作
-
-    アリスソフトのゲームは有史来、基本的に上下左右キーに SPACE, RET, ESC, TAB
-  キーしか使いません(一部のゲームはそれ以外のキーを使うこともあります)。
-  XSystem35 では次のキー割当を特別に使っています。
-
-    F1: メッセージスキップ
-    F4: フルスクリーン <-> Window表示の切替え
-
-  また、旧き良き時代の DOS への復帰キー (ESC + SPACE + RET) でゲームを確認なし
-  で終了出来ます。  
-
-
-5. コマンドラインオプション
-
-  -h             : ヘルプを表示します。
-
-  -gamefile file : ゲームリソースファイルを file から読み込みます。
-
-  -no-shm        : ネットワーク越しに起動する場合に指定します。
-
-  -devcd name    : CD-ROM device名を name にします。
-  -devmidi name  : MIDI device名を name にします。
-
-  -M?            : MIDI の出力の種類を選択します。
-  -Me            : External midi player (default)
-  -Mr            : Raw Midi device
-  -Ms?           : Sequencer device (?:device number)
-  -M0            : disable midi
-
-  -devjoy n      : n 番目の joystick のデバイスを使用します。
-
-  -version       : バージョン情報を表示します。
-
-  -fullscreen    : フルスクリーンでゲームを実行します。
-                   SDL 有効時には Widget にフォーカスが当たらないため Popup
-                   menu 等が使用できません。
-
-  -antialias     : 常に文字にアンチエリアスをかけます。
-
-  -noantialias   : 常に文字にアンチエリアスをかけません。シナリオ上でアンチ
-                   エリアスの指定があっても無視します。
-
-  -devfont       : フォントデバイスを指定します。x11/ft2/sdl のいずれかが
-                   使えます。
-
-  -noimagecursor : リソースファイルによるカーソル形状の変更(Darcrows等)を無効
-                   にしたい場合に指定します。
-
-
-6. その他情報
-
- 6.a. SYSV IPC
-
-    カーネルに SYSV IPC (SharedMemory/MessageQueue/Semaphore)の機能が
-  組み込まれている必要があります。
-
- 6.b. SharedMemoryの大きさについて
-
-   カーネルのSharedMemoryの大きさが十分大きい場合、MIT-SHMを利用して画面を
- 高速に描画する事が出来ます。起動時にエラーが出る場合、カーネルパラメータを
- 変更してみて下さい。(BSD 系はデフォルトの SharedMemory の大きさが小さい
- ようです)
-
- 6.b.1. FreeBSDの場合 /usr/src/sys/i386/conf/LINT 中の
-
-   options         SHMALL=1025
-   options         "SHMMAX=(SHMMAXPGS*PAGE_SIZE+1)"
-   options         SHMMAXPGS=1025
-   options         SHMMIN=2
-   options         SHMMNI=33
-   options         SHMSEG=9
-  「SHMMAXPGS」が関連項目です。
-
-   24bppで起動する場合は SHMMAXPGS=4096 くらいにするとよいようです。
- もちろん設定後はカーネルの再構築が必要です。
-
- 6.c. locale と X
-
-  libc に locale 機構が組み込まれていない環境の場合、libxpg4 などの
-  ライブラリ(FreeBSD) や X の locale を使うことになります。
-
-  linux の libc5 な環境では configure 時に --with-locale=ja_JP.ujis として
-  コンパイルしてください。
-
-  それ以外のほとんどの環境では考慮する必要はないでしょう。
-
-
-7. 著作権とライセンス
-
-   プログラムの著作権は作者(chikama)に属しますが、ソースコードはGPLに基づいて
- 再配付できます。
- (一部のソースコードは私以外に著作権があります。詳しくは、ソースコードを御覧
-  下さい)
-
-   ゲーム内で使われてるカーソルフォントの一部をqvwm(Windows95そっくりのWindow
- Manager)からいただきました。
-
-
-8. サポート
-
-   動作報告・バグ報告などは以下のメールアドレスまでお願いします。
-
-   E-Mail: chikama@nabal.aist-nara.ac.jp     (private)
-           masaki-c@is.aist-nara.ac.jp       (official)
-
-   また最新版は以下のURLからダウンロードできます。
-
-   http://www.aist-nara.ac.jp/~masaki-c/private/unitbase/xsys35/index.html
-
-   バグレポートの際は、お使いの環境を出来るだけくわしく書いて下さい。
- また特定のゲームで動かない場合は、出来るだけセーブデータも添付して下さい。
-
-   プログラムやシナリオデータのバグで 'sigsegv caught @xxx,xxxxx' といって
- 終了する場合は、そのメッセージの部分(xxx,xxxx)も送って下さい。
-
-   可能ならば、./configure で --enable-debug を付けてコンパイルしておき、
- デバッガ上で実行して segmentation fault で止まった時に、bt と打って出てくる
- メッセージを添付していただけるととても助かります。

doc/README.music

@@ -1,307 +0,0 @@
-
-                    xsystem35 における音楽環境について
-
-
-0. もくじ
-  1. MIDIについて
-     a) 外部プレーヤーを使う方法
-       1) xsystem35 側の準備
-       2) プレイヤーの準備
-       3) xsystem35へのリダイレクト
-       4) 制限事項
-     b) 外部 MIDI 音源を /dev/midi 経由で制御する方法
-       1) xsystem35 側の準備
-       2) 外部 MIDI 音源の準備
-     c) Synthesizer 音源を /dev/sequencer 経由で制御する方法
-       1) xsystem35 側の準備
-       2) Synthesizer 音源の準備
-     d) オプション一覧
-  2. 効果音(WAV)について
-     a) OSS 出力
-     b) ALSA 出力
-     c) ESD 出力
-  3. CDオーディオについて
-     a) CD-ROM コントロールによる演奏
-     b) 外部プレイヤ(mp3など)による演奏
-  4. PCM & MIDI(timidity) & CD-ROM(MP3) を１枚のサウンドカードで同時に使う方法
-
- 
-1. MIDIについて
-   
-   xsystem35 では MIDI の演奏に外部プレーヤーを使う方法と、サウンドカードの
- MIDI port を介して接続した外部 MIDI 機器を /dev/midi 経由で制御する方法、
- さらに、synthesizer device を OSS sequencer (/dev/sequencer) 経由で制御する
- 方法の３種類が選択できます。
-
- a) 外部プレーヤーを使う方法
-
-   1) xsystem35 側の準備
-        xsystem35 の configure 実行時に --enable-midi=extp を付けてコンパイル
-      しておきます。
-
-   2) プレイヤーの準備
-        TiMidity や playmidi など、お好みのプレーヤーをお使いください。
-      プレイヤーへはあらかじめパスを通しておき、~/.xsys35rc にプレイヤーと
-      プレイヤーへの引数を記述します。
-  
-       (例) TiMidity を esd 経由で出力する場合
-       midi_player: timidity -A 100 -s 44100 -Oe
-
-   2a) xsystem35へのリダイレクト (オプション)
-        TiMidity を使っている場合、TiMidity の PCM 出力を xsystem35 へとリダ
-      イレクトして xsystem35 側で管理しているPCM デバイスに流す事が出来ます。
-      ~/.xsys35rc の MIDI プレーヤーの設定の際に先頭に '-' をつけて下さい。
-
-      (例)
-       midi_player: -timidity -A 100 -s 44100 -Or -o-
-
-       この場合 timidity の出力は 44.1kHz, Stereo, 16bit 固定です。
-
-   3) 制限事項
-        外部プレイヤーを 使用する場合、MIDIファイルに埋め込まれた system35 用の
-      制御コマンドを実行することができず、リピート再生、ジャンプ再生などが出来
-      ません。このため、ゲームの進行に支障が出ることがあります。
-
-
- b) 外部 MIDI 音源を /dev/midi 経由で制御する方法
-
-   1) xsystem35 側の準備
-        xsystem35 の configure 実行時に --enable-midi=raw を付けてコンパイル
-      しておきます。
-
-   2) 外部 MIDI 音源の準備
-        外部 MIDI 音源(SC-88など)をサウンドカード の MIDI port を介して接続
-      します。このポートは /dev/midi デバイスを介して制御できる必要があります。
-      ALSA OSS Emulation 上で SB-Live の MIDI 端子に接続した SC-88 での動作を
-      確認しています。
-
- c) Synthesizer 音源を /dev/sequencer 経由で制御する方法
-
-   1) xsystem35 側の準備
-        xsystem35 の configure 実行時に --enable-midi=seq を付けてコンパイル
-      しておきます。
-   
-   2) Synthesizer 音源の準備
-        外部 MIDI 機器を接続するか、サウンドカード上に soundfont を load するか
-      TiMidity を ALSA sequencer server として常駐させておいてください。
- 
-      TiMidity を ALSA sequencer server にするには、コンパイル時にその機能を
-      有効にしておき、timidity -iA で常駐させます。
-
- d) オプション一覧
-
-      MIDI 出力に関する、 .xsys35rc の設定項目(A)とコマンドラインオプション(B)
-   をまとめます。
-
-   1) MIDI プレイヤーの設定
-        (A) ----> midi_player:
-        (B) ----> -midiplayer
-
-   2) MIDI デバイスファイルの設定 (default: /dev/midi or /dev/sequencer)
-        (A) ----> midi_device:
-        (B) ----> -devmidi
- 
-   3) MIDI 出力方法の選択 (default: e)
-        (A) ----> midi_output_device: ?
-        (B) ----> -M?
-
-         ? .... e : 外部プレーヤ
-                r : midi device 経由
-                sX: sequencer device 経由 (X番目のポート)
-                0 : (ゼロ) 無効化
-
-      コンパイル時に --enable-midi=extp,raw,seq とすることで、複数の方式を有効
-      にし、実行時にいずれかを選択できます。その他のコンパイルオプションは 
-      INSTALL ドキュメントを御覧ください。
-
-      sequencer device の X 番目のポートは通常、0 ですが、複数のポートがある
-      場合はそのポート番号を指定してください。ALSA の OSS emu では、
-        $ cat /proc/asound/seq/oss 
-      と実行して出て来る
-        midi ?: [xxxx] ALSA port aa:bb
-      の ? の番号を指定します。
-
-      コマンドラインから外部MIDIプレイヤーを指定する場合は
-      -midiplayer "timidity -A 100 -s 44100 -Oe" のようにします。
-
-
-2. 効果音(WAV)について
-
-   xsystem35ではオーディオインターフェイスとして、Linux/*BSD などで良く使われて
- いる OSS およびその互換インターフェイスに加えて、ALSA(Advanced Linux Sound 
- Architecture) と ESD(Enligtened Sound Daemon)に対応しています。
-
- a) OSS 出力
-
-   1) コンパイル
-        configure 時に --enable-audio=oss オプションを付けてコンパイルします。
-
-   2) 実行時オプション
-        コマンドライン: -Oo
-        .xsys35rc     : audio_output_device: o    
-
-   3) dsp デバイス (default: /dev/dsp)
-        コマンドライン: -devdsp
-        .xsys35rc     : dsp_device:
-
-   4) mixer デバイス (default: /dev/mixer)
-        コマンドライン: -devmix 
-        .xsys35rc     : mixer_device:
-
-
- b) ALSA 出力
-
-   1) コンパイル
-        configure 時に --enable-audio=alsa オプションを付けてコンパイルします。
-
-   2) 実行時オプション
-        コマンドライン: -Os
-        .xsys35rc     : audio_output_device: s    
-
-   3) dsp デバイス (default: 0:0)
-        コマンドライン: -devdsp
-        .xsys35rc     : dsp_device:
-
-
- c) ESD 出力
-
-   1) コンパイル
-        configure 時に --enable-audio=esd オプションを付けてコンパイルします。
-
-   2) 実行時オプション
-        コマンドライン: -Oe
-        .xsys35rc     : audio_output_device: e
-
- OSS/ALSA/ESD をすべて有効にしてコンパイルし、実行時にどの出力を使用するか
- 選択できます。configure 時に --enable-audio=oss,alsa,esd としてコンパイル
- してください。
-
-
-3. CDオーディオについて
-
-   CD-ROM の制御には Linux/FreeBSD/Irix のインターフェイスに対応しています。
- また、CD-ROM デバイスを直接制御する他に、外部プレイヤを使って mp3 file など
- を鳴らすことも出来ます。
-
- a) CD-ROM コントロールによる演奏
-      環境によって自動的に適切なドライブが選択されコンパイルされます。
-
- b) 外部プレイヤ(mp3など)による演奏
-      あらかじめ CD を MP3/WAV 化して起きます。また mpg123 などのプレイヤ
-    を用意し、パスを通しておきます。
-
-    1) コンパイル
-      configure 時に --enable-cdrom=mp3 オプションを追加します。CD-ROM 
-    コントロールを実行時に使い分けたい時は --enable-cdrom=linux,mp3 などと
-    します。
-
-    3) プレイヤー名とファイルリストを書いた次のようなファイルを用意します。
-
-      % cat /game/kichiku.playlist
-      mpg123-esd -quite
-      /game/kichiku/mp3/trk02.mp3
-      /game/kichiku/mp3/trk03.mp3
-      /game/kichiku/mp3/trk04.mp3
-      /game/kichiku/mp3/trk05.mp3
-      /game/kichiku/mp3/trk06.mp3
-
-    というようなファイルを用意します。
-    １行目はプレーヤーとそのオプション
-    ２行目以降はトラック２から順にファイルをならべます。(フルパスで指定します)
-
-    *) 適切に外部プレイヤーと演奏ファイルを用意すれば、データ形式は問いません。
-
-    3a)  xsystem35 へのリダイレクト(オプション)
-
-       mpg123 などのプレイヤーのPCM 出力を xsystem35 へとリダイレクトして
-       xsystem35 側で管理しているPCM デバイスに流す事が出来ます。
-       上の kichiku.playlist ファイルのプレイヤの設定で先頭に '-' をつけて
-       ください。
-
-      (例)
-      -mpg123 -q -s
-
-       この場合 mpg123 の出力は 44.1kHz, Stereo, 16bit 固定です。
-
-    4) 実行時オプションに -devcd /game/kichiku.playlist と上で作成したファイル
-     を指定します。
-
-
-
-  CD-ROM に関する .xsys35rc の設定項目(A) と コマンドラインオプション(B) を
-  まとめます。
-
-  1) CD 出力方法の選択
-       (A) ----> cdrom_device: ???
-       (B) ----> -devcd ????
-
-        MP3 出力  => ???? にプレイリストを指定
-        CD-ROM    => ???? にデバイスファイルを指定
-
-  2) CD-ROM デバイスファイルの設定 (defult /dev/cdrom)
-       (A) ----> cdrom_device: ???
-       (B) ----> -devcd: ????
-
-
-4. PCM & MIDI(timidity) & CD-ROM(MP3) を１枚のサウンドカードで同時に使う方法
-   (special thanks to Fumihiko Murata)
-
-   サウンドカードを選ばない方法としては esd を使うことです。esd は対応した複数
- のプログラムの音の出力を合成してサウンドカードに出力するプログラムです。
- xsystem35/timidity/mp3 player を esd 対応にコンパイルすることで合成が可能
- です。
-
-   また、Trident 4DWave DX/NX、SoundBlaster Live/ YAMAHA YMF724以降 などのサウ
- ンドカードは PCM チャンネルを複数持っていて、対応のサウンドドライバーがあれば
- PCMとMIDI(SoftwareMIDI)とMP3 を同時に鳴らすことが出来ます。たとえば 
- SoundBlaster Live + ALSA では
-
- $ cat /proc/asound/pcm 
- 00-00: emu10k1 : EMU10K1 : playback 32 : capture 1
- 00-01: emu10k1 mic : EMU10K1 MIC : capture 1
- 00-02: emu10k1 efx : EMU10K1 EFX : capture 1
-
- のように PCM を 32 チャンネル持っていることが分かります。これは OSS でいうと
- ころの /dev/dspN に最大 32 の PCM がぶら下がっているように見え、同時に 32 回
- /dev/dspN を開くことが出来ます。
-
- また Trident 4DWave DX/NX + ALSA では全部で64chあり、最大で32chを PCM playback
- に割り当てる事ができます。最大チャンネルはモジュールロード時に 設定され、設定
- 数を使いきるまで同時に /dev/dspN を開く事ができます。
-
- 残りの 32ch は MIDI 用に設けられていて、PCM と MIDI の２つのバンクに分ける事
- ができます。個々のチャンネルには PCM front volume がありますが、２つのバンク
- をそれぞれ統括する Wave/Music Volume があり さらにそれらを合わせる PCM volume
- があります。(最後に Master Volume)
-
-  図にすると次のようになります。
-
-  PCM Volume + - Wave Volume  + - front volume- PCM Playback 0
-             |                + -  ..         - PCM Playback 1
-             |                :
-             |                + -  ..         - PCM Playback 31
-             |
-             + - Music Volume + -  ..         - PCM Playback 32
-                              :
-                              + -  ..         - PCM Playback 63
-
-
-   ES1370/1371 でも PCM 用 と MIDI 用に 2 チャンネルの PCM 出力があります。
- ALSA では 
- 
- $ cat /proc/asound/pcm 
- 00-00: ES1371/1 : ES1371 DAC2/ADC : playback 1 : capture 1
- 00-01: ES1371/2 : ES1371 DAC1 : playback 1
- 
- のように 0:0 と 0:1 のデバイスが再生用として使う事が出来ます。timidity 用に
- 0:1 のデバイスを使うと良いでしょう。OSS では /dev/dsp0 と /dev/dsp1 に割り当
- てられ、 /dev/dsp1 を timidity で使います。
-
- またその他のカードでも多チャンネル出力を持っているものもありますので、
- ドライバーのドキュメントを御覧下さい。
-
-
-(2003.1.23 追記)
-  追記を書いている時点で手に入りやすい多チャンネルPCM出力をもつ音源カード
-  としては SoundBlaster Live と YMF7xx くらいでしょうか。
-

doc/TODO

@@ -1,57 +0,0 @@
-TODO (順番は特に無し)
-
- * メンテナンス
-
--- obsolete
-
- * TODOを増やさない
- * SYSTEM3の3.5への移植ものや、ネット上にあるSYSTEM3.5のデータへの対応
- * system 3.9への対応
- * Xのイベントハンドリングの改良
- * oringinal の savedata(v1/v2/v3?) を convert する tool
- * savedata を lt/bg でどっちでも読めるようにする
- * XIM 対応？
- * 関数/変数名の統一
- * 技術情報のドキュメント化
- * GUI付 installer (っていうか、CD-ROMの中の setup.infを直接使う)
- * 異常終了時に出来るだけプロセスが残らないようにする
- * global変数を減らす
- * 意図的な異常シナリオデータでもsegv.らないよう努力する
- * Tab/Spaceの混在などソースの見直し(随時)
- * CEの残りのコマンドをさっさと実装する
- * SDL を理解して cleanup
- * キー入力まわりの cleanup
- * UNIX+X 以外の環境へ移植しやすくする
-
-
- * 王子様1/16 
-    + スケジュールを組む時に「もどる」「クリア」「ＯＫ！」の選択がうまくで
-      きない。
- * ランス４
-    + プチハニーの爆風に巻き込まれると、キャラの上に「防」マークがつきっぱ
-      なしになる。
-    + 戦闘シーンでたまに左上にモンスターのかけらが表示されることがある。
-
-
-DONE
-
- * configure 化
- * gtk_setup.c rewrite
- * keyboard操作対応
- * cd/mp3の切替えをオプションで切替えられるようにする
- * packed 24bpp対応 (rewrite xcore.c)
- * music server cleanup
- * dri mmap化
- * 汎用 data cache 処理を作る。TTF フォントと展開済み CG で使おうか。
- * alphabelnd asm化
- * imgae.c をもうちょっとすっきりと。(depthで関数のテーブル化
- * ecopy のタイミングの最適化 
- * wav が鳴らない事がしばしばある(open err)のを調査＆修正
- * *.h の依存関係 cleanup, 特に xsystem35.h 
- * xcore/imageの統合とcleanup
- * MIDIの自前のハンドリング(/dev/sequener ?)
- * FullScreen対応(with DGA)
- * 古いドキュメントをなんとかする。(FAQ/BUGS etc)
- * 大悪司
-    + SDLの時、MAP選択が正常に動かない。
-

doc/xsystem35.6.adoc

@@ -0,0 +1,155 @@
+= xsystem35(6)
+:doctype: manpage
+:manmanual: xsystem35 manual
+:mansource: xsystem35 {xsystem35-version}
+
+== Name
+
+xsystem35 - play System 3.x games
+
+== SYNOPSIS
+
+*xsystem35* [_OPTION_]...
+
+== DESCRIPTION
+
+This man page describes *xsystem35-sdl2*, a multi-platform port of the
+AliceSoft's System3.5/3.6/3.8/3.9 game engine derived from the original
+*xsystem35*.
+
+`xsystem35` reads the game resource file from the path specified by the
+`-gamefile` option, or from `xsystem35.gr` in the current directory if the
+option is not specified. If the game resource file is not found, `xsystem35`
+finds System 3.x game files (*.ALD) from the current directory.
+
+== OPTIONS
+
+*-gamefile* _file_::
+  Load game resouce file from _file_. See <<FILES>> section for details.
+
+*-game* _game_::
+  Enables game-specific hacks. Usually auto-detected, but must be specified for
+  games with modified / translated titles. Possible values are: `toushin2`,
+  `rance2`, `rance3`, `rance3_eng`, `rance4_eng`, `rance4_v2`, `persiom`,
+  `agake`.
+
+*-savedir* _dir_::
+  Directory to save game state files. If _dir_ begins with '~', it is expanded
+  to the user's home directory (`$HOME`).
+
+*-saveformat* _fmt_::
+  The format when writing save files. Possible values are: `xsystem35`,
+  `system36`, `system39` (default).
+
+*-texthook* _mode_::
+  Set the text hook mode. Possible values are: `none` (default), `print` (print
+  text to console), `copy` (copy text to clipboard).
+
+*-texthook_suppress* _list_::
+  Suppress text hook on specified scenario pages. _list_ is a comma-separated
+  list of page numbers. Used to suppress system messages, etc.
+
+*-censor* _file_::
+  Enable Streamer Mode, which mosaics specific images to make them safe for
+  streaming. The _file_ is a text file containing a list of image numbers
+  to censor, one per line. Lines starting with '#' are treated as comments.
+
+*-renderer* _name_::
+  Use the SDL rendering driver named _name_.
+
+*-playlist* _file_::
+  Load the CD playlist from _file_. The playlist is a text file with one
+  filename per line, in the order of CD tracks. See <<FILES>> section for details.
+
+*-Me*::
+  Use SDL_mixer for MIDI playback.
+
+**-Mp**_device_number_::
+  Use ALSA (via PortMidi) for MIDI playback.
+
+*-M0*::
+  Disable MIDI playback.
+
+*-devjoy* _device_index_::
+  Use the joystick device with the given index.
+
+*-ttfont_mincho* _file_::
+  Use the given TrueType or OpenType font file for mincho (serif) text.
+
+*-ttfont_gothic* _file_::
+  Use the given TrueType or OpenType font file for gothic (sans-serif) text.
+
+*-debuglv* _level_::
+  Set the debug level to _level_. The higher the level, the more verbose
+  the debug output.
+
+*-debug*::
+  Start with the debugger enabled.
+
+*-noantialias*::
+  Disable text antialiasing.
+
+*-fullscreen*::
+  Start in fullscreen mode.
+
+*-integerscale*::
+  Use integer scaling for the window.
+
+*-noimagecursor*::
+  Disable custom mouse cursor images.
+
+*-version*::
+  Print the version number and exit.
+
+*-h, --help*::
+    Print a help message and exit.
+
+== FILES
+
+*.xsys35rc*::
+  `xsystem35` reads its configuration from `${HOME}/.xsys35rc` and `.xsys35rc`
+  in the game directory. The latter takes precedence over the former, so you
+  can put general settings in `${HOME}/.xsys35rc` and game-specific settings in
+  `.xsys35rc` in the game directory. Options specified on the command line
+  override both. See xsys35rc.sample for the format of the configuration file.
+
+*playlist.txt*::
+  `xsystem35` does not support playing BGM directly from a CD. Instead, it
+  supports playing BGM from audio files on your filesystem. `xsystem35` reads
+  the playlist from a file specified by the `-playlist` option, or from
+  `playlist.txt` in the game directory. The first line is the path to the audio
+  file for track 1, the second line is the path to the audio file for track 2,
+  and so on. The first line is usually empty, because track 1 is not an audio
+  track but a data track.
+
+*xsystem35.gr*::
+  Game resource file which lists the locations of various files needed to run
+  a game. This is optional; `xsystem35` can automatically find the files it
+  needs when run inside a game directory. See
+  xref:xsystem35.gr.adoc[*xsystem35.gr(5)*] for the format of the game resource
+  file.
+
+== KEYBOARD SHORTCUTS
+
+System 3.x games basically only use the UP, DOWN, LEFT, RIGHT, SPACE, RET, ESC,
+and TAB keys (some games use other keys). `xsystem35` uses the following
+special key assignments:
+
+*F1*::
+  Toggle message skip mode.
+
+*F4*::
+  Toggle fullscreen mode.
+
+Also, in some platforms, the middle mouse button opens the menu.
+
+== HISTORY
+
+*xsystem35* was originally developed by Masaki Chikama (Wren)
+<masaki-c@is.aist-nara.ac.jp> between 1998 and 2006. The project was later
+forked by Kichikuou <KichikuouChrome@gmail.com> as *xsystem35-sdl2* and ported
+to SDL2.
+
+== SEE ALSO
+
+xsystem35-sdl2 project page: https://github.com/kichikuou/xsystem35-sdl2

doc/xsystem35.gr.5.adoc

@@ -0,0 +1,103 @@
+= xsystem35.gr(5)
+:doctype: manpage
+:manmanual: xsystem35 manual
+:mansource: xsystem35 {xsystem35-version}
+
+== Name
+
+xsystem35.gr - game resource file for xsystem35
+
+== DESCRIPTION
+
+Game resource file is a plain text file that defines the locations of the
+various game data files for xsystem35. This file is only needed if you want to
+place game data files in a location other than the current directory.
+
+The path to the game resource file is specified with the `-gamefile` option of
+xref:xsystem35.adoc[*xsystem35(6)*]. If it is not specified, xsystem35 reads
+`xsystem35.gr` in the current directory.
+
+Each line of the file specifies a single data file and follows the format:
+
+_keyword_ _path-to-data_
+
+If multiple files of the same type exist, suffixes `A`, `B`, `C`... are
+appended to the _keyword_.
+
+Comments can be added by starting the line with `#`. Blank lines are ignored.
+
+== KEYWORDS
+
+*Scenario*::
+  Scenario files (`*S?.ALD`).
+
+*Graphics*::
+  Graphic files (`*G?.ALD`).
+
+*Wave*::
+  PCM data files (`*W?.ALD`).
+
+*Midi*::
+  MIDI data files (`*M?.ALD`).
+
+*Data*::
+  Miscellaneous data files (`*D?.ALD`).
+
+*Resource*::
+  Resource files (`*R?.ALD`).
+
+*BGM*::
+  BGM files (`*B?.ALD`).
+
+*Save*::
+  Save files (`*S?.ASD`). If the path begins with '`~`', it is expanded to the
+  user's home directory (`$HOME`).
+
+*Ain*::
+  The `System39.ain` file.
+
+*WAI*::
+  Additional information for PCM data (`*WA.WAI`)
+
+*BGI*::
+  Additional information for BGM data (`*BA.BGI`)
+
+*SACT01*::
+  Data for SACT.DLL (`SACTEFAM.KLD`)
+
+*ALK01* - *ALK09*::
+  Archive files for demo data (`*1.ALK` - `*9.ALK`)
+
+*Init*::
+  The `System39.ini` file.
+
+== NOTES
+
+Data files not categorized under the above keywords (e.g., map files for
+Kaeru nyo Panyon) should not be listed in the game resource file, and should be
+placed in the same directory as the save files.
+
+== EXAMPLES
+
+The following is a game resource file for the English translation of Kichikuou
+Rance.
+
+  ScenarioA KICHIKUSA.ALD
+  GraphicsA KICHIKUGA.ALD
+  GraphicsB KICHIKUGB.ALD
+  WaveA KICHIKUWA.ALD
+  Ain System39.ain
+  SaveA ~/.xsys35/saves/kichikuou/KICHIKUSA.ASD
+  SaveB ~/.xsys35/saves/kichikuou/KICHIKUSB.ASD
+  SaveC ~/.xsys35/saves/kichikuou/KICHIKUSC.ASD
+  SaveD ~/.xsys35/saves/kichikuou/KICHIKUSD.ASD
+  SaveE ~/.xsys35/saves/kichikuou/KICHIKUSE.ASD
+  SaveF ~/.xsys35/saves/kichikuou/KICHIKUSF.ASD
+  SaveG ~/.xsys35/saves/kichikuou/KICHIKUSG.ASD
+  SaveH ~/.xsys35/saves/kichikuou/KICHIKUSH.ASD
+  SaveI ~/.xsys35/saves/kichikuou/KICHIKUSI.ASD
+  SaveJ ~/.xsys35/saves/kichikuou/KICHIKUSJ.ASD
+
+== SEE ALSO
+
+xref:xsystem35.adoc[*xsystem35(6)*]

fonts/CMakeLists.txt

@@ -1,8 +1,6 @@
 install(FILES
   MTLc3m.ttf
-  MTLc3m.ttf.license
-  mincho.otf
-  mincho.otf.license
+  mincho.ttf
   DESTINATION share/xsystem35/fonts)
 
 # pyftsubset is included in fonttools.
@@ -11,8 +9,9 @@ find_program(PYFTSUBSET_FOUND pyftsubset)
 if (PYFTSUBSET_FOUND)
   add_custom_target(fonts
     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
+    COMMAND wget -O ipam.zip https://moji.or.jp/wp-content/ipafont/IPAfont/ipam00303.zip
+    COMMAND unzip -o -j ipam.zip ipam00303/ipam.ttf
+    COMMAND pyftsubset ipam.ttf --text-file=uchars.txt --output-file=subset.ttf
+    COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/rename_font.py subset.ttf ${CMAKE_CURRENT_SOURCE_DIR}/mincho.ttf
     )
 endif()

fonts/adjust_metrics.py

@@ -1,22 +0,0 @@
-#!/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])

fonts/mincho.otf.license

@@ -1,92 +0,0 @@
-This Font Software is licensed under the SIL Open Font License,
-Version 1.1.
-
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font
-creation efforts of academic and linguistic communities, and to
-provide a free and open framework in which fonts may be shared and
-improved in partnership with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded,
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply to
-any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software
-components as distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to,
-deleting, or substituting -- in part or in whole -- any of the
-components of the Original Version, by changing formats or by porting
-the Font Software to a new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed,
-modify, redistribute, and sell modified and unmodified copies of the
-Font Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components, in
-Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the
-corresponding Copyright Holder. This restriction only applies to the
-primary font name as presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created using
-the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.

fonts/rename_font.py

@@ -0,0 +1,33 @@
+#!/usr/bin/env python3
+# Rename the font's internal name records.
+#
+# IPA明朝 is distributed under the IPA Font License v1.0. A subset of it is a
+# "Derived Program" under that license, and Article 3.1(4) forbids using or
+# including the Licensed Program's name ("IPA"/"IPAMincho") as the program,
+# font, or file name of the Derived Program. pyftsubset preserves the original
+# name table, so rename it here to a name that does not contain "IPA".
+import sys
+from fontTools.ttLib import TTFont
+
+if len(sys.argv) != 3:
+    print('Usage: rename_font.py infile outfile')
+    exit(1)
+
+FAMILY = 'xsystem35 Mincho'
+PSNAME = 'xsystem35-Mincho'
+
+font = TTFont(sys.argv[1])
+name = font['name']
+
+# Rewrite the family / full / typographic-family / PostScript / unique-ID
+# records in place, preserving each record's platform, encoding and language.
+for rec in list(name.names):
+    if rec.nameID in (1, 4, 16):
+        value = FAMILY
+    elif rec.nameID in (3, 6):
+        value = PSNAME
+    else:
+        continue
+    name.setName(value, rec.nameID, rec.platformID, rec.platEncID, rec.langID)
+
+font.save(sys.argv[2])

game_compatibility.md

@@ -4,12 +4,12 @@ Game Compatibility
 |                 Game                        |   Status    | Notes |
 | ------------------------------------------- | ----------- | ----- |
 | 鬼畜王ランス                                | Supported   |       |
-| Kichikuou Rance (EN)                        | Supported   |       |
-| RanceIV －教団の遺産－                      | Supported   | Win95 edition, [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) |
-| ランス4.2                                   | Supported   | [Ver1.05](https://hannylaboratory.blogspot.com/2023/02/blog-post_9.html) |
+| Kichikuou Rance (EN)                        | Supported   | Fan translation |
+| RanceIV －教団の遺産－                      | Supported   | Win95 edition and [Ver2.05](https://hannylaboratory.blogspot.com/2023/01/blog-post_26.html) |
+| Rance4 -Legacy of the Sect- (EN)            | Supported   | Fan translation |
+| 兰斯IV －教团的遗产－ (CN)                  | Supported   | Fan translation |
+| ランス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 |
@@ -42,7 +42,7 @@ Game Compatibility
 | これD・P・S？                               | Supported   | From 20世紀アリス |
 | 夜が来る！                                  | Unsupported |       |
 | Only you ～リ・クルス～                     | Supported   |       |
-| 大悪司                                      | Supported   | Opening demo is not supported |
+| 大悪司                                      | Supported   |       |
 | 王子さまＬｖ１                              | Supported   |       |
 | 王子さま１ヵ月後                            | Supported   | From 王子さまLV1.5 |
 | 白鳳の子分叩き                              | Supported   | From 王子さまLV1.5 |
@@ -52,15 +52,17 @@ Game Compatibility
 | 妻みぐい                                    | 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 |
+| Rance 5D - The Lonely Girl (EN)             | Supported   | MangaGamer version |
+| 俺の下であがけ                              | Supported   |       |
+| 楽園行                                      | Supported   |       |
+| 妻みぐい２                                  | Supported   |       |
 | シェル・クレイル                            | Supported   |       |
 | ナイトデーモン                              | Supported   |       |
+| Nor                                         | Unsupported |       |
+| 翡翠の眸                                    | Unsupported |       |
 | 学園KING                                    | Supported   | From アリスCD |
 | 学園KING 番外編                             | Supported   | From アリスCD |
-| 蒼海に墜ちて                                | Supported   | From アリスCD |
+| 蒼海に堕ちて…                               | Supported   | From アリスCD |
 | ぶろぶろ                                    | Supported   | From アリスCD |
 | 裸ぶろぶろ狂                                | Supported   | From アリスCD |
 | メイドのススメ                              | Supported   | From アリスCD |
@@ -76,7 +78,7 @@ Game Compatibility
 | マスカレイド                                | Supported   | From アリスCD |
 | キャロル ～聖なる鐘が響く夜～               | Supported   | From アリスCD, Online match is not supported |
 | できるかなー？                              | Supported   | From アリスCD |
-| Child Assassin                              | Supported   | From アリスCD |
+| Child Assassin                              | Unsupported | From アリスCD |
 | Klavier                                     | Supported   | From アリスCD |
 | 弱肉狂食                                    | Supported   | From アリスCD |
 | 眼鏡大戦２                                  | Supported   | From アリスCD |

licenses/mincho.txt

@@ -0,0 +1,117 @@
+--------------------------------------------------
+IPA Font License Agreement v1.0 <Japanese/English>
+--------------------------------------------------
+
+IPAフォントライセンスv1.0
+
+許諾者は、この使用許諾（以下「本契約」といいます。）に定める条件の下で、許諾プログラム（1条に定義するところによります。）を提供します。受領者（1条に定義するところによります。）が、許諾プログラムを使用し、複製し、または頒布する行為、その他、本契約に定める権利の利用を行った場合、受領者は本契約に同意したものと見なします。
+
+
+第1条　用語の定義
+
+本契約において、次の各号に掲げる用語は、当該各号に定めるところによります。
+
+1.「デジタル･フォント･プログラム」とは、フォントを含み、レンダリングしまたは表示するために用いられるコンピュータ・プログラムをいいます。
+2.「許諾プログラム」とは、許諾者が本契約の下で許諾するデジタル･フォント･プログラムをいいます。
+3.「派生プログラム」とは、許諾プログラムの一部または全部を、改変し、加除修正等し、入れ替え、その他翻案したデジタル･フォント･プログラムをいい、許諾プログラムの一部もしくは全部から文字情報を取り出し、またはデジタル･ドキュメント･ファイルからエンベッドされたフォントを取り出し、取り出された文字情報をそのまま、または改変をなして新たなデジタル・フォント・プログラムとして製作されたものを含みます。
+4.「デジタル・コンテンツ」とは、デジタル・データ形式によってエンド・ユーザに提供される制作物のことをいい、動画・静止画等の映像コンテンツおよびテレビ番組等の放送コンテンツ、ならびに文字テキスト、画像、図形等を含んで構成された制作物を含みます。
+5.「デジタル・ドキュメント・ファイル」とは、PDFファイルその他、各種ソフトウェア･プログラムによって製作されたデジタル・コンテンツであって、その中にフォントを表示するために許諾プログラムの全部または一部が埋め込まれた（エンベッドされた）ものをいいます。フォントが「エンベッドされた」とは、当該フォントが埋め込まれた特定の「デジタル・ドキュメント・ファイル」においてのみ表示されるために使用されている状態を指し、その特定の「デジタル・ドキュメント・ファイル」以外でフォントを表示するために使用できるデジタル・フォント・プログラムに含まれている場合と区別されます。
+6.「コンピュータ｣とは、本契約においては、サーバを含みます。
+7.「複製その他の利用」とは、複製、譲渡、頒布、貸与、公衆送信、上映、展示、翻案その他の利用をいいます。
+8.「受領者」とは、許諾プログラムを本契約の下で受領した人をいい、受領者から許諾プログラムを受領した人を含みます。
+
+第２条 使用許諾の付与
+
+許諾者は受領者に対し、本契約の条項に従い、すべての国で、許諾プログラムを使用することを許諾します。ただし、許諾プログラムに存在する一切の権利はすべて許諾者が保有しています。本契約は、本契約で明示的に定められている場合を除き、いかなる意味においても、許諾者が保有する許諾プログラムに関する一切の権利および、いかなる商標、商号、もしくはサービス・マークに関する権利をも受領者に移転するものではありません。
+
+1.受領者は本契約に定める条件に従い、許諾プログラムを任意の数のコンピュータにインストールし、当該コンピュータで使用することができます。
+2.受領者はコンピュータにインストールされた許諾プログラムをそのまま、または改変を行ったうえで、印刷物およびデジタル・コンテンツにおいて、文字テキスト表現等として使用することができます。
+3.受領者は前項の定めに従い作成した印刷物およびデジタル・コンテンツにつき、その商用・非商用の別、および放送、通信、各種記録メディアなどの媒体の形式を問わず、複製その他の利用をすることができます。
+4.受領者がデジタル・ドキュメント・ファイルからエンベッドされたフォントを取り出して派生プログラムを作成した場合には、かかる派生プログラムは本契約に定める条件に従う必要があります。
+5.許諾プログラムのエンベッドされたフォントがデジタル・ドキュメント・ファイル内のデジタル・コンテンツをレンダリングするためにのみ使用される場合において、受領者が当該デジタル・ドキュメント・ファイルを複製その他の利用をする場合には、受領者はかかる行為に関しては本契約の下ではいかなる義務をも負いません。
+6.受領者は、3条2項の定めに従い、商用・非商用を問わず、許諾プログラムをそのままの状態で改変することなく複製して第三者への譲渡し、公衆送信し、その他の方法で再配布することができます(以下、「再配布」といいます。)。
+7.受領者は、上記の許諾プログラムについて定められた条件と同様の条件に従って、派生プログラムを作成し、使用し、複製し、再配布することができます。ただし、受領者が派生プログラムを再配布する場合には、3条1項の定めに従うものとします。
+
+第３条　制限
+
+前条により付与された使用許諾は、以下の制限に服します。
+
+1.派生プログラムが前条4項及び7項に基づき再配布される場合には、以下の全ての条件を満たさなければなりません。
+　(1)派生プログラムを再配布する際には、下記もまた、当該派生プログラムと一緒に再配布され、オンラインで提供され、または、郵送費・媒体及び取扱手数料の合計を超えない実費と引き換えに媒体を郵送する方法により提供されなければなりません。
+　　(a)派生プログラムの写し; および
+　　(b)派生プログラムを作成する過程でフォント開発プログラムによって作成された追加のファイルであって派生プログラムをさらに加工するにあたって利用できるファイルが存在すれば、当該ファイル
+　(2)派生プログラムの受領者が、派生プログラムを、このライセンスの下で最初にリリースされた許諾プログラム（以下、「オリジナル・プログラム」といいます。）に置き換えることができる方法を再配布するものとします。かかる方法は、オリジナル・ファイルからの差分ファイルの提供、または、派生プログラムをオリジナル・プログラムに置き換える方法を示す指示の提供などが考えられます。
+　(3)派生プログラムを、本契約書に定められた条件の下でライセンスしなければなりません。
+　(4)派生プログラムのプログラム名、フォント名またはファイル名として、許諾プログラムが用いているのと同一の名称、またはこれを含む名称を使用してはなりません。
+　(5)本項の要件を満たすためにオンラインで提供し、または媒体を郵送する方法で提供されるものは、その提供を希望するいかなる者によっても提供が可能です。
+2.受領者が前条6項に基づき許諾プログラムを再配布する場合には、以下の全ての条件を満たさなければなりません。
+　(1)許諾プログラムの名称を変更してはなりません。
+　(2)許諾プログラムに加工その他の改変を加えてはなりません。
+　(3)本契約の写しを許諾プログラムに添付しなければなりません。
+3.許諾プログラムは、現状有姿で提供されており、許諾プログラムまたは派生プログラムについて、許諾者は一切の明示または黙示の保証（権利の所在、非侵害、商品性、特定目的への適合性を含むがこれに限られません）を行いません。いかなる場合にも、その原因を問わず、契約上の責任か厳格責任か過失その他の不法行為責任かにかかわらず、また事前に通知されたか否かにかかわらず、許諾者は、許諾プログラムまたは派生プログラムのインストール、使用、複製その他の利用または本契約上の権利の行使によって生じた一切の損害（直接・間接・付随的・特別・拡大・懲罰的または結果的損害）（商品またはサービスの代替品の調達、システム障害から生じた損害、現存するデータまたはプログラムの紛失または破損、逸失利益を含むがこれに限られません）について責任を負いません。
+4.許諾プログラムまたは派生プログラムのインストール、使用、複製その他の利用に関して、許諾者は技術的な質問や問い合わせ等に対する対応その他、いかなるユーザ・サポートをも行う義務を負いません。
+
+第４条　契約の終了
+
+1.本契約の有効期間は、受領者が許諾プログラムを受領した時に開始し、受領者が許諾プログラムを何らかの方法で保持する限り続くものとします。
+2.前項の定めにかかわらず、受領者が本契約に定める各条項に違反したときは、本契約は、何らの催告を要することなく、自動的に終了し、当該受領者はそれ以後、許諾プログラムおよび派生プログラムを一切使用しまたは複製その他の利用をすることができないものとします。ただし、かかる契約の終了は、当該違反した受領者から許諾プログラムまたは派生プログラムの配布を受けた受領者の権利に影響を及ぼすものではありません。
+
+第５条　準拠法
+
+1.IPAは、本契約の変更バージョンまたは新しいバージョンを公表することができます。その場合には、受領者は、許諾プログラムまたは派生プログラムの使用、複製その他の利用または再配布にあたり、本契約または変更後の契約のいずれかを選択することができます。その他、上記に記載されていない条項に関しては日本の著作権法および関連法規に従うものとします。
+2.本契約は、日本法に基づき解釈されます。
+
+
+----------
+
+IPA Font License Agreement v1.0
+
+The Licensor provides the Licensed Program (as defined in Article 1 below) under the terms of this license agreement (“Agreement”).  Any use, reproduction or distribution of the Licensed Program, or any exercise of rights under this Agreement by a Recipient (as defined in Article 1 below) constitutes the Recipient's acceptance of this Agreement. 
+
+Article 1 (Definitions)
+1.“Digital Font Program” shall mean a computer program containing, or used to render or display fonts.
+2.“Licensed Program” shall mean a Digital Font Program licensed by the Licensor under this Agreement.
+3.“Derived Program” shall mean a Digital Font Program created as a result of a modification, addition, deletion, replacement or any other adaptation to or of a part or all of the Licensed Program, and includes a case where a Digital Font Program newly created by retrieving font information from a part or all of the Licensed Program or Embedded Fonts from a Digital Document File with or without modification of the retrieved font information. 
+4.“Digital Content” shall mean products provided to end users in the form of digital data, including video content, motion and/or still pictures, TV programs or other broadcasting content and products consisting of character text, pictures, photographic images, graphic symbols and/or the like.
+5.“Digital Document File” shall mean a PDF file or other Digital Content created by various software programs in which a part or all of the Licensed Program becomes embedded or contained in the file for the display of the font (“Embedded Fonts”).  Embedded Fonts are used only in the display of characters in the particular Digital Document File within which they are embedded, and shall be distinguished from those in any Digital Font Program, which may be used for display of characters outside that particular Digital Document File.
+6.“Computer” shall include a server in this Agreement.
+7.“Reproduction and Other Exploitation” shall mean reproduction, transfer, distribution, lease, public transmission, presentation, exhibition, adaptation and any other exploitation.
+8.“Recipient” shall mean anyone who receives the Licensed Program under this Agreement, including one that receives the Licensed Program from a Recipient.
+
+Article 2 (Grant of License)
+The Licensor grants to the Recipient a license to use the Licensed Program in any and all countries in accordance with each of the provisions set forth in this Agreement. However, any and all rights underlying in the Licensed Program shall be held by the Licensor. In no sense is this Agreement intended to transfer any right relating to the Licensed Program held by the Licensor except as specifically set forth herein or any right relating to any trademark, trade name, or service mark to the Recipient.
+
+1.The Recipient may install the Licensed Program on any number of Computers and use the same in accordance with the provisions set forth in this Agreement.
+2.The Recipient may use the Licensed Program, with or without modification in printed materials or in Digital Content as an expression of character texts or the like.
+3.The Recipient may conduct Reproduction and Other Exploitation of the printed materials and Digital Content created in accordance with the preceding Paragraph, for commercial or non-commercial purposes and in any form of media including but not limited to broadcasting, communication and various recording media.
+4.If any Recipient extracts Embedded Fonts from a Digital Document File to create a Derived Program, such Derived Program shall be subject to the terms of this agreement.
+5.If any Recipient performs Reproduction or Other Exploitation of a Digital Document File in which Embedded Fonts of the Licensed Program are used only for rendering the Digital Content within such Digital Document File then such Recipient shall have no further obligations under this Agreement in relation to such actions.
+6.The Recipient may reproduce the Licensed Program as is without modification and transfer such copies, publicly transmit or otherwise redistribute the Licensed Program to a third party for commercial or non-commercial purposes (“Redistribute”), in accordance with the provisions set forth in Article 3 Paragraph 2.
+7.The Recipient may create, use, reproduce and/or Redistribute a Derived Program under the terms stated above for the Licensed Program: provided, that the Recipient shall follow the provisions set forth in Article 3 Paragraph 1 when Redistributing the Derived Program. 
+
+Article 3 (Restriction)
+The license granted in the preceding Article shall be subject to the following restrictions:
+
+1.If a Derived Program is Redistributed pursuant to Paragraph 4 and 7 of the preceding Article, the following conditions must be met :
+　(1)The following must be also Redistributed together with the Derived Program, or be made available online or by means of mailing mechanisms in exchange for a cost which does not exceed the total costs of postage, storage medium and handling fees:
+　　(a)a copy of the Derived Program; and
+　　(b)any additional file created by the font developing program in the course of creating the Derived Program that can be used for further modification of the Derived Program, if any. 
+　(2)It is required to also Redistribute means to enable recipients of the Derived Program to replace the Derived Program with the Licensed Program first released under this License (the “Original Program”).  Such means may be to provide a difference file from the Original Program, or instructions setting out a method to replace the Derived Program with the Original Program. 
+　(3)The Recipient must license the Derived Program under the terms and conditions of this Agreement.
+　(4)No one may use or include the name of the Licensed Program as a program name, font name or file name of the Derived Program. 
+　(5)Any material to be made available online or by means of mailing a medium to satisfy the requirements of this paragraph may be provided, verbatim, by any party wishing to do so.
+2.If the Recipient Redistributes the Licensed Program pursuant to Paragraph 6 of the preceding Article, the Recipient shall meet all of the following conditions:
+　(1)The Recipient may not change the name of the Licensed Program.
+　(2)The Recipient may not alter or otherwise modify the Licensed Program.
+　(3)The Recipient must attach a copy of this Agreement to the Licensed Program.
+3.THIS LICENSED PROGRAM IS PROVIDED BY THE LICENSOR “AS IS” AND ANY EXPRESSED OR IMPLIED WARRANTY AS TO THE LICENSED PROGRAM OR ANY DERIVED PROGRAM, INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE, ARE DISCLAIMED.  IN NO EVENT SHALL THE LICENSOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXTENDED, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO; PROCUREMENT OF SUBSTITUTED GOODS OR SERVICE; DAMAGES ARISING FROM SYSTEM FAILURE; LOSS OR CORRUPTION OF EXISTING DATA OR PROGRAM; LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE INSTALLATION, USE, THE REPRODUCTION OR OTHER EXPLOITATION OF THE LICENSED PROGRAM OR ANY DERIVED PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+4.The Licensor is under no obligation to respond to any technical questions or inquiries, or provide any other user support in connection with the installation, use or the Reproduction and Other Exploitation of the Licensed Program or Derived Programs thereof.
+
+Article 4 (Termination of Agreement)
+1.The term of this Agreement shall begin from the time of receipt of the Licensed Program by the Recipient and shall continue as long as the Recipient retains any such Licensed Program in any way.
+2.Notwithstanding the provision set forth in the preceding Paragraph, in the event of the breach of any of the provisions set forth in this Agreement by the Recipient, this Agreement shall automatically terminate without any notice. In the case of such termination, the Recipient may not use or conduct Reproduction and Other Exploitation of the Licensed Program or a Derived Program: provided that such termination shall not affect any rights of any other Recipient receiving the Licensed Program or the Derived Program from such Recipient who breached this Agreement.
+
+Article 5 (Governing Law)
+1.IPA may publish revised and/or new versions of this License.  In such an event, the Recipient may select either this Agreement or any subsequent version of the Agreement in using, conducting the Reproduction and Other Exploitation of, or Redistributing the Licensed Program or a Derived Program. Other matters not specified above shall be subject to the Copyright Law of Japan and other related laws and regulations of Japan.
+2.This Agreement shall be construed under the laws of Japan.
+

licenses/nanojpeg.txt

@@ -0,0 +1,22 @@
+// NanoJPEG -- KeyJ's Tiny Baseline JPEG Decoder
+// version 1.3.5 (2016-11-14)
+// Copyright (c) 2009-2016 Martin J. Fiedler <martin.fiedler@gmx.net>
+// published under the terms of the MIT license
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to
+// deal in the Software without restriction, including without limitation the
+// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+// sell copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.

misc/censor/README.md

@@ -0,0 +1,21 @@
+# Censor Lists for Streamer Mode
+
+This directory contains sample censor lists for various games, intended for use
+with xsystem35's Streamer Mode.
+
+## Usage
+
+To use a censor list, specify its path with the `-censor` command-line option
+or in your `.xsys35rc` file. For example:
+
+```bash
+xsystem35 -censor misc/censor/kichikuou.txt
+```
+
+The list files contain image numbers (integers), one per line. Lines starting
+with `#` are treated as comments.
+
+## Contributing
+
+We welcome contributions of censor lists for other games! If you have created
+a censor list that you'd like to share, please open a Pull Request.

misc/censor/kichikuou.txt

@@ -0,0 +1,164 @@
+# Censor list for 鬼畜王ランス (Kichikuou Rance)
+27
+70
+93
+101
+102
+103
+106
+107
+108
+109
+110
+111
+112
+113
+114
+115
+116
+117
+118
+119
+120
+121
+123
+124
+125
+126
+127
+128
+129
+130
+131
+132
+133
+134
+136
+137
+138
+139
+140
+141
+142
+143
+144
+145
+146
+147
+148
+149
+150
+151
+152
+153
+154
+155
+156
+157
+158
+160
+161
+162
+163
+164
+165
+166
+167
+168
+169
+171
+172
+174
+175
+176
+177
+178
+179
+180
+181
+182
+183
+184
+185
+186
+187
+188
+189
+190
+191
+193
+195
+196
+197
+198
+199
+200
+201
+203
+204
+205
+206
+207
+208
+209
+210
+214
+215
+216
+217
+218
+219
+221
+222
+224
+225
+226
+227
+228
+229
+230
+231
+232
+233
+234
+235
+239
+299
+300
+361
+362
+363
+375
+376
+377
+393
+422
+461
+466
+500
+501
+502
+503
+504
+505
+506
+507
+508
+509
+510
+511
+512
+513
+514
+515
+517
+844
+845
+846
+847
+848
+851
+852
+853
+854
+855

modules/AliceLogo/AliceLogo.c

@@ -16,21 +16,21 @@ static void Init() {
 	
 	*var = 1;
 	
-	DEBUG_COMMAND_YET("AliceLogo.Init %d,%d,%d,%p:", p1, p2, p3, var);
+	TRACE_UNIMPLEMENTED("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:", p1, p2);
+	TRACE_UNIMPLEMENTED("AliceLogo.SetWaveNum %d,%d:", p1, p2);
 }
 
 static void Run() {
 	int p1 = getCaliValue();
 	int p2 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("AliceLogo.Run %d,%d:", p1, p2);
+	TRACE_UNIMPLEMENTED("AliceLogo.Run %d,%d:", p1, p2);
 }
 
 static const ModuleFunc functions[] = {

modules/CMakeLists.txt

@@ -5,12 +5,16 @@ add_library(modules STATIC
   AliceLogo/AliceLogo.c
   Confirm/Confirm.c
   Gpx/Gpx.c
+  Gpx/cg.c
   Gpx/effectcopy.c
+  Gpx/graph_copy_amap.c
+  Gpx/graph_fillrect_amap.c
+  Gpx/graph.c
+  Gpx/surface.c
   Math/Math.c
   MsgSkip/MsgSkip.c
   NIGHTDLL/NIGHTDLL.c
   NIGHTDLL/nt_scenario.c
-  NIGHTDLL/sactcg.c
   NIGHTDLL/sactstring.c
   NIGHTDLL/sprite.c
   NIGHTDLL/sprite_draw.c
@@ -23,8 +27,8 @@ add_library(modules STATIC
   NIGHTDLL/nt_sound.c
   NightDemonDemo/NightDemonDemo.c
   RandMT/RandMT.c
+  S3xMusic/S3xMusic.c
   SACT/SACT.c
-  SACT/sactcg.c
   SACT/sactsound.c
   SACT/sacttimer.c
   SACT/sactstring.c
@@ -60,27 +64,9 @@ add_library(modules STATIC
   eeDemo/eeDemo.c
   lib/alk.c
   lib/drawtext.c
-  lib/graph.c
   lib/list.c
-  lib/surface.c
-  lib/cg.c
-  lib/graph_expandcolor_blend.c
-  lib/graph_fillrect.c
-  lib/graph_fillrect_amap.c
-  lib/graph_fillrect_acolor.c
-  lib/graph_rect.c
-  lib/graph_copy.c
-  lib/graph_copy_amap.c
-  lib/graph_copy_bright.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/gre_blend_useamap.c
-  lib/gre_blend.c
-  lib/gre_blend_screen.c
+  lib/sactcg.c
   nDEMO/nDEMO.c
   nDEMOE/nDEMOE.c
   oDEMO/oDEMO.c

modules/Confirm/Confirm.c

@@ -10,7 +10,7 @@
 static void Init() {
 	int p1 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("Confirm.Init %d:", p1);
+	TRACE_UNIMPLEMENTED("Confirm.Init %d:", p1);
 }
 
 static void ExistKeyFile() {
@@ -20,7 +20,7 @@ static void ExistKeyFile() {
 	
 	*var = 1;
 	
-	DEBUG_COMMAND_YET("Confirm.ExistKeyFile %s,%p,%p:",p1, p2, var);
+	TRACE_UNIMPLEMENTED("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:", p1,p2,var);
+	TRACE_UNIMPLEMENTED("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:", p1,p2,var);
+	TRACE_UNIMPLEMENTED("Confirm.CreateKeyFile %s,%p,%p:", p1,p2,var);
 }
 
 static const ModuleFunc functions[] = {

modules/Gpx/Gpx.c

@@ -42,7 +42,7 @@
 // #include "alpha_plane.h"
 #include "surface.h"
 #include "graph.h"
-// #include "graph2.h"
+#include "graph_blend_amap.h"
 
 #include "effectcopy.h"
 #include "ngraph.h"
@@ -68,37 +68,19 @@ static int find_null_surface() {
 	return 0;
 }
 
-static int sf_free_one(int no) {
-	surface_t *s;
-	if (no == 0) return NG;
-	
-	s = suf[no];
-	if (s == NULL) return NG;
-	
-	if (s->pixel) free(s->pixel);
-	if (s->alpha) free(s->alpha);
-	free(s);
-	
+static void sf_free_one(int no) {
+	if (no == 0 || !suf[no]) return;
+	sf_free(suf[no]);
 	suf[no] = NULL;
 	pre_freesurfno = no;
-	return OK;
 }
 
-static int sf_free_all() {
-	int i;
-	surface_t *s;
-	
-	for (i = 1; i < MAX_SURFACE; i++) {
-		if (suf[i] == NULL) continue;
-		s = suf[i];
-		if (s->pixel) free(s->pixel);
-		if (s->alpha) free(s->alpha);
-		free(s);
+static void sf_free_all() {
+	for (int i = 1; i < MAX_SURFACE; i++) {
+		sf_free(suf[i]);
 		suf[i] = NULL;
 	}
-	
 	pre_freesurfno = 1;
-	return OK;
 }
 
 static surface_t *sf_get(int no) {
@@ -136,7 +118,7 @@ static void Init() {
 	// surface0 を pre_freesurfno として返さないように。
 	pre_freesurfno = 1;
 	
-	DEBUG_COMMAND("Gpx.Init %d:", p1);
+	TRACE("Gpx.Init %d:", p1);
 }
 
 static void Gpx_reset(void) {
@@ -151,18 +133,15 @@ static void Create() {
 	           作成に失敗した場合は 0 を返す
 	   width : surface の幅
 	   height: surface の高さ
-	   bpp   : surface の深さ(オリジナルでは24bppのみサポート,
-	                          xsystem35 では display の depth と同じ)
+	   bpp   : surface の深さ(24bppのみサポート)
 	*/
 	int *var   = getCaliVariable();
 	int width  = getCaliValue();
 	int height = getCaliValue();
 	int bpp    = getCaliValue();
-	surface_t *s;
-	
-	//get_surface0();
-	s = sf_create_surface(width, height, sf_get(0)->depth);
-	
+
+	surface_t *s = sf_create_surface(width, height);
+
 	if (s == NULL) {
 		*var = 0;
 	} else {
@@ -171,7 +150,7 @@ static void Create() {
 		suf[no] = s;
 	}
 	
-	DEBUG_COMMAND("Gpx.Create %p,%d,%d,%d:", var, width, height, bpp);
+	TRACE("Gpx.Create %p,%d,%d,%d:", var, width, height, bpp);
 }
 
 static void CreatePixelOnly() {
@@ -187,10 +166,9 @@ static void CreatePixelOnly() {
 	int width  = getCaliValue();
 	int height = getCaliValue();
 	int bpp    = getCaliValue();
-	surface_t *s;
-	
-	s = sf_create_pixel(width, height, sf_get(0)->depth);
-	
+
+	surface_t *s = sf_create_pixel(width, height);
+
 	if (s == NULL) {
 		*var = 0;
 	} else {
@@ -199,7 +177,7 @@ static void CreatePixelOnly() {
 		suf[no] = s;
 	}
 	
-	DEBUG_COMMAND("Gpx.CreatePixelOnly %d,%d,%d,%d:", *var, width, height, bpp);
+	TRACE("Gpx.CreatePixelOnly %d,%d,%d,%d:", *var, width, height, bpp);
 }
 
 static void CreateAMapOnly() {
@@ -225,30 +203,22 @@ static void CreateAMapOnly() {
 		suf[no] = s;
 	}
 	
-	DEBUG_COMMAND("Gpx.CreateAMapOnly %p,%d,%d:", var, width, height);
+	TRACE("Gpx.CreateAMapOnly %p,%d,%d:", var, width, height);
 }
 
 static void IsSurface() {
 	/*
-	  Gpx.IsSurface(): 指定の番号の surface が surface かどうか
-	                   (pixel と alpha の両方のデータを持つ)を調べる
+	  Gpx.IsSurface(): 指定の番号が surface かどうかを調べる
 	  
 	   p1  : surface 番号
 	   var : 結果を返す変数。surface ならば 1, !surface ならば 0
 	*/
 	int p1   = getCaliValue();
 	int *var = getCaliVariable();
-	surface_t *s;
-	
-	s = sf_get(p1);
-	
-	if (s == NULL) {
-		*var = 0;
-	} else {
-		*var = (s->alpha && s->pixel) ? 1 : 0;
-	}
-	
-	DEBUG_COMMAND("Gpx.IsSurface %d,%p:", p1, var);
+
+	*var = sf_get(p1) ? 1 : 0;
+
+	TRACE("Gpx.IsSurface %d,%p:", p1, var);
 }
 
 static void IsPixel() {
@@ -267,10 +237,10 @@ static void IsPixel() {
 	if (s == NULL) {
 		*var = 0;
 	} else {
-		*var = s->pixel ? 1 : 0;
+		*var = s->sdl_surface ? 1 : 0;
 	}
 	
-	DEBUG_COMMAND("Gpx.IsPixel %d,%p:", p1, var);
+	TRACE("Gpx.IsPixel %d,%p:", p1, var);
 }
 
 static void IsAlpha() {
@@ -292,7 +262,7 @@ static void IsAlpha() {
 		*var = s->alpha ? 1 : 0;
 	}
 	
-	DEBUG_COMMAND("Gpx.IsAlpha %d,%p:", p1, var);
+	TRACE("Gpx.IsAlpha %d,%p:", p1, var);
 }
 
 static void GetWidth() {
@@ -314,7 +284,7 @@ static void GetWidth() {
 		*var = s->width;
 	}
 	
-	DEBUG_COMMAND("Gpx.GetWidth %d,%d:", p1, *var);
+	TRACE("Gpx.GetWidth %d,%d:", p1, *var);
 }
 
 static void GetHeight() {
@@ -336,13 +306,13 @@ static void GetHeight() {
 		*var = s->height;
 	}
 	
-	DEBUG_COMMAND("Gpx.GetHeight %d,%d:", p1, *var);
+	TRACE("Gpx.GetHeight %d,%d:", p1, *var);
 }
 
 static void GetCreatedSurface() { /* not used ? */
 	int *var = getCaliVariable();
 	
-	DEBUG_COMMAND_YET("Gpx.GetCreatedSurface %p:", var);
+	TRACE_UNIMPLEMENTED("Gpx.GetCreatedSurface %p:", var);
 }
 
 static void LoadCG() {
@@ -357,21 +327,21 @@ static void LoadCG() {
 	
 	*var = load_cg_main(p1 -1);
 	
-	DEBUG_COMMAND("Gpx.LoadCG %p,%d (%d):", var, p1, *var);
+	TRACE("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:", var, p1);
+	TRACE_UNIMPLEMENTED("Gpx.GetCgPosX %p,%d:", var, p1);
 }
 
 static void GetCGPosY() { /* not useed ? */
 	int *var = getCaliVariable();
 	int p1 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("Gpx.GetCgPosY %p,%d:", var, p1);
+	TRACE_UNIMPLEMENTED("Gpx.GetCgPosY %p,%d:", var, p1);
 }
 
 static void Free() {
@@ -382,7 +352,7 @@ static void Free() {
 	*/
 	int p1 = getCaliValue();
 	
-	DEBUG_COMMAND("Gpx.Free %d:", p1);
+	TRACE("Gpx.Free %d:", p1);
 	
 	if (p1 != 0) {
 		sf_free_one(p1);
@@ -395,7 +365,7 @@ static void FreeAll() {
 	*/
 	sf_free_all();
 	
-	DEBUG_COMMAND("Gpx.FreeAll:");
+	TRACE("Gpx.FreeAll:");
 }
 
 static void Copy() {
@@ -421,25 +391,29 @@ static void Copy() {
 	int sh = getCaliValue();
 	surface_t *src, *dst;
 	
-	DEBUG_COMMAND("Gpx.Copy %d,%d,%d,%d,%d,%d,%d,%d:", ds, dx, dy, ss, sx, sy, sw, sh);
+	TRACE("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);
 	gr_copy(dst, dx, dy, src, sx, sy, sw, sh);
 }
 
-static void CopyBright() { /* not used ? */
-	int p1 = getCaliValue();
-	int p2 = getCaliValue();
-	int p3 = getCaliValue();
-	int p4 = getCaliValue();
-	int p5 = getCaliValue();
-	int p6 = getCaliValue();
-	int p7 = getCaliValue();
-	int p8 = getCaliValue();
-	int p9 = getCaliValue();
+static void CopyBright(void) {
+	int ds = getCaliValue();
+	int dx = getCaliValue();
+	int dy = getCaliValue();
+	int ss = getCaliValue();
+	int sx = getCaliValue();
+	int sy = getCaliValue();
+	int w = getCaliValue();
+	int h = getCaliValue();
+	int lv = getCaliValue();
 
-	DEBUG_COMMAND_YET("Gpx.CopyBright %d,%d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8, p9);
+	surface_t *dst = sf_get(ds);
+	surface_t *src = sf_get(ss);
+	gr_copy_bright(dst, dx, dy, src, sx, sy, w, h, lv);
+
+	TRACE("Gpx.CopyBright %d,%d,%d,%d,%d,%d,%d,%d,%d:", ds, dx, dy, ss, sx, sy, w, h, lv);
 }
 
 static void CopyAMap() {
@@ -465,25 +439,29 @@ static void CopyAMap() {
 	int sh = getCaliValue();
 	surface_t *src, *dst;
 	
-	DEBUG_COMMAND("Gpx.CopyAMap %d,%d,%d,%d,%d,%d,%d,%d:", da, dx, dy, sa, sx, sy, sw, sh);
+	TRACE("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);
 	gr_copy_alpha_map(dst, dx, dy, src, sx, sy, sw, sh);
 }
 
-static void Blend() { /* not used ? */
-	int p1 = getCaliValue();
-	int p2 = getCaliValue();
-	int p3 = getCaliValue();
-	int p4 = getCaliValue();
-	int p5 = getCaliValue();
-	int p6 = getCaliValue();
-	int p7 = getCaliValue();
-	int p8 = getCaliValue();
-	int p9 = getCaliValue();
-	
-	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 Blend(void) {
+	int ds = getCaliValue();
+	int dx = getCaliValue();
+	int dy = getCaliValue();
+	int ss = getCaliValue();
+	int sx = getCaliValue();
+	int sy = getCaliValue();
+	int w = getCaliValue();
+	int h = getCaliValue();
+	int lv = getCaliValue();
+
+	surface_t *dst = sf_get(ds);
+	surface_t *src = sf_get(ss);
+	gr_blend(dst, dx, dy, src, sx, sy, w, h, lv);
+
+	TRACE("Gpx.Blend %d,%d,%d,%d,%d,%d,%d,%d,%d:", ds, dx, dy, ss, sx, sy, w, h, lv);
 }
 
 static void BlendSrcBright() { /* not used ? */
@@ -498,7 +476,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:", p1, p2, p3, p4, p5, p6, p7, p8, p9, p10);
+	TRACE_UNIMPLEMENTED("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 ? */
@@ -511,7 +489,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:", p1, p2, p3, p4, p5, p6, p7, p8);
+	TRACE_UNIMPLEMENTED("Gpx.BlendAddStatur %d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8);
 }
 
 static void BlendAMap() {
@@ -537,7 +515,7 @@ static void BlendAMap() {
 	int sh = getCaliValue();
 	surface_t *src, *dst;
 	
-	DEBUG_COMMAND("Gpx.BlendAMap %d,%d,%d,%d,%d,%d,%d,%d:", ds, dx, dy, ss, sx, sy, sw, sh);
+	TRACE("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);
@@ -554,7 +532,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:", p1, p2, p3, p4, p5, p6, p7, p8);
+	TRACE_UNIMPLEMENTED("Gpx.BlendAMapSrcOnly %d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8);
 }
 
 static void BlendAMapColor() { /* not used ? */
@@ -570,7 +548,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:", p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11);
+	TRACE_UNIMPLEMENTED("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 ? */
@@ -587,7 +565,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:", p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12);
+	TRACE_UNIMPLEMENTED("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 ? */
@@ -601,7 +579,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:", p1, p2, p3, p4, p5, p6, p7, p8, p9);
+	TRACE_UNIMPLEMENTED("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 ? */
@@ -615,7 +593,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:", p1, p2, p3, p4, p5, p6, p7, p8, p9);
+	TRACE_UNIMPLEMENTED("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 ? */
@@ -630,7 +608,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:", p1, p2, p3, p4, p5, p6, p7, p8, p9, p10);
+	TRACE_UNIMPLEMENTED("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 ? */
@@ -647,7 +625,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:", p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12);
+	TRACE_UNIMPLEMENTED("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 ? */
@@ -660,7 +638,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:", p1, p2, p3, p4, p5, p6, p7, p8);
+	TRACE_UNIMPLEMENTED("Gpx.BlendScreen %d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8);
 }
 
 static void BlendMultiply() { /* not used ? */
@@ -673,7 +651,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:", p1, p2, p3, p4, p5, p6, p7, p8);
+	TRACE_UNIMPLEMENTED("Gpx.BlendMultiply %d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8);
 }
 
 static void BlendScreenAlpha() { /* not used ? */
@@ -687,7 +665,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:", p1, p2, p3, p4, p5, p6, p7, p8, p9);
+	TRACE_UNIMPLEMENTED("Gpx.BlendScreenAlpha %d,%d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8, p9);
 }
 
 static void Fill() {
@@ -713,7 +691,7 @@ static void Fill() {
 	int b  = getCaliValue();
 	surface_t *dst;
 	
-	DEBUG_COMMAND("Gpx.Fill %d,%d,%d,%d,%d,%d,%d,%d:", ds, dx, dy, dw, dh, r, g, b);
+	TRACE("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);
@@ -731,21 +709,24 @@ 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:", ds, dx, dy, dw, dh, r, g, b, lv);
+	TRACE("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);
 }
 
-static void FillAMap() { /* not used ? */
-	int p1 = getCaliValue();
-	int p2 = getCaliValue();
-	int p3 = getCaliValue();
-	int p4 = getCaliValue();
-	int p5 = getCaliValue();
-	int p6 = getCaliValue();
-	
-	DEBUG_COMMAND_YET("Gpx.FillAMap %d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6);
+static void FillAMap(void) {
+	int ds = getCaliValue();
+	int x = getCaliValue();
+	int y = getCaliValue();
+	int w = getCaliValue();
+	int h = getCaliValue();
+	int lv = getCaliValue();
+
+	surface_t *dst = sf_get(ds);
+	gr_fill_alpha_map(dst, x, y, w, h, lv);
+
+	TRACE("Gpx.FillAMap %d,%d,%d,%d,%d,%d:", ds, x, y, w, h, lv);
 }
 
 static void FillAMapOverBorder() {
@@ -770,7 +751,7 @@ static void FillAMapOverBorder() {
 	int d = getCaliValue();
 	surface_t *dst;
 	
-	DEBUG_COMMAND("Gpx.FillAMapOverBorder %d,%d,%d,%d,%d,%d,%d:", ds, dx, dy, dw, dh, s, d);
+	TRACE("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);
@@ -785,7 +766,7 @@ static void FillAMapUnderBorder() { /* not used ? */
 	int p6 = getCaliValue();
 	int p7 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("Gpx.FillAMapUnderBorder %d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7);
+	TRACE_UNIMPLEMENTED("Gpx.FillAMapUnderBorder %d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7);
 }
 
 static void SaturDP_DPxSA() { /* not used ? */
@@ -798,7 +779,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:", p1, p2, p3, p4, p5, p6, p7, p8);
+	TRACE_UNIMPLEMENTED("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 ? */
@@ -811,7 +792,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:", p1, p2, p3, p4, p5, p6, p7, p8);
+	TRACE_UNIMPLEMENTED("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 ? */
@@ -824,7 +805,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:", p1, p2, p3, p4, p5, p6, p7, p8);
+	TRACE_UNIMPLEMENTED("Gpx.AddDA_DAxSA %d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8);
 }
 
 static void SpriteCopyAMap() {
@@ -852,7 +833,7 @@ static void SpriteCopyAMap() {
 	int cl = getCaliValue();
 	surface_t *src, *dst;
 	
-	DEBUG_COMMAND("Gpx.SpriteCopyAMap %d,%d,%d,%d,%d,%d,%d,%d,%d:", da, dx, dy, sa, sx, sy, sw, sh, cl);
+	TRACE("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);
@@ -879,7 +860,7 @@ static void BrightDestOnly() {
 	int r  = getCaliValue();
 	surface_t *dst;
 	
-	DEBUG_COMMAND("Gpx.BrightDestOnly %d,%d,%d,%d,%d,%d:", ds, dx, dy, dw, dh, r);
+	TRACE("Gpx.BrightDestOnly %d,%d,%d,%d,%d,%d:", ds, dx, dy, dw, dh, r);
 	
 	dst = sf_get(ds);
 	
@@ -900,7 +881,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:", p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12);
+	TRACE_UNIMPLEMENTED("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 ? */
@@ -918,7 +899,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:", p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13);
+	TRACE_UNIMPLEMENTED("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() {
@@ -948,7 +929,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:", ds, dx, dy, dw, dh, ss, sx, sy, sw, sh);
+	TRACE("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);
@@ -968,7 +949,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:", p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11);
+	TRACE_UNIMPLEMENTED("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() {
@@ -998,7 +979,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:", ds, dx, dy, dw, dh, ss, sx, sy, sw, sh);
+	TRACE("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);
@@ -1015,7 +996,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:", p1, p2, p3, p4, p5, p6, p7, p8);
+	TRACE_UNIMPLEMENTED("Gpx.StretchBlendScreen2x2 %d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8);
 }
 
 
@@ -1049,7 +1030,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:", ds, dx, dy, ss1, sx1, sy1, ss2, sx2, sy2, sw, sh);
+	TRACE("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);
@@ -1086,7 +1067,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:", ds, dx, dy, ss1, sx1, sy1, ss2, sx2, sy2, sw, sh);
+	TRACE("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);
@@ -1137,25 +1118,11 @@ static void EffectCopy() {
 	int sh   = getCaliValue();
 	int time = getCaliValue();
 	int *var = getCaliVariable();
-	surface_t *dib, *dst, *src;
-	
-	switch(no) {
-	case 1:
-	case 2:
-	case 3:
-	case 4:
-	case 5:
-	case 7:
-	case 11:
-	case 12:
-	case 13:
-		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:", no, dx, dy, ss1, sx1, sy1, ss2, sx2, sy2, sw, sh, time, var);
-	}
-	dst = sf_get(ss1);
-	src = sf_get(ss2);
+
+	TRACE("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);
+
+	surface_t *dst = sf_get(ss1);
+	surface_t *src = sf_get(ss2);
 	gpx_effect(no, dx, dy, dst, sx1, sy1, src, sx2, sy2, sw, sh, time, var);
 	
 }
@@ -1163,7 +1130,7 @@ static void EffectCopy() {
 static void SetClickCancelFlag() { /* not used ? */
 	int p1 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("Gpx.SetClikCancelFlag %d:", p1);
+	TRACE_UNIMPLEMENTED("Gpx.SetClikCancelFlag %d:", p1);
 }
 
 static const ModuleFunc functions[] = {

modules/Gpx/cg.c

@@ -33,9 +33,7 @@
 #include "ags.h"
 #include "pms.h"
 #include "qnt.h"
-#ifdef HAVE_WEBP
-#include "webp.h"
-#endif
+#include "gfx.h"
 #include "ngraph.h"
 #include "dri.h"
 #include "ald_manager.h"
@@ -53,10 +51,6 @@ static CG_TYPE check_cgformat(uint8_t *data) {
 		return ALCG_PMS8;
 	} else if (pms64k_checkfmt(data)) {
 		return ALCG_PMS16;
-#ifdef HAVE_WEBP
-	} else if (webp_checkfmt(data)) {
-		return ALCG_WEBP;
-#endif
 	}
 	return ALCG_UNKNOWN;
 }
@@ -68,65 +62,38 @@ static CG_TYPE check_cgformat(uint8_t *data) {
  * @return CG が展開された surface
  *         未知の形式のときは NULL が返る
  */
-surface_t *sf_getcg(void *b, size_t size) {
-	surface_t *sf = NULL;
-	int type;
-	cgdata *cg = NULL;
-	
-	type = check_cgformat(b);
-	switch(type) {
+static surface_t *sf_getcg(void *b, size_t size) {
+	surface_t *sf;
+	cgdata *cg;
+
+	switch(check_cgformat(b)) {
 	case ALCG_PMS8:
+		// Load as an alpha map
 		cg = pms256_extract(b);
+		cg->alpha = cg->pic;
+		cg->pic = NULL;
+		sf = sf_create_alpha(cg->width, cg->height);
+		gfx_drawImageAlphaMap(cg, sf, 0, 0);
 		break;
 	case ALCG_PMS16:
 		cg = pms64k_extract(b);
+		sf = cg->alpha
+			? sf_create_surface(cg->width, cg->height)
+			: sf_create_pixel(cg->width, cg->height);
+		gfx_drawImage16(cg, sf, 0, 0, 255, false);
 		break;
 	case ALCG_QNT:
 		cg = qnt_extract(b);
+		sf = cg->alpha
+			? sf_create_surface(cg->width, cg->height)
+			: sf_create_pixel(cg->width, cg->height);
+		gfx_drawImage24(cg, sf, 0, 0, 255);
 		break;
-#ifdef HAVE_WEBP
-	case ALCG_WEBP:
-		cg = webp_extract(b, size);
-		break;
-#endif
 	default:
-		break;
-	}
-	
-	if (cg == NULL) {
 		WARNING("Unknown Cg Type");
 		return NULL;
 	}
-	
-	switch(type) {
-	case ALCG_PMS8:
-		sf = sf_create_alpha(cg->width, cg->height);
-		gr_draw_amap(sf, cg->x, cg->y, cg->pic, cg->width, cg->height, cg->width);
-		break;
-		
-	case ALCG_PMS16:
-		if (cg->alpha) {
-			sf = sf_create_surface(cg->width, cg->height, sf0->depth);
-			gr_drawimage16(sf, cg, cg->x, cg->y);
-			gr_draw_amap(sf, cg->x, cg->y, cg->alpha, cg->width, cg->height, cg->width);
-		} else {
-			sf = sf_create_pixel(cg->width, cg->height, sf0->depth);
-			gr_drawimage16(sf, cg, cg->x, cg->y);
-		}
-		break;
-                
-	case ALCG_QNT:
-	case ALCG_WEBP:
-		if (cg->alpha) {
-			sf = sf_create_surface(cg->width, cg->height, sf0->depth);
-			gr_drawimage24(sf, cg, cg->x, cg->y);
-			gr_draw_amap(sf, cg->x, cg->y, cg->alpha, cg->width, cg->height, cg->width);
-		} else {
-			sf = sf_create_pixel(cg->width, cg->height, sf0->depth);
-			gr_drawimage24(sf, cg, cg->x, cg->y);
-		}
-		break;
-	}
+
 	cgdata_free(cg);
 	return sf;
 }

modules/Gpx/effectcopy.c

@@ -5,7 +5,7 @@
 #include "portab.h"
 #include "system.h"
 #include "surface.h"
-#include "sdl_core.h"
+#include "effect.h"
 #include "ags.h"
 #include "input.h"
 #include "graph.h"
@@ -24,17 +24,17 @@ void gpx_effect(int no,
 
 	*endtype = 0;
 
-	enum sdl_effect_type type = from_sact_effect(no);
+	enum 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);
+	struct effect *eff = 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);
+	ags_runEffect(time, false, (ags_EffectStepFunc)effect_step, eff);
+	effect_finish(eff);
 
 	switch (no) {
 	case SACT_EFFECT_FADEOUT:

modules/Gpx/graph.c

@@ -3,25 +3,15 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <SDL.h>
 
 #include "portab.h"
 #include "system.h"
 #include "surface.h"
 #include "graph.h"
 #include "ngraph.h"
-#include "nact.h"
-
-/*
-  gr_xxxx はクリッピングあり
-  gre_xxxx はクリッピングなし
-*/
-
-#undef WARNING
-#define WARNING(...)
-
-#undef NOTICE
-#define NOTICE(...)
-
+#include "ags.h"
+#include "gfx.h"
 
 /**
  * surface から surface にコピーなどをする際に、転送元と転送先のsurface
@@ -36,80 +26,16 @@
  * @param ds: 転送先surface
  * @param dx: 転送先Ｘ座標
  * @param dy: 転送先Ｙ座標
- * @return TRUE -> 描画領域がある
- *         FALSE-> 転送領域の高さや幅が０以下になったり、転送元、転送先の座標が
+ * @return true -> 描画領域がある
+ *         false-> 転送領域の高さや幅が０以下になったり、転送元、転送先の座標が
  *                 surfaceの範囲外になり、描画領域がなくなった。
  *         それぞれの引数は適宜変更されている
  */
-boolean gr_clip(surface_t *ss, int *sx, int *sy, int *sw, int *sh, surface_t *ds, int *dx, int *dy) {
-	int w, h;
-	
-	if (ss == NULL) {
-		WARNING("ss surface is null");
-		return FALSE;
-	}
-	if (ss == NULL) {
-		WARNING("ss surface is null");
-		return FALSE;
-	}
-	
-	if (*sx > ss->width) {
-		WARNING("sx is too large (sx=%d,width=%d)", *sx, ss->width);
-		return FALSE;
-	}
-	if (*sy > ss->height) {
-		WARNING("sy is too large (sy=%d,height=%d)", *sy, ss->height);
-		return FALSE;
-	}
-	
-	if (*sx < 0) {
-		WARNING("sx is too small (sx=%d)", *sx);
-		return FALSE;
-	}
-	if (*sy < 0) {
-		WARNING("sy is too small (sy=%d)", *sy);
-		return FALSE;
-	}
-	
-	if (*dx > ds->width) {
-		WARNING("dx is too large (dx=%d,width=%d)", *dx, ds->width);
-		return FALSE;
-	}
-	if (*dy > ds->height) {
-		WARNING("dy is too large (dy=%d,height=%d)", *dy, ds->height);
-		return FALSE;
-	}
-	
-	w = *sw;
-	h = *sh;
-	
-	if (*dx < 0) {
-		*sx -= *dx; *sw += *dx; *dx = 0;
-	}
-	if (*dy < 0) {
-		*sy -= *dy; *sh += *dy; *dy = 0;
-	}
-	
-	*sw = min(ss->width  - *sx, min(ds->width  - *dx, *sw));
-	*sh = min(ss->height - *sy, min(ds->height - *dy, *sh));
-
-	if (*sw <= 0) {
-		WARNING("sw become <=0");
-		return FALSE;
-	}
-	if (*sh <= 0) {
-		WARNING("sh become <=0");
-		return FALSE;
-	}
-	
-	if (*sw != w) {
-		NOTICE("width change %d -> %d", w, *sw);
-	}
-	if (*sh != h) {
-		NOTICE("height change %d -> %d", h, *sh);
-	}
-	
-	return TRUE;
+bool gr_clip(surface_t *ss, int *sx, int *sy, int *sw, int *sh, surface_t *ds, int *dx, int *dy) {
+	if (!ss || !ds) return false;
+	SDL_Rect src_window = { 0, 0, ss->width, ss->height };
+	SDL_Rect dst_window = { 0, 0, ds->width, ds->height };
+	return ags_clipCopyRect(&src_window, &dst_window, sx, sy, dx, dy, sw, sh);
 }
 
 /**
@@ -120,67 +46,75 @@ boolean gr_clip(surface_t *ss, int *sx, int *sy, int *sw, int *sh, surface_t *ds
  * @param sy: 描画開始Ｙ座標
  * @param sw: 描画幅
  * @param sh: 描画高さ
- * @return TRUE -> 描画領域がある
- *         FALSE-> 描画領域の高さや幅が０以下になったり、描画開始座標が
+ * @return true -> 描画領域がある
+ *         false-> 描画領域の高さや幅が０以下になったり、描画開始座標が
  *                 surfaceの範囲外になり、描画領域がなくなった。
  *         それぞれの引数は適宜変更されている
  */
-boolean gr_clip_xywh(surface_t *ss, int *sx, int *sy, int *sw, int *sh) {
-	int w, h;
-	
-	if (ss == NULL) {
-		WARNING("ss surface is null");
-		return FALSE;
-	}
-	
-	if (*sx > ss->width) {
-		WARNING("sx is too large (sx=%d,width=%d)", *sx, ss->width);
-		return FALSE;
-	}
-	if (*sy > ss->height) {
-		WARNING("sy is too large (sy=%d,height=%d)", *sy, ss->height);
-		return FALSE;
-	}
-	
-	w = *sw;
-	h = *sh;
-	
-	if (*sx < 0) {
-		*sw += *sx; *sx = 0;
-	}
-	if (*sy < 0) {
-		*sh += *sy; *sy = 0;
-	}
-	
-	*sw = min(ss->width  - *sx, *sw);
-	*sh = min(ss->height - *sy, *sh);
-	
-	if (*sw <= 0) {
-		WARNING("sw become <=0");
-		return FALSE;
-	}
-	if (*sh <= 0) {
-		WARNING("sh become <=0");
-		return FALSE;
-	}
-	
-	if (*sw != w) {
-		NOTICE("width change %d -> %d", w, *sw);
-	}
-	if (*sh != h) {
-		NOTICE("height change %d -> %d", h, *sh);
-	}
-	
-	return TRUE;
+bool gr_clip_xywh(surface_t *ss, int *sx, int *sy, int *sw, int *sh) {
+	if (!ss) return false;
+	SDL_Rect rect = {*sx, *sy, *sw, *sh};
+	if (!SDL_IntersectRect(&rect, &(SDL_Rect){ 0, 0, ss->width, ss->height }, &rect))
+		return false;
+	*sx = rect.x;
+	*sy = rect.y;
+	*sw = rect.w;
+	*sh = rect.h;
+	return true;
 }
 
 void gr_init() {
 }
 
+void gr_copy(surface_t *dst, int dx, int dy, surface_t *src, int sx, int sy, int sw, int sh) {
+	if (!dst->sdl_surface || !src->sdl_surface) return;
+	if (!gr_clip(src, &sx, &sy, &sw, &sh, dst, &dx, &dy)) return;
+
+	SDL_Rect src_rect = {sx, sy, sw, sh};
+	SDL_Rect dst_rect = {dx, dy, sw, sh};
+	if (dst == src) {
+		SDL_Rect r;
+		if (SDL_IntersectRect(&src_rect, &dst_rect, &r)) {
+			SDL_Surface *view = gfx_createSurfaceView(src->sdl_surface, sx, sy, sw, sh);
+			SDL_Surface *tmp = SDL_ConvertSurface(view, dst->sdl_surface->format, 0);
+			src_rect.x = 0;
+			src_rect.y = 0;
+			SDL_LowerBlit(tmp, &src_rect, dst->sdl_surface, &dst_rect);
+			SDL_FreeSurface(tmp);
+			SDL_FreeSurface(view);
+			return;
+		}
+	}
+	SDL_LowerBlit(src->sdl_surface, &src_rect, dst->sdl_surface, &dst_rect);
+}
+
+// Copy the specified surface area with brightness lv/255 times
+void gr_copy_bright(surface_t *dst, int dx, int dy, surface_t *src, int sx, int sy, int width, int height, int lv) {
+	SDL_Rect src_rect = {sx, sy, width, height};
+	SDL_Rect dst_rect = {dx, dy, width, height};
+	SDL_SetSurfaceColorMod(src->sdl_surface, lv, lv, lv);
+	SDL_BlitSurface(src->sdl_surface, &src_rect, dst->sdl_surface, &dst_rect);
+	SDL_SetSurfaceColorMod(src->sdl_surface, 255, 255, 255);
+}
+
+void gr_fill(surface_t *dst, int dx, int dy, int dw, int dh, int r, int g, int b) {
+	SDL_Rect rect = {dx, dy, dw, dh};
+	uint32_t color = SDL_MapRGB(dst->sdl_surface->format, r, g, b);
+	SDL_FillRect(dst->sdl_surface, &rect, color);
+}
+
+void gr_copy_stretch(surface_t *dst, int dx, int dy, int dw, int dh, surface_t *src, int sx, int sy, int sw, int sh) {
+	SDL_Rect srcrect = {sx, sy, sw, sh};
+	SDL_Rect dstrect = {dx, dy, dw, dh};
+	SDL_BlitScaled(src->sdl_surface, &srcrect, dst->sdl_surface, &dstrect);
+}
 
 void gr_blend(surface_t *dst, int dx, int dy, surface_t *src, int sx, int sy, int width, int height, int lv) {
-	
-	
+	SDL_SetSurfaceBlendMode(src->sdl_surface, SDL_BLENDMODE_BLEND);
+	SDL_SetSurfaceAlphaMod(src->sdl_surface, lv);
+	SDL_BlitSurface(src->sdl_surface, &(SDL_Rect){sx, sy, width, height}, dst->sdl_surface, &(SDL_Rect){dx, dy, width, height});
+	SDL_SetSurfaceAlphaMod(src->sdl_surface, 255);
+	SDL_SetSurfaceBlendMode(src->sdl_surface, SDL_BLENDMODE_NONE);
 }
 
 void gr_blend_src_bright(surface_t *dst, int dx, int dy, surface_t *src, int sx, int sy, int width, int height, int alpha, int rate) {
@@ -271,56 +205,34 @@ void gr_copy_stretch_blend_alpha_map(surface_t *dst, int dx, int dy, int dw, int
 		row[x] = xd; xd += a1;
 	}
 
-	switch(dst->depth) {
-	case 16:
-	{
-		uint16_t *yls, *yld;
-		uint8_t *yla;
-		
-		for (y = 0; y < dh; y++) {
-			yls = (uint16_t *)(sp + *(y + col) * src->bytes_per_line);
-			yld = (uint16_t *)(dp +   y        * dst->bytes_per_line);
-			yla = (uint8_t *)(sa + *(y + col) * src->width);
-			for (x = 0; x < dw; x++) {
-				*(yld + x) = ALPHABLEND16(*(yls+ *(row + x)), *(yld+x), *(yla+*(row+x)));
-			}
-			while(*(col + y) == *(col + y + 1)) {
-				yld += dst->width;
-				for (x = 0; x < dw; x++) {
-					*(yld + x) = ALPHABLEND16(*(yls+ *(row+x)), *(yld+x), *(yla+*(row+x)));
-				}
-				y++;
-			}
+	for (y = 0; y < dh; y++) {
+		uint32_t *yls = (uint32_t *)(sp + *(y + col) * src->sdl_surface->pitch);
+		uint32_t *yld = (uint32_t *)(dp +   y        * dst->sdl_surface->pitch);
+		uint8_t  *yla = (uint8_t  *)(sa + *(y + col) * src->width);
+		for (x = 0; x < dw; x++) {
+			*(yld + x) = ALPHABLEND24(*(yls+ *(row + x)), *(yld+x), *(yla+*(row+x)));
 		}
-		break;
-	}
-	case 24:
-	case 32:
-	{
-		uint32_t *yls, *yld;
-		uint8_t  *yla;
-		
-		for (y = 0; y < dh; y++) {
-			yls = (uint32_t *)(sp + *(y + col) * src->bytes_per_line);
-			yld = (uint32_t *)(dp +   y        * dst->bytes_per_line);
-			yla = (uint8_t  *)(sa + *(y + col) * src->width);
+		while (y < dh - 1 && *(col + y) == *(col + y + 1)) {
+			yld += dst->width;
 			for (x = 0; x < dw; x++) {
-				*(yld + x) = ALPHABLEND24(*(yls+ *(row + x)), *(yld+x), *(yla+*(row+x)));
-			}
-			while(*(col + y) == *(col + y + 1)) {
-				yld += dst->width;
-				for (x = 0; x < dw; x++) {
-					*(yld + x) = ALPHABLEND24(*(yls+ *(row+x)), *(yld+x), *(yla+*(row+x)));
-				}
-				y++;
+				*(yld + x) = ALPHABLEND24(*(yls+ *(row+x)), *(yld+x), *(yla+*(row+x)));
 			}
+			y++;
 		}
-		break;
-	}
 	}
 	
 	free(row);
 	free(col);
 }
 
+// Fill the rectangle with the specified color (rgb) and blend rate (lv)
+void gr_fill_alpha_color(surface_t *dst, int dx, int dy, int dw, int dh, int r, int g, int b, int lv) {
+	SDL_Surface *src = SDL_CreateRGBSurfaceWithFormat(0, dw, dh, 32, SDL_PIXELFORMAT_ARGB8888);
+	SDL_FillRect(src, NULL, SDL_MapRGBA(src->format, r, g, b, lv));
+	SDL_SetSurfaceBlendMode(src, SDL_BLENDMODE_BLEND);
+	SDL_Rect dstrect = {dx, dy, dw, dh};
+	SDL_BlitSurface(src, NULL, dst->sdl_surface, &dstrect);
+	SDL_FreeSurface(src);
+}
+
 #include "graph2.c"

modules/Gpx/graph.h

@@ -0,0 +1,23 @@
+#ifndef __GRAPH_H__
+#define __GRAPH_H__
+
+#include "config.h"
+#include "surface.h"
+
+void gr_init();
+
+void gr_copy(surface_t *dst, int dx, int dy, surface_t *src, int sx, int sy, int sw, int sh);
+void gr_copy_bright(surface_t *dst, int dx, int dy, surface_t *src, int sx, int sy, int width, int height, int lv);
+void gr_fill(surface_t *dst, int dx, int dy, int dw, int dh, int r, int g, int b);
+void gr_copy_stretch(surface_t *dst, int dx, int dy, int dw, int dh, surface_t *src, int sx, int sy, int sw, int sh);
+void gr_blend(surface_t *dst, int dx, int dy, surface_t *src, int sx, int sy, int width, int height, int lv);
+void gr_copy_stretch_blend_alpha_map(surface_t *dst, int dx, int dy, int dw, int dh, surface_t *src, int sx, int sy, int sw, int sh);
+void gr_fill_alpha_color(surface_t *dst, int dx, int dy, int dw, int dh, int r, int g, int b, int lv);
+void gr_fill_alpha_overborder(surface_t *dst, int dx, int dy, int dw, int dh, int s, int d);
+void gr_fill_alpha_underborder(surface_t *dst, int dx, int dy, int dw, int dh, int s, int d);
+void gr_copy_alpha_map_sprite(surface_t *dst, int dx, int dy, surface_t *src, int sx, int sy, int sw, int sh, int cl);
+void gr_blend_alpha_wds_stretch2x2(surface_t *src1, int sx1, int sy1, surface_t *src2, int sx2, int sy2, int sw, int sh, surface_t *dst, int dx, int dy);
+void gr_blend_alpha_wds(surface_t *src1, int sx1, int sy1, surface_t *src2, int sx2, int sy2, int sw, int sh, surface_t *dst, int dx, int dy);
+
+#endif /* __GRAPH_H__ */
+

modules/Gpx/graph2.c

@@ -75,7 +75,7 @@ void gr_copy_alpha_map_sprite(surface_t *dst, int dx, int dy, surface_t *src, in
 }
 
 void gr_blend_alpha_wds_stretch2x2(surface_t *src1, int sx1, int sy1, surface_t *src2, int sx2, int sy2, int sw, int sh, surface_t *dst, int dx, int dy) {
-	surface_t *t = sf_create_surface(sw * 2, sh * 2, dst->depth);
+	surface_t *t = sf_create_surface(sw * 2, sh * 2);
 	
 	gr_copy_stretch(t, 0, 0, sw * 2, sh * 2, src2, sx2, sy2, sw, sh);
 	gr_blend_alpha_wds(t, 0, 0, src1, sx1, sy1, sw * 2, sh * 2, dst, dx, dy);
@@ -93,45 +93,16 @@ void gr_blend_alpha_wds(surface_t *src1, int sx1, int sy1, surface_t *src2, int
 	sa   = GETOFFSET_ALPHA(src1, sx1, sy1);
 	dp   = GETOFFSET_PIXEL(dst, dx, dy);
 	
-	switch(dst->depth) {
-	case 16:
-		{
-			uint16_t *yls1, *yls2, *yld;
-			uint8_t *yla;
-			
-			for (y = 0; y < sh; y++) {
-				yls1 = (uint16_t *)(sp1  + y * src1->bytes_per_line);
-				yls2 = (uint16_t *)(sp2  + y * src2->bytes_per_line);
-				yld  = (uint16_t *)(dp   + y * dst->bytes_per_line);
-				yla  = (uint8_t *)(sa   + y * src1->width);
-				
-				for (x = 0; x < sw; x++) {
-					*yld = SUTURADD16(*yls1, ALPHABLEND16(*yls1, *yls2, *yla));
-					//*yld = SUTURADD16(*yls1, ALPHALEVEL16(*yls2, *yla));
-					yls1++; yls2++; yld++; yla++;
-				}
-			}
-		}
-		break;
-	case 24:
-	case 32:
-	{
-		uint32_t *yls1, *yls2, *yld;
-		uint8_t *yla;
+	for (y = 0; y < sh; y++) {
+		uint32_t *yls1 = (uint32_t *)(sp1  + y * src1->sdl_surface->pitch);
+		uint32_t *yls2 = (uint32_t *)(sp2  + y * src2->sdl_surface->pitch);
+		uint32_t *yld  = (uint32_t *)(dp   + y * dst->sdl_surface->pitch);
+		uint8_t  *yla  = (uint8_t  *)(sa   + y * src1->width);
 		
-		for (y = 0; y < sh; y++) {
-			yls1 = (uint32_t *)(sp1  + y * src1->bytes_per_line);
-			yls2 = (uint32_t *)(sp2  + y * src2->bytes_per_line);
-			yld  = (uint32_t *)(dp   + y * dst->bytes_per_line);
-			yla  = (uint8_t  *)(sa   + y * src1->width);
-			
-			for (x = 0; x < sw; x++) {
-				*yld = SUTURADD24(*yls1, ALPHABLEND24(*yls1, *yls2, *yla));
-				yls1++; yls2++; yld++; yla++;
-			}
+		for (x = 0; x < sw; x++) {
+			*yld = SUTURADD24(*yls1, ALPHABLEND24(*yls1, *yls2, *yla));
+			yls1++; yls2++; yld++; yla++;
 		}
-		break;
-	}
 	}
 }
 

modules/Gpx/graph_copy_amap.c

@@ -41,22 +41,22 @@
  * @param sw:  転送幅
  * @param sh:  転送高さ
  */
-int gr_copy_alpha_map(surface_t *dst, int dx, int dy, surface_t *src, int sx, int sy, int sw, int sh) {
+void gr_copy_alpha_map(surface_t *dst, int dx, int dy, surface_t *src, int sx, int sy, int sw, int sh) {
 	uint8_t *sp, *dp;
 	
-	if (!gr_clip(src, &sx, &sy, &sw, &sh, dst, &dx, &dy)) return NG;
+	if (!gr_clip(src, &sx, &sy, &sw, &sh, dst, &dx, &dy)) return;
 	
 	sp = GETOFFSET_ALPHA(src, sx, sy);
 	dp = GETOFFSET_ALPHA(dst, dx, dy);
 
 	if (sp == NULL) {
 		WARNING("src alpha NULL");
-		return NG;
+		return;
 	}
 	
 	if (dp == NULL) {
 		WARNING("dst alpha NULL");
-		return NG;
+		return;
 	}
 	
 	if (src == dst) {
@@ -82,6 +82,4 @@ int gr_copy_alpha_map(surface_t *dst, int dx, int dy, surface_t *src, int sx, in
 			dp += dst->width;
 		}
 	}
-	
-	return OK;
 }

modules/Gpx/graph_fillrect_amap.c

@@ -6,11 +6,11 @@
 #include "ngraph.h"
 #include "ags.h"
 
-int gr_fill_alpha_map(surface_t *dst, int dx, int dy, int dw, int dh, int lv) {
+void gr_fill_alpha_map(surface_t *dst, int dx, int dy, int dw, int dh, int lv) {
 	uint8_t *a;
 	
 	if (!gr_clip_xywh(dst, &dx, &dy, &dw, &dh)) {
-		return NG;
+		return;
 	}
 	
 	a = GETOFFSET_ALPHA(dst, dx, dy);
@@ -19,6 +19,4 @@ int gr_fill_alpha_map(surface_t *dst, int dx, int dy, int dw, int dh, int lv) {
 		memset(a, lv, dw);
 		a += dst->width;
 	}
-	
-	return OK;
 }

modules/Gpx/ngraph.h

@@ -0,0 +1,33 @@
+#ifndef __NGRAPH_H__
+#define __NGRAPH_H__
+
+#include "portab.h"
+#include "nact.h"
+#include "ags.h"
+#include "surface.h"
+#include "graph.h"
+
+#define sf0 nact->ags.dib
+
+struct SDL_Surface;
+
+// DLL 用 graphic 関連関数 
+
+/* in graph.c */
+bool gr_clip(surface_t *ss, int *sx, int *sy, int *sw, int *sh, surface_t *ds, int *dx, int *dy);
+bool gr_clip_xywh(surface_t *ss, int *sx, int *sy, int *sw, int *sh);
+
+/* in graph_fillrect_amap.c */
+void gr_fill_alpha_map(surface_t *dst, int dx, int dy, int dw, int dh, int lv);
+
+/* in graph_copy_amap.c */
+void gr_copy_alpha_map(surface_t *dst, int dx, int dy, surface_t *src, int sx, int sy, int sw, int sh);
+
+// /* in graph_bright_dst_only.c */
+#define gr_bright_dst_only(dst,dx,dy,w,h,lv) gr_copy_bright(dst,dx,dy,dst,dx,dy,w,h,lv)
+// void gr_bright_dst_only(surface_t *dst, int dx, int dy, int w, int h, int lv);
+
+/* defined in cg.c */
+surface_t *sf_loadcg_no(int no);
+
+#endif /* __GRAPH_H__ */

modules/Gpx/surface.c

@@ -0,0 +1,80 @@
+#include "config.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <SDL.h>
+
+#include "portab.h"
+#include "surface.h"
+#include "system.h"
+
+static surface_t *create(int width, int height, bool has_pixel, bool has_alpha) {
+	surface_t *s = calloc(1, sizeof(surface_t));
+	s->width = width;
+	s->height = height;
+
+	if (has_pixel) {
+		s->sdl_surface = SDL_CreateRGBSurfaceWithFormat(0, width, height, 32, SDL_PIXELFORMAT_RGB888);
+	}
+	
+	if (has_alpha) {
+		s->alpha = calloc(width * (height +1), sizeof(uint8_t));
+	}
+	
+	return s;
+}
+
+// Create a surface with pixel and alpha data
+surface_t *sf_create_surface(int width, int height) {
+	return create(width, height, true, true);
+}
+
+// Create a surface with alpha data only
+surface_t *sf_create_alpha(int width, int height) {
+	return create(width, height, false, true);
+}
+
+// Create a surface with pixel data only
+surface_t *sf_create_pixel(int width, int height) {
+	return create(width, height, true, false);
+}
+
+/**
+ * surfaceオブジェクトの開放
+ * @param s: 開放するオブジェクト
+ * @return:  なし
+ */
+void sf_free(surface_t *s) {
+	if (s == NULL) return;
+	if (s->sdl_surface) SDL_FreeSurface(s->sdl_surface);
+	if (s->alpha) free(s->alpha);
+	free(s);
+}
+
+/**
+ * surface の複製を作成(dupulicate)
+ * @param in: 複製もと
+ * @return  : 複製したsurface
+ */
+surface_t *sf_dup(surface_t *in) {
+	surface_t *sf;
+	int len;
+	
+	if (in == NULL) return NULL;
+	
+	sf = malloc(sizeof(surface_t));
+	memcpy(sf, in, sizeof(surface_t));
+	
+	if (in->sdl_surface) {
+		sf->sdl_surface = SDL_ConvertSurface(in->sdl_surface, in->sdl_surface->format, 0);
+	}
+	
+	if (in->alpha) {
+		len = sf->width * sf->height;
+		sf->alpha = malloc(sizeof(uint8_t) * (len + sf->width));
+		memcpy(sf->alpha, in->alpha, len);
+	}
+	
+	return sf;
+}

modules/Gpx/surface.h

@@ -0,0 +1,13 @@
+#ifndef __SURFACE_H__
+#define __SURFACE_H__
+
+#include "portab.h"
+#include "ags.h"
+
+extern surface_t *sf_create_surface(int width, int height);
+extern surface_t *sf_create_alpha(int width, int height);
+extern surface_t *sf_create_pixel(int width, int height);
+extern void       sf_free(surface_t *s);
+extern surface_t *sf_dup(surface_t *in);
+
+#endif /* __SURFACE_H__ */

modules/Math/Math.c

@@ -42,7 +42,7 @@ static void RandMTInit() {
 	*/
 	int p1 = getCaliValue(); /* ITimer */
 	
-	DEBUG_COMMAND("Math.RandMTInit %d:", p1);
+	TRACE("Math.RandMTInit %d:", p1);
 }
 
 static void RandMTGet() {
@@ -61,7 +61,7 @@ static void RandMTGet() {
 		*var = (int)(genrand() * num) + 1;
 	}
 	
-	DEBUG_COMMAND("Math.RandMTGet %d,%p:", num, var);
+	TRACE("Math.RandMTGet %d,%p:", num, var);
 }
 
 static void RandMTMakeNumTable() {
@@ -74,7 +74,7 @@ static void RandMTMakeNumTable() {
 	
 	numtblmax = p1;
 	
-	DEBUG_COMMAND("Math.RandMTMakeNumTable %d:", p1);
+	TRACE("Math.RandMTMakeNumTable %d:", p1);
 }
 
 static void RandMTGetNumTable() {
@@ -87,7 +87,7 @@ static void RandMTGetNumTable() {
 	
 	*var = (int)(genrand() * numtblmax) + 1;
 	
-	DEBUG_COMMAND("Math.RandMTGetNumTable %d:", *var);
+	TRACE("Math.RandMTGetNumTable %d:", *var);
 }
 
 static const ModuleFunc functions[] = {

modules/MsgSkip/MsgSkip.c

@@ -13,7 +13,7 @@
 #include "msgskip.h"
 #include "utfsjis.h"
 
-static boolean valid;
+static bool valid;
 static int action;
 
 static void Init() {
@@ -26,7 +26,7 @@ static void Init() {
 	valid = true;
 	*p1 = 0;
 
-	DEBUG_COMMAND("MsgSkip.Init %p,%d,%d,%d:", p1, p2, p3, p4);
+	TRACE("MsgSkip.Init %p,%d,%d,%d:", p1, p2, p3, p4);
 }
 
 static void Start() {
@@ -39,7 +39,7 @@ static void Start() {
 	free(path);
 	free(fname_utf8);
 
-	DEBUG_COMMAND("MsgSkip.Start %p,%d:", p1, p2);
+	TRACE("MsgSkip.Start %p,%d:", p1, p2);
 }
 
 static void SetValid() {
@@ -48,7 +48,7 @@ static void SetValid() {
 	valid = p1;
 	msgskip_pause(!valid);
 
-	DEBUG_COMMAND("MsgSkip.SetValid %d:", p1);
+	TRACE("MsgSkip.SetValid %d:", p1);
 }
 
 static void GetValid() {
@@ -56,7 +56,7 @@ static void GetValid() {
 
 	*p1 = valid;
 
-	DEBUG_COMMAND("MsgSkip.GetValid %p:", p1);
+	TRACE("MsgSkip.GetValid %p:", p1);
 }
 
 static void SetAction() {
@@ -64,7 +64,7 @@ static void SetAction() {
 
 	action = p1;
 
-	DEBUG_COMMAND("MsgSkip.SetAcion %d:", p1);
+	TRACE("MsgSkip.SetAcion %d:", p1);
 }
 
 static void GetAction() {
@@ -72,19 +72,19 @@ static void GetAction() {
 
 	*p1 = action;
 
-	DEBUG_COMMAND("MsgSkip.GetAcion %p:", p1);
+	TRACE("MsgSkip.GetAcion %p:", p1);
 }
 
 static void PushStr() {
 	int p1 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("MsgSkip.PushStr %d:", p1);
+	TRACE_UNIMPLEMENTED("MsgSkip.PushStr %d:", p1);
 }
 
 static void PopStr() {
 	int p1 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("MsgSkip.PopStr %d:", p1);
+	TRACE_UNIMPLEMENTED("MsgSkip.PopStr %d:", p1);
 }
 
 static const ModuleFunc functions[] = {

modules/NIGHTDLL/NIGHTDLL.c

@@ -36,7 +36,7 @@ static void Init(void) { /* 0 */
 	
 	*var = 1;
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.Init %p:", var);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.Init %p:", var);
 }
 
 static void NIGHTDLL_reset(void) {
@@ -46,12 +46,12 @@ static void NIGHTDLL_reset(void) {
 		if (night.sp[i])
 			nt_sp_free(night.sp[i]);
 	}
-	nt_scg_freeall();
+	scg_freeall();
 	memset(&night, 0, sizeof(night));
 }
 
 static void InitGame() { /* 1 */
-	ags_setAntialiasedStringMode(TRUE);
+	ags_setAntialiasedStringMode(true);
 	sys_setHankakuMode(2);
 	
 	nact->msgout = ntmsg_add;
@@ -62,7 +62,7 @@ static void InitGame() { /* 1 */
 	ntmsg_init();
 	nt_sstr_init();
 
-	DEBUG_COMMAND_YET("NIGHTDLL.InitGame:");
+	TRACE_UNIMPLEMENTED("NIGHTDLL.InitGame:");
 }	
 
 // メッセージの枠の表示
@@ -71,7 +71,7 @@ static void SetMsgFrame() { /* 2 */
 	
 	ntmsg_set_frame(p1);
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.SetMsgFram %d:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.SetMsgFram %d:", p1);
 }
 
 // メッセージの表示位置の設定
@@ -80,21 +80,21 @@ static void SetMsgPlaceMethod(void) { /* 3 */
 	                         // 2=メッセージ枠+顔つき 
 	ntmsg_set_place(p1);
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.SetMsgPlaceMethod %d:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.SetMsgPlaceMethod %d:", p1);
 }
 
 // 未実装?
 static void SetMsgDrawEffect(void) { /* 4 */
 	int p1 = getCaliValue(); // 0, 1, 2, 3 (実際にはどれも機能しない?)
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.SetMsgDrawEffect %d:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.SetMsgDrawEffect %d:", p1);
 }
 
 // 未実装?
 static void SetMsgClearEffect(void) { /* 5 */
 	int p1 = getCaliValue(); // 0, 1, 2, 4 (実際にはどれも機能しない?)
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.SetMsgClearEffect %d:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.SetMsgClearEffect %d:", p1);
 }
 
 // 壁紙CGの設定
@@ -103,7 +103,7 @@ static void SetWallPaper(void) { /* 6 */
 	
 	nt_gr_set_wallpaper(p1);
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.SetWallPaper %d:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.SetWallPaper %d:", p1);
 }
 
 // 背景CGの設定
@@ -112,7 +112,7 @@ static void SetScenery(void) { /* 7 */
 	
 	nt_gr_set_scenery(p1);
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.SetScenery %d:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.SetScenery %d:", p1);
 }
 
 // 顔CGの設定
@@ -121,7 +121,7 @@ static void SetFace(void) { /* 8 */
 	
 	nt_gr_set_face(p1);
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.SetFace %d:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.SetFace %d:", p1);
 }
 
 // 立ち絵左の設定
@@ -130,7 +130,7 @@ static void SetSpriteL(void) { /* 9 */
 	
 	nt_gr_set_spL(p1);
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.SetSpriteL %d:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.SetSpriteL %d:", p1);
 }
 
 // 立ち絵中央の設定
@@ -139,7 +139,7 @@ static void SetSpriteM(void) { /* 10 */
 	
 	nt_gr_set_spM(p1);
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.SetSpriteM %d:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.SetSpriteM %d:", p1);
 }
 
 // 立ち絵右の設定
@@ -148,7 +148,7 @@ static void SetSpriteR(void) { /* 11 */
 	
 	nt_gr_set_spR(p1);
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.SetSpriteR %d:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.SetSpriteR %d:", p1);
 }
 
 // 立ち絵左の設定（季節違い?)
@@ -157,7 +157,7 @@ static void SetSpriteSeasonL(void) { /* 12 */
 	
 	nt_gr_set_spsL(p1);
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.SetSpriteSeasonL %d:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.SetSpriteSeasonL %d:", p1);
 }
 
 // 立ち絵中央の設定（季節違い?)
@@ -166,7 +166,7 @@ static void SetSpriteSeasonM(void) { /* 13 */
 	
 	nt_gr_set_spM(p1);
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.SetSpriteSeasonM %d:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.SetSpriteSeasonM %d:", p1);
 }
 
 // 立ち絵右の設定（季節違い?)
@@ -175,14 +175,14 @@ static void SetSpriteSeasonR(void) { /* 14 */
 	
 	nt_gr_set_spsR(p1);
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.SetSpriteSeasonR %d:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.SetSpriteSeasonR %d:", p1);
 }
 
 // 改行
 static void StartNewLine(void) { /* 15 */
 	ntmsg_newline();
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.StartNewLine:");
+	TRACE_UNIMPLEMENTED("NIGHTDLL.StartNewLine:");
 }
 
 // メッセージフォントサイズの設定
@@ -191,7 +191,7 @@ static void SetFontSize(void) { /* 16 */
 	
 	night.fontsize = p1;
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.SetFontSize %d:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.SetFontSize %d:", p1);
 }
 
 // フォントの種類の設定
@@ -200,7 +200,7 @@ static void SetFont(void) { /* 17 */
 	
 	night.fonttype = p1;
 
-	DEBUG_COMMAND_YET("NIGHTDLL.SetFont %d:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.SetFont %d:", p1);
 }
 
 // 選択肢モード ON
@@ -209,7 +209,7 @@ static void SetSelMode(void) { /* 18 */
 	
 	night.selmode = p1;
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.SetSelMode %d:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.SetSelMode %d:", p1);
 }
 
 // キー入力待ち後、改ページ
@@ -218,7 +218,7 @@ static void AnalyzeMessage(void) { /* 19 */
 
 	*var = ntmsg_ana();
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.AnalyzeMessage %p:", var);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.AnalyzeMessage %p:", var);
 }
 
 // ~DRAWの効果時間
@@ -227,7 +227,7 @@ static void SetDrawTime(void) { /* 20 */
 	
 	nt_gr_set_drawtime(p1);
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.SetDrawTime %d:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.SetDrawTime %d:", p1);
 }
 
 // 効果つき画面更新
@@ -236,7 +236,7 @@ static void Draw(void) { /* 21 */
 	
 	nt_gr_draw(p1);
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.Draw %d:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.Draw %d:", p1);
 }
 
 // 音声データを再生
@@ -245,21 +245,21 @@ static void SetVoice(void) { /* 22 */
 	
 	nt_voice_set(p1);
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.SetVoice %d:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.SetVoice %d:", p1);
 }
 
 // 未使用
 static void WaitKey(void) { /* 23 */
 	int p1 = getCaliValue(); // 
 
-	DEBUG_COMMAND_YET("NIGHTDLL.WaitKey %d:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.WaitKey %d:", p1);
 }
 
 static void AddFeeling(void) { /* 24 */
 	int p1 = getCaliValue(); // person(1:新開,2:星川,3:百瀬,4:いずみ,5:鏡花,6:真言美,7:マコト	 
 	int p2 = getCaliValue(); // val
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.AddFeeling %d:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.AddFeeling %d:", p1);
 
 }
 
@@ -267,7 +267,7 @@ static void SubFeeling(void) { /* 25 */
 	int p1 = getCaliValue(); // person
 	int p2 = getCaliValue(); // val
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.SubFeeling %d:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.SubFeeling %d:", p1);
 }
 
 static void CallEvent(void) { /* 26 */
@@ -275,7 +275,7 @@ static void CallEvent(void) { /* 26 */
 	
 	nt_sco_callevent(p1);
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.CallEvent %d:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.CallEvent %d:", p1);
 }
 
 static void ScreenCG(void) { /* 27 */
@@ -294,7 +294,7 @@ static void ScreenCG(void) { /* 27 */
 	
 	nt_gr_screencg(no, x, y);
 
-	DEBUG_COMMAND_YET("NIGHTDLL.ScreenCG %d,%d,%d:", x, y, no);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.ScreenCG %d,%d,%d:", x, y, no);
 }
 
 static void RunGameMain(void) { /* 28 */
@@ -310,7 +310,7 @@ static void RunGameMain(void) { /* 28 */
 	
 	*p1 = nt_sco_main(p5);
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.RunGameMain %p,%d,%d,%d,%d:", p1, p2, p3, p4, p5);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.RunGameMain %p,%d,%d,%d,%d:", p1, p2, p3, p4, p5);
 }
 
 static void CheckNewGame(void) { /* 29 */
@@ -318,21 +318,21 @@ static void CheckNewGame(void) { /* 29 */
 	
 	*p1 = 0;
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.CheckNewGame %p:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.CheckNewGame %p:", p1);
 }
 
 static void SaveStartData(void) { /* 30 */
-	DEBUG_COMMAND_YET("NIGHTDLL.SaveStartData:");
+	TRACE_UNIMPLEMENTED("NIGHTDLL.SaveStartData:");
 }
 
 static void PrintExitSystem(void) { /* 31 */
-	DEBUG_COMMAND_YET("NIGHTDLL.PrintExitSystem:");
+	TRACE_UNIMPLEMENTED("NIGHTDLL.PrintExitSystem:");
 }
 
 static void SetCalendar(void) { /* 32 */
 	int p1 = getCaliValue(); // 0, 1, 2
 
-	DEBUG_COMMAND_YET("NIGHTDLL.SetCalendar %d:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.SetCalendar %d:", p1);
 }
 
 static void SetDate(void) { /* 33 */
@@ -344,7 +344,7 @@ static void SetDate(void) { /* 33 */
 	night.Day   = p2;
 	night.DayOfWeek = p3;
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.SetDate %d,%d,%d:", p1, p2, p3);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.SetDate %d,%d,%d:", p1, p2, p3);
 }
 
 static void GetDate(void) { /* 34 */
@@ -356,11 +356,11 @@ static void GetDate(void) { /* 34 */
 	*p2 = night.Day;
 	*p3 = night.DayOfWeek;
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.GetDate %p,%p,%p:", p1, p2, p3);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.GetDate %p,%p,%p:", p1, p2, p3);
 }
 
 static void SelectGameLevel(void) { /* 35 */
-	DEBUG_COMMAND_YET("NIGHTDLL.SelectGameLevel:");
+	TRACE_UNIMPLEMENTED("NIGHTDLL.SelectGameLevel:");
 }
 
 static void RunEventDungeon(void) { /* 36 */
@@ -369,13 +369,13 @@ static void RunEventDungeon(void) { /* 36 */
 
 	*p1 = 1;
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.RunEventDungeon %p,%d:", p1, p2);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.RunEventDungeon %p,%d:", p1, p2);
 }
 
 static void RunEventBattle(void) { /* 37 */
 	int p1 = getCaliValue(); // 実際には機能しない？
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.RunEventBattle %d:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.RunEventBattle %d:", p1);
 }
 
 // CD再生開始
@@ -384,7 +384,7 @@ static void CDPlay(void) { /* 38 */
 	
 	nt_cd_play(p1);
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.CDPlay %d:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.CDPlay %d:", p1);
 }
 
 // CD再生停止
@@ -393,16 +393,16 @@ static void CDStop(void) { /* 39 */
 	
 	nt_cd_stop(p1);
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.CDStop %d:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.CDStop %d:", p1);
 }
 
 // CDのmute
 static void CDMute(void) { /* 40 */
 	int p1 = getCaliValue(); // 0: mute off, 1: mute on
 	
-	nt_cd_mute(p1 == 0 ? FALSE : TRUE);
+	nt_cd_mute(p1 != 0);
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.CDMute %d:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.CDMute %d:", p1);
 }
 
 // ch に効果音番号をセット
@@ -412,7 +412,7 @@ static void SoundEffectSetWave(void) { /* 41 */
 	
 	nt_snd_setwave(p1, p2);
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.SoundEffectSetWave %d,%d:", p1, p2);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.SoundEffectSetWave %d,%d:", p1, p2);
 }
 
 // ch にくり返し数をセット
@@ -422,7 +422,7 @@ static void SoundEffectSetLoop(void) { /* 42 */
 	
 	nt_snd_setloop(p1, p2);
        
-	DEBUG_COMMAND_YET("NIGHTDLL.SoundEffectSetLoop %d,%d:", p1, p2);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.SoundEffectSetLoop %d,%d:", p1, p2);
 }
 
 // ch に音量をセット
@@ -432,7 +432,7 @@ static void SoundEffectSetVolume(void) { /* 43 */
 	
 	nt_snd_setvol(p1, p2);
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.SoundEffectSetVolue %d,%d:", p1, p2);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.SoundEffectSetVolue %d,%d:", p1, p2);
 }
 
 // 効果音の再生を終るまで待つか待たないか？
@@ -440,9 +440,9 @@ static void SoundEffectSetSyncFlag(void) { /* 44 */
 	int p1 = getCaliValue(); // ch
 	int p2 = getCaliValue(); // 0: 終るまで待たない, 1: 待つ
 	
-	nt_snd_waitend(p1, p2 == 0 ? FALSE : TRUE);
+	nt_snd_waitend(p1, p2 != 0);
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.SoundEffectSetSyncFlag %d,%d:", p1, p2);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.SoundEffectSetSyncFlag %d,%d:", p1, p2);
 }
 
 // ch の効果音を再生
@@ -451,7 +451,7 @@ static void SoundEffectPlay(void) { /* 45 */
 	
 	nt_snd_play(p1);
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.SoundEffectPlay %d:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.SoundEffectPlay %d:", p1);
 }
 
 // ch の効果音を停止
@@ -461,7 +461,7 @@ static void SoundEffectStop(void) { /* 46 */
 	
 	nt_snd_stop(p1, p2);
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.SoundEffectStop %d,%d:", p1,p2);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.SoundEffectStop %d,%d:", p1,p2);
 }
 
 // 全てのチャンネルの再生を停止
@@ -470,86 +470,86 @@ static void SoundEffectStopAll(void) { /* 47 */
 	
 	nt_snd_stopall(p1);
 
-	DEBUG_COMMAND_YET("NIGHTDLL.SoundEffectStopAll %d:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.SoundEffectStopAll %d:", p1);
 }
 
 static void RunSoundMode(void) { /* 48 */
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.RunSoundMode:");
+	TRACE_UNIMPLEMENTED("NIGHTDLL.RunSoundMode:");
 }
 
 static void RunMapEditor(void) { /* 49 */
 	int *p1 = getCaliVariable();
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.RunMapEditor %p:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.RunMapEditor %p:", p1);
 }
 
 static void VisualListClear(void) { /* 50 */
 
-	DEBUG_COMMAND_YET("NIGHTDLL.VisualListClear:");
+	TRACE_UNIMPLEMENTED("NIGHTDLL.VisualListClear:");
 }
 
 static void VisualListAdd(void) { /* 51 */
 	int p1 = getCaliValue();
 
-	DEBUG_COMMAND_YET("NIGHTDLL.VisualListAdd %d:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.VisualListAdd %d:", p1);
 }
 
 static void GetLocalCountCG(void) { /* 52 */
 	int *p1 = getCaliVariable();
 	int p2 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.GetLocalCountCG %p,%d:", p1, p2);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.GetLocalCountCG %p,%d:", p1, p2);
 }
 
 static void PlayMemory(void) { /* 53 */
 	int *p1 = getCaliVariable(); // 回想ページ
 	int *p2 = getCaliVariable(); // 回想RESULT
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.PlayMemory %p,%p:", p1, p2);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.PlayMemory %p,%p:", p1, p2);
 }
 
 static void GetEventFlagTotal(void) { /* 54 */
 	int *p1 = getCaliVariable();
 	int p2 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.GetEventFlagTotal %p,%d:", p1, p2);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.GetEventFlagTotal %p,%d:", p1, p2);
 }
 
 static void SetPlayerName(void) { /* 55 */
 	int p1 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.SetPlayerName %d:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.SetPlayerName %d:", p1);
 }
 
 static void GetPlayerName(void) { /* 56 */
 	int p1 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.GetPlayerName %d:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.GetPlayerName %d:", p1);
 }
 
 static void SaveGame(void) { /* 57 */
 	int *p1 = getCaliVariable();
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.SaveGame %p:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.SaveGame %p:", p1);
 }
 
 static void LoadGame(void) { /* 58 */
 	int *p1 = getCaliVariable();
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.LoadGame %p:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.LoadGame %p:", p1);
 }
 
 static void ExistSaveData(void) { /* 59 */
 	int *p1 = getCaliVariable();
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.ExistSaveData %p:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.ExistSaveData %p:", p1);
 }
 
 static void ExistStartData(void) { /* 60 */
 	int *p1 = getCaliVariable();
 
-	DEBUG_COMMAND_YET("NIGHTDLL.ExistStartData %p:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.ExistStartData %p:", p1);
 }
 
 static void SetAreaData(void) { /* 61 */
@@ -557,27 +557,27 @@ static void SetAreaData(void) { /* 61 */
 	int p2 = getCaliValue();
 	int p3 = getCaliValue();
 
-	DEBUG_COMMAND_YET("NIGHTDLL.SetAreaData %d,%d,%d:", p1, p2, p3);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.SetAreaData %d,%d,%d:", p1, p2, p3);
 }
 
 static void RunBattleTest(void) { /* 62 */
-	DEBUG_COMMAND_YET("NIGHTDLL.RunBattleTest:");
+	TRACE_UNIMPLEMENTED("NIGHTDLL.RunBattleTest:");
 }
 
 static void RunTrainingTest(void) { /* 63 */
-	DEBUG_COMMAND_YET("NIGHTDLL.RunTrainingTest:");
+	TRACE_UNIMPLEMENTED("NIGHTDLL.RunTrainingTest:");
 }
 
 static void TestEventCall(void) { /* 64 */
-	DEBUG_COMMAND_YET("NIGHTDLL.TestEventCall:");
+	TRACE_UNIMPLEMENTED("NIGHTDLL.TestEventCall:");
 }
 
 static void Test(void) { /* 65 */
-	DEBUG_COMMAND_YET("NIGHTDLL.Test:");
+	TRACE_UNIMPLEMENTED("NIGHTDLL.Test:");
 }
 
 static void DebugScenario(void) { /* 66 */
-	DEBUG_COMMAND_YET("NIGHTDLL.DebugScenario:");
+	TRACE_UNIMPLEMENTED("NIGHTDLL.DebugScenario:");
 }
 
 static void GetDLLTime(void) { /* 67 */
@@ -589,7 +589,7 @@ static void GetDLLTime(void) { /* 67 */
 	int *p6 = getCaliVariable();
 	int *p7 = getCaliVariable();
 
-	DEBUG_COMMAND_YET("NIGHTDLL.GetDLLTime %p,%p,%p,%p,%p,%p,%p:", p1, p2, p3, p4, p5, p6, p7);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.GetDLLTime %p,%p,%p,%p,%p,%p,%p:", p1, p2, p3, p4, p5, p6, p7);
 }
 
 static const ModuleFunc functions[] = {

modules/NIGHTDLL/night.h

@@ -3,8 +3,6 @@
 
 #include "config.h"
 #include "portab.h"
-#include "graphics.h"
-#include "surface.h"
 #include "ags.h"
 #include "sprite.h"
 
@@ -39,13 +37,9 @@ struct _night {
 	int waitskiplv;
 	int waitkey;
 
-	
-	// graph
-	// cginfo_t *cg[CGMAX];
+	SDL_Rect updaterect;
 
-	MyRectangle updaterect;
-
-	int fonttype;
+	FontType fonttype;
 	int fontsize;
 
 	sprite_t *sp[SPRITEMAX];
@@ -55,7 +49,7 @@ struct _night {
 
 	// msg
 	char msgbuf[MSGBUFMAX];
-	boolean zhiding;
+	bool zhiding;
 	struct {
 		void (* cbmove)(agsevent_t *);
 		void (* cbrelease)(agsevent_t *);

modules/NIGHTDLL/nt_graph.c

@@ -1,11 +1,10 @@
 #include <stdio.h>
+#include <SDL.h>
 
 #include "portab.h"
 #include "system.h"
 #include "cg.h"
 #include "ags.h"
-#include "surface.h"
-#include "ngraph.h"
 #include "night.h"
 #include "sprite.h"
 #include "nt_scenario.h"
@@ -54,8 +53,8 @@ void nt_gr_set_wallpaper(int no) {
 	sp = nt_sp_new(SPNO_WALL, no, 0, 0, SPRITE_WP);
 	nt_sp_add_updatelist(sp);
 	if (no == 0) {
-		sp->cursize.width  = sf0->width;
-		sp->cursize.height = sf0->height;
+		sp->width  = main_surface->w;
+		sp->height = main_surface->h;
 		sp->update = nt_sp_draw_wall;
 	}
 	
@@ -178,28 +177,22 @@ void nt_gr_draw(int effectno) {
 		// 全消し
 		break;
 	case 1:
-		nt_sp_update_all(TRUE);
+		nt_sp_update_all(true);
 		break;
 	default:
 		if (night.waitskiplv > 1) {
-			nt_sp_update_all(TRUE);
+			nt_sp_update_all(true);
 			break;
 		}
-		//nt_sp_eupdate(effectno, effecttime, TRUE);
-		nt_sp_eupdate(effectno, 1000, TRUE);
+		//nt_sp_eupdate(effectno, effecttime, true);
+		nt_sp_eupdate(effectno, 1000, true);
 	}
 }
 
 void nt_gr_screencg(int no, int x, int y) {
-	surface_t *sf;
-	
-	sf = sf_loadcg_no(no -1);
-	
-	gre_BlendScreen(sf0, x, y, sf0, x, y, sf, 0, 0, sf->width, sf->height);
-	
-	ags_updateArea(x, y, sf->width, sf->height);
-	
-	sf_free(sf);
+	SDL_Surface *sf = cg_load_as_sdlsurface(no - 1);
+	SDL_SetSurfaceBlendMode(sf, SDL_BLENDMODE_ADD);
+	SDL_BlitSurface(sf, NULL, main_surface, &(SDL_Rect){x, y, sf->w, sf->h});
+	ags_updateArea(x, y, sf->w, sf->h);
+	SDL_FreeSurface(sf);
 }
-
-

modules/NIGHTDLL/nt_msg.c

@@ -3,15 +3,14 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#include <SDL.h>
 
 #include "portab.h"
 #include "system.h"
-#include "sdl_core.h"
 #include "utfsjis.h"
 #include "ags.h"
 #include "nact.h"
 #include "input.h"
-#include "ngraph.h"
 #include "drawtext.h"
 #include "night.h"
 #include "nt_msg.h"
@@ -25,23 +24,29 @@ extern int ntsel_dosel(void);
 #define SNAME_RYO "亮　　　　"
 #define SNAME_RYO_DEF "亮"
 
-// 通常メッセージ表示位置と大きさ
-#define MSGFRAME_0_X 6
-#define MSGFRAME_0_Y 347
-#define MSGFRAME_0_WIDTH 628
-#define MSGFRAME_0_HEIGHT 125
+// Normal message window
+static const SDL_Rect msgframe_0 = {
+	.x = 6,
+	.y = 347,
+	.w = 628,
+	.h = 125
+};
 
-// 画面全体メッセージ表示位置と大きさ
-#define MSGFRAME_1_X 0
-#define MSGFRAME_1_Y 0
-#define MSGFRAME_1_WIDTH 640
-#define MSGFRAME_1_HEIGHT 480
+// Full screen message window
+static const SDL_Rect msgframe_1 = {
+	.x = 0,
+	.y = 0,
+	.w = 640,
+	.h = 480
+};
 
-// 通常メッセージ(顔つき)表示位置と大きさ
-#define MSGFRAME_2_X (6+160)
-#define MSGFRAME_2_Y 347
-#define MSGFRAME_2_WIDTH (628-160)
-#define MSGFRAME_2_HEIGHT 125
+// Normal message (with face) window
+static const SDL_Rect msgframe_2 = {
+	.x = 6 + 160,
+	.y = 347,
+	.w = 628 - 160,
+	.h = 125
+};
 
 // キー入力アニメーション位置
 #define HAKANIM_LOC_X 620
@@ -69,7 +74,7 @@ void ntmsg_init() {
 	sprite_t *sp;
 
 	// メッセージスプライト
-	sp = night.sp[SPNO_MSGFRAME_FG] = nt_sp_msg_new(SPNO_MSGFRAME_FG, 0, 0, sf0->width, sf0->height);
+	sp = night.sp[SPNO_MSGFRAME_FG] = nt_sp_msg_new(SPNO_MSGFRAME_FG, 0, 0, main_surface->w, main_surface->h);
 	nt_sp_add_updatelist(sp);
 	
 	// メッセージ背景用CG
@@ -77,8 +82,8 @@ void ntmsg_init() {
 	nt_sp_add_updatelist(sp);
 	
 	// 文字背景CG作成
-	nt_scg_create(CGNO_MSGFR_BG,
-		   sf0->width, sf0->height,
+	scg_create(CGNO_MSGFR_BG,
+		   main_surface->w, main_surface->h,
 		   0, 0, 0, 255);
 	// night.cg[CGNO_MSGFR_BG]->refcnt++;
 	
@@ -87,15 +92,15 @@ void ntmsg_init() {
 	nt_sp_add_updatelist(sp);
 	
 	// キー入力アニメーションCG作成
-	nt_scg_cut(CGNO_MSGHAK_1, CGNO_MSGHAK_LCG, 0, 0, 9, 9);
+	scg_cut(CGNO_MSGHAK_1, CGNO_MSGHAK_LCG, 0, 0, 9, 9);
 	//night.cg[CGNO_MSGHAK_1]->refcnt++;
-	nt_scg_cut(CGNO_MSGHAK_2, CGNO_MSGHAK_LCG, 0, 9, 9, 9);
+	scg_cut(CGNO_MSGHAK_2, CGNO_MSGHAK_LCG, 0, 9, 9, 9);
 	//night.cg[CGNO_MSGHAK_2]->refcnt++;
 	sp = night.sp[SPNO_MSG_KEYANIM] = nt_sp_new(SPNO_MSG_KEYANIM, CGNO_MSGHAK_1, CGNO_MSGHAK_2, 0, SPRITE_ANIME);
 	sp->u.anime.interval = HAKANIM_INTERVAL;
 	nt_sp_add_updatelist(sp);
 	nt_sp_set_loc(sp, HAKANIM_LOC_X, HAKANIM_LOC_Y);
-	nt_sp_set_show(sp, FALSE);
+	nt_sp_set_show(sp, false);
 	sp->update = nt_sp_draw_scg;
 
 	
@@ -121,45 +126,34 @@ void ntmsg_init() {
 //   type=1 枠あり
 //   type=2 中央
 void ntmsg_set_frame(int type) {
-	surface_t *sf;
-	
 	night.msgframe = type;
 
-	sf = night.sp[SPNO_MSGBG]->curcg->sf;
-	memset(sf->pixel, 0, sf->bytes_per_line * sf->height);
-	memset(sf->alpha, 0, sf->width * sf->height);
+	SDL_Surface *sf = night.sp[SPNO_MSGBG]->curcg->sf;
+	SDL_FillRect(sf, NULL, 0);
 	
 	switch(type) {
 	case 0:
-		nt_sp_set_show(night.sp[SPNO_MSGBG], FALSE);
-		nt_sp_set_show(night.sp[SPNO_MSGFRAME_BG], FALSE);
-		nt_sp_set_show(night.sp[SPNO_MSGFRAME_FG], FALSE);
+		nt_sp_set_show(night.sp[SPNO_MSGBG], false);
+		nt_sp_set_show(night.sp[SPNO_MSGFRAME_BG], false);
+		nt_sp_set_show(night.sp[SPNO_MSGFRAME_FG], false);
 		break;
 	case 1:
-		nt_sp_set_show(night.sp[SPNO_MSGBG], TRUE);
-		nt_sp_set_show(night.sp[SPNO_MSGFRAME_BG], TRUE);
-		nt_sp_set_show(night.sp[SPNO_MSGFRAME_FG], TRUE);
+		nt_sp_set_show(night.sp[SPNO_MSGBG], true);
+		nt_sp_set_show(night.sp[SPNO_MSGFRAME_BG], true);
+		nt_sp_set_show(night.sp[SPNO_MSGFRAME_FG], true);
 		
-		gr_fill(sf, MSGFRAME_0_X, MSGFRAME_0_Y,
-			MSGFRAME_0_WIDTH, MSGFRAME_0_HEIGHT,
-			16, 32, 64);
-		gr_fill_alpha_map(sf, MSGFRAME_0_X, MSGFRAME_0_Y,
-				  MSGFRAME_0_WIDTH, MSGFRAME_0_HEIGHT, 192);
+		SDL_FillRect(sf, &msgframe_0, SDL_MapRGBA(sf->format, 16, 32, 64, 192));
 		ntmsg_clear(SPNO_MSGFRAME_FG);
-		nt_sp_update_all(TRUE);
+		nt_sp_update_all(true);
 		break;
 	case 2:
-		nt_sp_set_show(night.sp[SPNO_MSGBG], TRUE);
-		nt_sp_set_show(night.sp[SPNO_MSGFRAME_BG], FALSE);
-		nt_sp_set_show(night.sp[SPNO_MSGFRAME_FG], TRUE);
+		nt_sp_set_show(night.sp[SPNO_MSGBG], true);
+		nt_sp_set_show(night.sp[SPNO_MSGFRAME_BG], false);
+		nt_sp_set_show(night.sp[SPNO_MSGFRAME_FG], true);
 		
-		gr_fill(sf, MSGFRAME_1_X, MSGFRAME_1_Y,
-			MSGFRAME_1_WIDTH, MSGFRAME_1_HEIGHT,
-			32, 32, 32);
-		gr_fill_alpha_map(sf, MSGFRAME_1_X, MSGFRAME_1_Y,
-				  MSGFRAME_1_WIDTH, MSGFRAME_1_HEIGHT, 128);
+		SDL_FillRect(sf, &msgframe_1, SDL_MapRGBA(sf->format, 32, 32, 32, 128));
 		ntmsg_clear(SPNO_MSGFRAME_FG);
-		nt_sp_update_all(TRUE);
+		nt_sp_update_all(true);
 	
 		break;
 	}
@@ -221,8 +215,8 @@ int ntmsg_ana(void) {
 static void ntmsg_out(int wNum, int wSize, int wColorR, int wColorG, int wColorB, int wFont, int wSpeed, int wLineSpace) {
 	char *msg;
 	sprite_t *sp;
-	boolean needupdate = FALSE;
-	MyRectangle uparea = {0,0,0,0};
+	bool needupdate = false;
+	SDL_Rect uparea = {0,0,0,0};
 	int savex;
 	
 	if (night.msgbuf[0] == '\0') return;
@@ -241,7 +235,7 @@ static void ntmsg_out(int wNum, int wSize, int wColorR, int wColorG, int wColorB
 		char mbuf[20];
 		int cw, delta, wcnt;
 		
-		wcnt = sdl_getTicks();
+		wcnt = sys_get_ticks();
 		
 		mbuf[0] = '\0';
 		msg = get_char(msg, mbuf, sizeof(mbuf) -1); 
@@ -260,7 +254,7 @@ static void ntmsg_out(int wNum, int wSize, int wColorR, int wColorG, int wColorB
 				     mbuf,
 				     wColorR, wColorG, wColorB);
 		
-		needupdate = TRUE;
+		needupdate = true;
 		
 		if (wSpeed > 0) {
 			nt_sp_updateme_part(sp,
@@ -269,10 +263,10 @@ static void ntmsg_out(int wNum, int wSize, int wColorR, int wColorG, int wColorB
 					 cw,
 					 wSize);
 			nt_sp_update_clipped();
-			needupdate = FALSE;
+			needupdate = false;
 			
 			// keywait
-			delta = sdl_getTicks() - wcnt;
+			delta = sys_get_ticks() - wcnt;
 			if (delta < wSpeed) {
 				if (sys_keywait(wSpeed - delta, KEYWAIT_NONCANCELABLE)) {
 					
@@ -289,8 +283,8 @@ static void ntmsg_out(int wNum, int wSize, int wColorR, int wColorG, int wColorB
 	
 	// Waitなしの出力は最後にupdate
 	if (needupdate) {
-		uparea.w = sp->cursize.width;
-		uparea.h = min(sp->cursize.height, uparea.y - sp->u.msg.dspcur.y + wLineSpace + wLineSpace);
+		uparea.w = sp->width;
+		uparea.h = min(sp->height, uparea.y - sp->u.msg.dspcur.y + wLineSpace + wLineSpace);
 		nt_sp_updateme_part(sp, uparea.x, uparea.y, uparea.w, uparea.h);
 	}
 	
@@ -316,14 +310,14 @@ static int ntmsg_keywait() {
 	night.waitkey = -1;
 	
 	while (night.waitkey == -1 && !nact->is_quit) {
-		int st = sdl_getTicks();
+		int st = sys_get_ticks();
 		int interval = 25;
 		
 		if (!night.zhiding) {
 			interval = night.sp[SPNO_MSG_KEYANIM]->u.anime.interval;
 			hakanim(i++);
 		} 
-		sys_keywait(interval - (sdl_getTicks() - st), KEYWAIT_NONCANCELABLE);
+		sys_keywait(interval - (sys_get_ticks() - st), KEYWAIT_NONCANCELABLE);
 	}
 	
 	night.waittype = KEYWAIT_NONE;
@@ -337,8 +331,8 @@ static void set_align(char *msg, sprite_t *sp, int wSize) {
 	
 	switch(night.msgplace) {
 	case 0:
-		sp->u.msg.dspcur.x = MSGFRAME_0_X;
-		sp->u.msg.dspcur.y = MSGFRAME_0_Y + 8;
+		sp->u.msg.dspcur.x = msgframe_0.x;
+		sp->u.msg.dspcur.y = msgframe_0.y + 8;
 		break;
 		
 	case 1:
@@ -360,12 +354,12 @@ static void set_align(char *msg, sprite_t *sp, int wSize) {
 		
 		maxchar = max(maxchar, c);
 		line++;
-		sp->u.msg.dspcur.x = (sp->cursize.width - (maxchar * wSize/2)) /2;
-		sp->u.msg.dspcur.y = (sp->cursize.height - (line * (wSize+2))) /2;
+		sp->u.msg.dspcur.x = (sp->width - (maxchar * wSize/2)) /2;
+		sp->u.msg.dspcur.y = (sp->height - (line * (wSize+2))) /2;
 		break;
 	case 2:
-		sp->u.msg.dspcur.x = MSGFRAME_2_X;
-		sp->u.msg.dspcur.y = MSGFRAME_2_Y + 8;
+		sp->u.msg.dspcur.x = msgframe_2.x;
+		sp->u.msg.dspcur.y = msgframe_2.y + 8;
 		break;
 	}
 	
@@ -424,7 +418,7 @@ static void setup_hakanim() {
 // メッセージ表示時のキー入力を促すアニメーション
 static void hakanim(int i) {
 	sprite_t *sp;
-	boolean show;
+	bool show;
 	
 	sp = night.sp[SPNO_MSG_KEYANIM];
 	if (sp == NULL) return;
@@ -434,60 +428,43 @@ static void hakanim(int i) {
 	} else {
 		sp->curcg = sp->cg2;
 	}
-	sp->show = TRUE;
+	sp->show = true;
 	nt_sp_updateme(sp);
 	nt_sp_update_clipped();
 	
 	sp->show = show;
 }
 
-int ntmsg_update(sprite_t *sp, MyRectangle *r) {
-	int sx, sy, w, h, dx, dy;
-	surface_t update;
-	
-	// canvas が clean のときはなにもしない
-	//  -> 説明スプライトのように、SetShowされたときに対応できないからだめ 
-	//if (sact.msgbufempty) return OK;
-	
-	update.width  = r->w;
-	update.height = r->h;
-	
-	dx = sp->cur.x - r->x;
-	dy = sp->cur.y - r->y;
-	
-	w = sp->cursize.width;
-	h = sp->cursize.height;
-	
-	sx = 0; sy = 0;
-	
-	if (!gr_clip(sp->u.msg.canvas, &sx, &sy, &w, &h, &update, &dx, &dy)) {
-		return NG;
+void ntmsg_update(sprite_t *sp, SDL_Rect *r) {
+	SDL_Rect sp_rect = {0, 0, sp->width, sp->height};
+	int sx = 0;
+	int sy = 0;
+	int dx = sp->cur.x;
+	int dy = sp->cur.y;
+	int w = sp->width;
+	int h = sp->height;
+	if (!ags_clipCopyRect(&sp_rect, r, &sx, &sy, &dx, &dy, &w, &h)) {
+		return;
 	}
-	
-	dx += r->x;
-	dy += r->y;
-	
-	gre_BlendUseAMap(sf0, dx, dy, sf0, dx, dy, sp->u.msg.canvas, sx, sy, w, h, sp->u.msg.canvas, sx, sy, sp->blendrate);
-	
+
+	SDL_SetSurfaceBlendMode(sp->u.msg.canvas, SDL_BLENDMODE_BLEND);
+	SDL_SetSurfaceAlphaMod(sp->u.msg.canvas, sp->blendrate);
+	SDL_BlitSurface(sp->u.msg.canvas, &(SDL_Rect){sx, sy, w, h}, main_surface, &(SDL_Rect){dx, dy, w, h});
+
 	SACT_DEBUG("do update no=%d, sx=%d, sy=%d, w=%d, h=%d, dx=%d, dy=%d",
 		sp->no, sx, sy, w, h, dx, dy);
-	
-	return OK;
 }
 
 static void ntmsg_clear(int wNum) {
 	sprite_t *sp = night.sp[wNum];
-	surface_t *sf;
-	
+
 	sp->u.msg.dspcur.x = 0;
 	sp->u.msg.dspcur.y = 0;
 	
 	night.msgbuf[0]  = '\0';
-	
-	// キャンバスのクリア
-	sf = sp->u.msg.canvas;
-	memset(sf->pixel, 0, sf->bytes_per_line * sf->height);
-	memset(sf->alpha, 0, sf->width * sf->height);
-	
+
+	// Clear the canvas
+	SDL_FillRect(sp->u.msg.canvas, NULL, 0);
+
 	nt_sp_updateme(sp);
 }

modules/NIGHTDLL/nt_msg.h

@@ -1,12 +1,12 @@
 #ifndef __NT_MSG_H__
 #define __NT_MSG_H__
 
-extern void ntmsg_init();
-extern void ntmsg_set_frame(int type);
-extern void ntmsg_set_place(int type);
-extern void ntmsg_newline();
-extern void ntmsg_add(const char *msg);
-extern int  ntmsg_ana(void);
-extern int  ntmsg_update(sprite_t *sp, MyRectangle *r);
+void ntmsg_init();
+void ntmsg_set_frame(int type);
+void ntmsg_set_place(int type);
+void ntmsg_newline();
+void ntmsg_add(const char *msg);
+int  ntmsg_ana(void);
+void ntmsg_update(sprite_t *sp, SDL_Rect *r);
 
 #endif /* __NT_MSG_H__ */

modules/NIGHTDLL/nt_scenario.c

@@ -8,7 +8,7 @@
 #include "portab.h"
 #include "system.h"
 #include "input.h"
-#include "sdl_core.h"
+#include "scheduler.h"
 #include "xsystem35.h"
 #include "nact.h"
 #include "scenario.h"
@@ -52,7 +52,8 @@ static void ntmain(struct _scoadr inadr) {
 	struct _scoadr curadr;
 
 	while (!nact->is_quit) {
-		for (int cnt = 0; !nact->is_quit && !nact->wait_vsync && cnt < 10000; cnt++) {
+		while (!nact->is_quit && !is_yield_requested()) {
+			scheduler_on_command();
 			//SACT_DEBUG("%d:%x", sl_getPage(), sl_getIndex());
 			if (!nact->popupmenu_opened) {
 				exec_command();
@@ -71,9 +72,7 @@ static void ntmain(struct _scoadr inadr) {
 			nact->callback();
 		}
 		sys_getInputInfo();
-		sdl_wait_vsync();
-		nact->frame_count++;
-		nact->wait_vsync = FALSE;
+		scheduler_yield();
 	}
 }
 
@@ -107,9 +106,9 @@ void nt_sco_callevent(int ev) {
 }
 
 
-boolean nt_sco_is_natsu() {
-	if (night.Month < 6 || night.Month > 9) return FALSE;
-	if (night.Month == 6 && night.Day < 11) return FALSE;
-	return TRUE;
+bool nt_sco_is_natsu() {
+	if (night.Month < 6 || night.Month > 9) return false;
+	if (night.Month == 6 && night.Day < 11) return false;
+	return true;
 }
 

modules/NIGHTDLL/nt_scenario.h

@@ -3,7 +3,7 @@
 
 extern void    nt_sco_init();
 extern int     nt_sco_main(int mode);
-extern boolean nt_sco_is_natsu();
+extern bool nt_sco_is_natsu();
 extern void nt_sco_callevent(int ev);
 
 #endif /* __NT_SCENARIO_H__ */

modules/NIGHTDLL/nt_sound.c

@@ -10,7 +10,7 @@ struct _ntsnd {
 	int no;
 	int vol;
 	int loop;
-	boolean waitend;
+	bool waitend;
 };
 static struct _ntsnd ntsnd[10];
 
@@ -27,14 +27,14 @@ void nt_cd_play(int no) {
 }
 
 void nt_cd_stop(int msec) {
-	mus_mixer_fadeout_start(MIX_CD, msec, 0, TRUE);
+	mus_mixer_fadeout_start(MIX_CD, msec, 0, true);
 }
 
-void nt_cd_mute(boolean mute) {
+void nt_cd_mute(bool mute) {
 	if (mute) {
-		mus_mixer_fadeout_start(MIX_CD, 0, 0, FALSE);
+		mus_mixer_fadeout_start(MIX_CD, 0, 0, false);
 	} else {
-		mus_mixer_fadeout_start(MIX_CD, 0, 100, FALSE);
+		mus_mixer_fadeout_start(MIX_CD, 0, 100, false);
 	}
 }
 
@@ -56,7 +56,7 @@ void nt_snd_setvol(int ch, int vol) {
 	ntsnd[ch -1].vol = vol;
 }
 
-void nt_snd_waitend(int ch, boolean waitend) {
+void nt_snd_waitend(int ch, bool waitend) {
 	if (ch < 1) return;
 
 	ntsnd[ch -1].waitend = waitend;
@@ -74,13 +74,13 @@ void nt_snd_play(int ch) {
 void nt_snd_stop(int ch, int msec) {
 	if (ch < 1) return;
 	
-	mus_wav_fadeout_start(ch, msec, 0, TRUE);
+	mus_wav_fadeout_start(ch, msec, 0, true);
 }
 
 void nt_snd_stopall(int msec) {
 	int i;
 	
 	for (i = 1; i <= 10; i++) {
-		mus_wav_fadeout_start(i, msec, 0, TRUE);
+		mus_wav_fadeout_start(i, msec, 0, true);
 	}
 }

modules/NIGHTDLL/nt_sound.h

@@ -6,11 +6,11 @@
 extern void nt_voice_set(int no);
 extern void nt_cd_play(int no);
 extern void nt_cd_stop(int msec);
-extern void nt_cd_mute(boolean mute);
+extern void nt_cd_mute(bool mute);
 extern void nt_snd_setwave(int ch, int no);
 extern void nt_snd_setloop(int ch, int num);
 extern void nt_snd_setvol(int ch, int vol);
-extern void nt_snd_waitend(int ch, boolean waitend);
+extern void nt_snd_waitend(int ch, bool waitend);
 extern void nt_snd_play(int ch);
 extern void nt_snd_stop(int ch, int msec);
 extern void nt_snd_stopall(int msec);

modules/NIGHTDLL/sactcg.c

@@ -1,345 +0,0 @@
-/*
- * sactcg.c: CG作成
- *
- * Copyright (C) 1997-1998 Masaki Chikama (Wren) <chikama@kasumi.ipl.mech.nagoya-u.ac.jp>
- *               1998-                           <masaki-c@is.aist-nara.ac.jp>
- *
- * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
-*/
-/* $Id: sactcg.c,v 1.2 2003/11/16 15:29:52 chikama Exp $ */
-
-#include "config.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "portab.h"
-#include "nact.h"
-#include "system.h"
-#include "ags.h"
-#include "surface.h"
-#include "ngraph.h"
-#include "sactcg.h"
-
-#define CGMAX 65536
-static cginfo_t *cgs[CGMAX];
-
-#include "sactcg_stretch.c"
-#include "sactcg_blend.c"
-
-
-#define spcg_assert_no(no) \
-  if ((no) > (CGMAX -1)) { \
-    WARNING("no is too large (should be %d < %d)", (no), CGMAX); \
-    return NG; \
-  } \
-
-static cginfo_t *nt_scg_new(enum cgtype type, int no, surface_t *sf) {
-	cginfo_t *info = calloc(1, sizeof(cginfo_t));
-	info->type = type;
-	info->no = no;
-	info->sf = sf;
-	info->refcnt = 1;
-
-	nt_scg_free(no);
-	cgs[no] = info;
-
-	return info;
-}
-
-/*
-  cgの読み込み
-
-    指定の番号のCGをリンクファイルから読み込んだり、
-    CG_xxxで作成したCGを参照する
-    
-  @param no: 読み込むCG番号
-*/
-static cginfo_t *nt_scg_get(int no) {
-	if (no >= (CGMAX -1)) {
-		WARNING("no is too large (should be %d < %d)", (no), CGMAX);
-		return NULL;
-	}
-	
-	if (cgs[no] != NULL)
-		return cgs[no];
-
-	surface_t *sf = sf_loadcg_no(no - 1);
-	if (!sf) {
-		WARNING("load fail (%d)", no -1);
-		return NULL;
-	}
-	return nt_scg_new(CG_LINKED, no, sf);
-}
-
-cginfo_t *nt_scg_addref(int no) {
-	cginfo_t *info = nt_scg_get(no);
-	if (info)
-		info->refcnt++;
-	return info;
-}
-
-void nt_scg_deref(cginfo_t *cg) {
-	if (--cg->refcnt > 0)
-		return;
-
-	if (cg->sf)
-		sf_free(cg->sf);
-	free(cg);
-}
-
-//  指定の大きさ、色の矩形の CG を作成
-int nt_scg_create(int wNumCG, int wWidth, int wHeight, int wR, int wG, int wB, int wBlendRate) {
-	spcg_assert_no(wNumCG);
-
-	surface_t *sf = sf_create_surface(wWidth, wHeight, sf0->depth);
-	gr_fill(sf, 0, 0, wWidth, wHeight, wR, wG, wB);
-	gr_fill_alpha_map(sf, 0, 0, wWidth, wHeight, wBlendRate);
-	nt_scg_new(CG_SET, wNumCG, sf);
-	return OK;
-}
-
-// 指定のCGを反転させたCGを作成
-int nt_scg_create_reverse(int wNumCG, int wNumSrcCG, int wReverseX, int wReverseY) {
-	spcg_assert_no(wNumCG);
-	spcg_assert_no(wNumSrcCG);
-	
-	cginfo_t *src = nt_scg_get(wNumSrcCG);
-	if (!src)
-		return NG;
-
-	surface_t *sf = stretch(src->sf, src->sf->width, src->sf->height, (wReverseX << 1) | wReverseY);
-	nt_scg_new(CG_REVERSE, wNumCG, sf);
-	return OK;
-}
-
-// 指定のCGを拡大/縮小したCGを作成
-int nt_scg_create_stretch(int wNumCG, int wWidth, int wHeight, int wNumSrcCG) {
-	spcg_assert_no(wNumCG);
-	spcg_assert_no(wNumSrcCG);
-
-	cginfo_t *src = nt_scg_get(wNumSrcCG);
-	if (!src)
-		return NG;
-	
-	surface_t *sf = stretch(src->sf, wWidth, wHeight, 0);
-	nt_scg_new(CG_STRETCH, wNumCG, sf);
-	return OK;
-}
-
-// ベースCGの上にブレンドCGを重ねた CG を作成
-int nt_scg_create_blend(int wNumDstCG, int wNumBaseCG, int wX, int wY, int wNumBlendCG, int wAlphaMapMode) {
-	spcg_assert_no(wNumDstCG);
-	spcg_assert_no(wNumBaseCG);
-	spcg_assert_no(wNumBlendCG);
-
-	cginfo_t *basecg  = nt_scg_get(wNumBaseCG);
-	cginfo_t *blendcg = nt_scg_get(wNumBlendCG);
-	if (!basecg || !blendcg) return NG;
-
-	surface_t *sf = blend(basecg->sf, wX, wY, blendcg->sf, wAlphaMapMode);
-	nt_scg_new(CG_SET, wNumDstCG, sf);
-	return OK;
-}
-
-// 指定の文字列のCGを作成
-int nt_scg_create_text(int wNumCG, int wSize, int wR, int wG, int wB, char *cText) {
-	spcg_assert_no(wNumCG);
-	
-	// 勝手に出ていいのかな？
-	if (strlen(cText) == 0) return OK;
-	
-	ags_setFont(FONT_GOTHIC, wSize);
-	agsurface_t *glyph = ags_drawStringToSurface(cText);
-
-	surface_t *sf = sf_create_surface(glyph->width, wSize, nact->ags.dib->depth);
-	gr_fill(sf, 0, 0, glyph->width, wSize, wR, wG, wB);
-	gr_draw_amap(sf, 0, 0, glyph->pixel, glyph->width, wSize, glyph->bytes_per_line);
-
-	nt_scg_new(CG_SET, wNumCG, sf);
-	return OK;
-}
-
-// 数字文字列のCGを作成
-int nt_scg_create_textnum(int wNumCG, int wSize, int wR, int wG, int wB, int wFigs, int wZeroPadding, int wValue) {
-	spcg_assert_no(wNumCG);
-
-	char s[256], ss[256];
-	if (wZeroPadding) {
-		char *sss = "%%0%dd";
-		sprintf(ss, sss, wFigs);
-	} else {
-		char *sss = "%%%dd";
-		sprintf(ss, sss, wFigs);
-	}
-	sprintf(s, ss, wValue);
-	
-	ags_setFont(FONT_GOTHIC, wSize);
-	agsurface_t *glyph = ags_drawStringToSurface(s);
-	
-	surface_t *sf = sf_create_surface(glyph->width, wSize, nact->ags.dib->depth);
-	gr_fill(sf, 0, 0, glyph->width, wSize, wR, wG, wB);
-	gr_draw_amap(sf, 0, 0, glyph->pixel, glyph->width, wSize, glyph->bytes_per_line);
-
-	nt_scg_new(CG_SET, wNumCG, sf);
-	return OK;
-}
-
-// CGを複製
-int nt_scg_copy(int wNumDstCG, int wNumSrcCG) {
-	spcg_assert_no(wNumDstCG);
-	spcg_assert_no(wNumSrcCG);
-
-	cginfo_t *src = nt_scg_get(wNumSrcCG);
-	if (!src)
-		return NG;
-
-	nt_scg_new(CG_SET, wNumDstCG, sf_dup(src->sf));
-	return OK;
-}
-
-// CGの一部を切りぬいたCGを作成
-int nt_scg_cut(int wNumDstCG, int wNumSrcCG, int wX, int wY, int wWidth, int wHeight) {
-	spcg_assert_no(wNumDstCG);
-	spcg_assert_no(wNumSrcCG);
-
-	cginfo_t *src = nt_scg_get(wNumSrcCG);
-	if (!src)
-		return NG;
-
-	surface_t *sf = src->sf->alpha
-		? sf_create_surface(wWidth, wHeight, src->sf->depth)
-		: sf_create_pixel(wWidth, wHeight, src->sf->depth);
-
-	if (src->sf->pixel)
-		gr_copy(sf, 0, 0, src->sf, wX, wY, wWidth, wHeight);
-	if (src->sf->alpha)
-		gr_copy_alpha_map(sf, 0, 0, src->sf, wX, wY, wWidth, wHeight);
-
-	nt_scg_new(CG_SET, wNumDstCG, sf);
-	return OK;
-}
-
-// 元のCGの一部を切りぬいたCGを作成
-int nt_scg_partcopy(int wNumDstCG, int wNumSrcCG, int wX, int wY, int wWidth, int wHeight) {
-	spcg_assert_no(wNumDstCG);
-	spcg_assert_no(wNumSrcCG);
-
-	cginfo_t *src = nt_scg_get(wNumSrcCG);
-	if (!src)
-		return NG;
-
-	surface_t *sf;
-	if (src->sf->alpha) {
-		sf = sf_create_surface(src->sf->width, src->sf->height, src->sf->depth);
-		gr_fill_alpha_map(sf, 0, 0, src->sf->width, src->sf->height, 255);
-	} else {
-		sf = sf_create_pixel(src->sf->width, src->sf->height, src->sf->depth);
-	}
-	
-	if (src->sf->pixel)
-		gr_copy(sf, wX, wY, src->sf, wX, wY, wWidth, wHeight);
-	if (src->sf->alpha)
-		gr_copy_alpha_map(sf, wX, wY, src->sf, wX, wY, wWidth, wHeight);
-
-	nt_scg_new(CG_SET, wNumDstCG, sf);
-	return OK;
-}
-
-// 全てのCGの開放
-int nt_scg_freeall() {
-	int i;
-	
-	for (i = 1; i < CGMAX; i++) {
-		nt_scg_free(i);
-	}
-	return OK;
-}
-
-/**
- * 指定の番号の CG をオブジェクトリストから消し、オブジェクトがどこからも参照
- * されていない(参照数が0の)場合のみ、オブジェクトを削除
- */
-int nt_scg_free(int no) {
-	spcg_assert_no(no);
-	
-	cginfo_t *cg = cgs[no];
-	if (!cg) return NG;
-	
-	nt_scg_deref(cg);
-	cgs[no] = NULL;
-	
-	return OK;
-}
-
-// CGの種類を取得
-int nt_scg_querytype(int wNumCG, int *ret) {
-	if (wNumCG >= (CGMAX -1)) goto errexit;
-	if (cgs[wNumCG] == NULL) goto errexit;
-
-	*ret = cgs[wNumCG]->type;
-	
-	return OK;
-
- errexit:
-	*ret = CG_NOTUSED;
-	return NG;
-}
-
-// CGの大きさを取得
-int nt_scg_querysize(int wNumCG, int *w, int *h) {
-	if (wNumCG >= (CGMAX -1)) goto errexit;
-	if (cgs[wNumCG] == NULL) goto errexit;
-	if (cgs[wNumCG]->sf == NULL) goto errexit;
-
-	*w = cgs[wNumCG]->sf->width;
-	*h = cgs[wNumCG]->sf->height;
-	
-	return OK;
-
- errexit:
-	*w = *h = 0;
-	return NG;
-}
-
-// CGのBPPを取得
-int nt_scg_querybpp(int wNumCG, int *ret) {
-	if (wNumCG >= (CGMAX -1)) goto errexit;
-	if (cgs[wNumCG] == NULL) goto errexit;
-	if (cgs[wNumCG]->sf == NULL) goto errexit;
-	
-	*ret = cgs[wNumCG]->sf->depth;
-
-	return OK;
-
- errexit:
-	*ret = 0;
-	return NG;
-}
-
-// CGの alphamap が存在するかを取得
-int nt_scg_existalphamap(int wNumCG, int *ret) {
-	if (wNumCG >= (CGMAX -1)) goto errexit;
-	if (cgs[wNumCG] == NULL) goto errexit;
-	if (cgs[wNumCG]->sf == NULL) goto errexit;
-	
-	*ret = cgs[wNumCG]->sf->alpha ? 1 : 0;
-	
- errexit:
-	*ret = 0;
-	return NG;
-}

modules/NIGHTDLL/sactcg.h

@@ -1,49 +0,0 @@
-/*
- * sactcg.h: CG作成
- *
- * Copyright (C) 1997-1998 Masaki Chikama (Wren) <chikama@kasumi.ipl.mech.nagoya-u.ac.jp>
- *               1998-                           <masaki-c@is.aist-nara.ac.jp>
- *
- * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
-*/
-/* $Id: sactcg.h,v 1.2 2003/11/16 15:29:52 chikama Exp $ */
-
-#ifndef __SACTCG_H__
-#define __SACTCG_H__
-
-#include "portab.h"
-#include "night.h"
-
-extern cginfo_t *nt_scg_addref(int no);
-extern void nt_scg_deref(cginfo_t *cg);
-extern int nt_scg_create(int wNumCG, int wWidth, int wHeight, int wR, int wG, int wB, int wBlendRate);
-extern int nt_scg_create_reverse(int NumCG, int wNumSrcCG, int wReverseX, int wReverseY);
-extern int nt_scg_create_stretch(int wNumCG, int wWidth, int wHeight, int wNumSrcCG);
-extern int nt_scg_create_blend(int wNumDstCG, int wNumBaseCG, int wX, int wY, int wNumBlendCG, int wAlphaMapMode);
-extern int nt_scg_create_text(int wNumCG, int wSize, int wR, int wG, int wB, char *cText);
-extern int nt_scg_create_textnum(int wNumCG, int wSize, int wR, int wG, int wB, int wFigs, int wZeroPadding, int wValue);
-extern int nt_scg_copy(int wNumDstCG, int wNumSrcCG);
-extern int nt_scg_cut(int wNumDstCG, int wNumSrcCG, int wX, int wY, int wWidth, int wHeight);
-extern int nt_scg_partcopy(int wNumDstCG, int wNumSrcCG, int wX, int wY, int wWidth, int wHeight);
-extern int nt_scg_freeall();
-extern int nt_scg_free(int cg);
-extern int nt_scg_querytype(int wNumCG, int *ret);
-extern int nt_scg_querysize(int wNumCG, int *w, int *h);
-extern int nt_scg_querybpp(int wNumCG, int *ret);
-extern int nt_scg_existalphamap(int wNumCG, int *ret);
-extern int nt_scg_linkcgfree(int no);
-
-#endif

modules/NIGHTDLL/sactcg_blend.c

@@ -1,31 +0,0 @@
-// 
-static surface_t *blend(surface_t *base, int x, int y, surface_t *blend, int mode) {
-	surface_t *dst = sf_create_surface(base->width, base->height, base->depth);
-	
-	gr_copy(dst, 0, 0, base, 0, 0, base->width, base->height);
-	
-	if (base->alpha) {
-		// ベースに alpha map がある場合はそれをコピー
-		gr_copy_alpha_map(dst, 0, 0, base, 0, 0, base->width, base->height);
-	} else {
-		// 無い場合は全て 255 の map を作成
-		gr_fill_alpha_map(dst, 0, 0, base->width, base->height, 255);
-	}
-	
-	if (blend->alpha) {
-		// 重ね合わせ先の alpha map があるときはそれを使う
-		gre_BlendUseAMap(dst, x, y, base, x, y, blend, 0, 0, blend->width, blend->height, blend, 0, 0, 255);
-	} else {
-		// 無いときは dst の alpha map を使う
-		gre_BlendUseAMap(dst, x, y, base, x, y, blend, 0, 0, blend->width, blend->height, dst, x, y, 255);
-	}
-	
-	// alpha 作成モードが dst + blend の時は飽和加算
-	if (mode == 1) {
-		gr_saturadd_alpha_map(dst, x, y, blend, 0, 0, blend->width, blend->height);
-	}
-	
-	return dst;
-}
-
-

modules/NIGHTDLL/sactcg_stretch.c

@@ -1,114 +0,0 @@
-// 拡大縮小
-static surface_t *stretch(surface_t *src, int dw, int dh, int mirror) {
-	surface_t *dst = calloc(1, sizeof(surface_t));
-	float    a1, a2, xd, yd;
-	int      sw, sh;
-	int      *row, *col;
-	int      x, y;
-	uint8_t  *sdata, *ddata;
-	
-	dst->width = dw;
-	dst->height = dh;
-	dst->depth = src->depth;
-	dst->bytes_per_line = dw * src->bytes_per_pixel;
-	dst->bytes_per_pixel = src->bytes_per_pixel;
-	
-	if (src->pixel) {
-		dst->pixel = malloc(dh * dst->bytes_per_line);
-	}
-	if (src->alpha) {
-		dst->alpha = malloc(dw * dh);
-	}
-	
-	
-	sdata = GETOFFSET_PIXEL(src, 0, 0);
-	ddata = GETOFFSET_PIXEL(dst, 0, 0);
-	sw = src->width;
-	sh = src->height;
-	
-	a1  = (float)sw / (float)dw;
-	a2  = (float)sh / (float)dh;
-	row = malloc(sizeof(int) * dw);
-	// 1おおきくして初期化しないと col[dw-1]とcol[dw]が同じになる
-	// 可能性がある。
-	col = calloc(dh +1, sizeof(int));
-	
-	if (mirror & 1) {
-		/* 上下反転 added by  tajiri@wizard */
-		for (yd = sh - a2, y = 0; y < dh; y++) {
-			col[y] = yd; yd -= a2;
-		}
-	} else {
-		for (yd = 0.0, y = 0; y < dh; y++) {
-			col[y] = yd; yd += a2;
-		}
-	}
-	if (mirror & 2) {
-		/* 左右反転 added by  tajiri@wizard */
-		for (xd = sw - a1, x = 0; x < dw; x++) {
-			row[x] = xd; xd -= a1;
-		}
-	} else {
-		for (xd = 0.0, x = 0; x < dw; x++) {
-			row[x] = xd; xd += a1;
-		}
-	}
-	
-#define SCALEDCOPYAREA(type) {                                          \
-	int x, y;                                                       \
-	type *sl, *dl;                                                  \
-	uint8_t *_sl, *_dl;                                                \
-	for (y = 0; y < dh; y++) {                                      \
-		sl = (type *)(sdata + *(y + col) * src->bytes_per_line);\
-		dl = (type *)(ddata +   y        * dst->bytes_per_line);\
-		for (x = 0; x < dw; x++) {                              \
-			*(dl + x) = *(sl + *(row + x));                 \
-		}                                                       \
-		_dl = (uint8_t *)dl;                                       \
-		while(*(col + y) == *(col + y + 1)) {                   \
-			_sl = _dl;                                      \
-			_dl += dst->bytes_per_line;                     \
-			memcpy(_dl, _sl, dw * sizeof(type));            \
-			y++;                                            \
-		}                                                       \
-	}}
-	
-	switch(dst->depth) {
-	case 8:	
-		SCALEDCOPYAREA(uint8_t); break;
-	case 16:
-		SCALEDCOPYAREA(uint16_t); break;
-	case 24:
-	case 32:
-		SCALEDCOPYAREA(uint32_t); break;
-	default:
-		break;
-	}
-	
-	if (src->alpha) {
-		int x, y;
-		uint8_t *sl, *dl;
-		uint8_t *_sl, *_dl;
-		sdata = GETOFFSET_ALPHA(src, 0, 0);
-		ddata = GETOFFSET_ALPHA(dst, 0, 0);
-		for (y = 0; y < dh; y++) {
-			sl = (uint8_t *)(sdata + *(y + col) * src->width);
-			dl = (uint8_t *)(ddata +   y        * dst->width);
-			for (x = 0; x < dw; x++) {
-				*(dl + x) = *(sl + *(row + x));
-			}
-			_dl = (uint8_t *)dl;
-			while(*(col + y) == *(col + y + 1)) {
-				_sl = _dl;
-				_dl += dst->width;
-				memcpy(_dl, _sl, dw);
-				y++;
-			}
-		}
-	}
-	
-	free(row);
-	free(col);
-	
-	return dst;
-}

modules/NIGHTDLL/sactstring.c

@@ -51,14 +51,13 @@ static char *replacedst;
 /**
  * 文字列変数スタックの初期化
  */
-int nt_sstr_init() {
+void nt_sstr_init(void) {
 	stack = malloc(sizeof(char *) * DEFSTACKSIZE);
 	idx = 0;
 	idxmax = DEFSTACKSIZE;
-	return OK;
 }
 
-int nt_sstr_reset(void) {
+void nt_sstr_reset(void) {
 	for (int i = 0; i < idx; i++)
 		free(stack[i]);
 	idx = 0;
@@ -73,35 +72,6 @@ int nt_sstr_reset(void) {
 	}
 	slist_free(strreplace);
 	strreplace = NULL;
-	return OK;
-}
-
-/**
- * 文字列変数スタックに文字列を積む
- * @param strno: シナリオ上での文字列変数番号
- */
-int nt_sstr_push(char *str) {
-	if (idx >= idxmax) {
-		stack = realloc(stack, sizeof(char *) * idx*2);
-		idxmax = idx*2;
-	}
-	
-	stack[idx++] = strdup(str);
-	
-	return OK;
-}
-
-/**
- * 文字列変数スタックから文字列を取り出す
- * @param strno: スタックから戻した文字列を格納する文字列変数番号
- */
-int nt_sstr_pop(char *str, int maxlen) {
-	if (idx == 0) return NG;
-	
-	strncpy(str, stack[--idx], maxlen);
-	free(stack[idx]);
-	
-	return OK;
 }
 
 /**
@@ -109,36 +79,15 @@ int nt_sstr_pop(char *str, int maxlen) {
  * @param sstrno: 変換元文字列変数番号
  * @param dstrno: 変換先文字列変数番号
  */
-int nt_sstr_regist_replace(char *sstr, char *dstr) {
+void nt_sstr_regist_replace(char *sstr, char *dstr) {
 	strexchange_t *ex;
 	
-	if (sstr == dstr) return NG;
+	if (sstr == dstr) return;
 	
 	ex = malloc(sizeof(strexchange_t));
 	ex->src = sstr;
 	ex->dst = dstr;
 	strreplace = slist_append(strreplace, ex);
-	return OK;
-}
-
-/**
- * 数値 -> 文字列化
- */
-int nt_sstr_num2str(int strno, int fig, int nzeropad, int num) {
-	char s[256], ss[256];
-	
-	if (nzeropad) {
-		char *sss = "%%0%dd";
-		sprintf(ss, sss, fig);
-	} else {
-		char *sss = "%%%dd";
-		sprintf(ss, sss, fig);
-	}
-	
-	sprintf(s, ss, num);
-	svar_set(strno, s);
-	
-	return OK;
 }
 
 // 文字列の置き換え処理
@@ -151,7 +100,7 @@ static void replacestr_cb(void* data, void* userdata) {
 	start = replacesrc;
 	out   = replacedst;
 	
-	while (TRUE) {
+	while (true) {
 		next = strstr(start, ex->src);
 		if (next == NULL) break;
 		strncat(out, start, (size_t)(next - start));

modules/NIGHTDLL/sactstring.h

@@ -24,13 +24,10 @@
 #ifndef __SACTSTRING_H__
 #define __SACTSTRING_H__
 
-extern int nt_sstr_init();
-extern int nt_sstr_reset(void);
-extern int nt_sstr_push(char *str);
-extern int nt_sstr_pop(char *str, int maxlen);
-extern int nt_sstr_regist_replace(char *sstr, char *dstr);
-extern int nt_sstr_num2str(int strno, int fig, int nzeropad, int num);
-extern char *nt_sstr_replacestr(char *msg);
+void nt_sstr_init(void);
+void nt_sstr_reset(void);
+void nt_sstr_regist_replace(char *sstr, char *dstr);
+char *nt_sstr_replacestr(char *msg);
 
 
 #endif /* __SACTSTRING_H__ */

modules/NIGHTDLL/sprite.c

@@ -1,12 +1,11 @@
 #include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
+#include <SDL.h>
 
 #include "portab.h"
 #include "sprite.h"
 #include "sactcg.h"
-#include "surface.h"
-#include "ngraph.h"
 #include "nt_msg.h"
 
 sprite_t *nt_sp_new(int no, int cg1, int cg2, int cg3, int type) {
@@ -17,23 +16,23 @@ sprite_t *nt_sp_new(int no, int cg1, int cg2, int cg3, int type) {
 	sp->no = no;
 	sp->type = type;
 	
-	sp->cg1 = cg1 ? nt_scg_addref(cg1) : NULL;
-	sp->cg2 = cg2 ? nt_scg_addref(cg2) : NULL;
-	sp->cg3 = cg3 ? nt_scg_addref(cg3) : NULL;
+	sp->cg1 = cg1 ? scg_addref(cg1) : NULL;
+	sp->cg2 = cg2 ? scg_addref(cg2) : NULL;
+	sp->cg3 = cg3 ? scg_addref(cg3) : NULL;
 	
 	sp->curcg = sp->cg1;
-	sp->show = TRUE;
+	sp->show = true;
 	sp->blendrate = 255;
 	sp->loc.x = 0;
 	sp->loc.y = 0;
 	sp->cur = sp->loc;
 	
 	if (sp->curcg == NULL) {
-		sp->cursize.width  = 0;
-		sp->cursize.height = 0;
+		sp->width  = 0;
+		sp->height = 0;
 	} else {
-		sp->cursize.width  = sp->curcg->sf->width;
-		sp->cursize.height = sp->curcg->sf->height;
+		sp->width  = sp->curcg->sf->w;
+		sp->height = sp->curcg->sf->h;
 	}
 	sp->update = DEFAULT_UPDATE;
 	
@@ -54,16 +53,16 @@ sprite_t *nt_sp_msg_new(int no, int x, int y, int width, int height) {
 	
 	sp->no = no;
 	sp->type = SPRITE_MSG;
-	sp->show = TRUE;
+	sp->show = true;
 	sp->blendrate = 255;
 	sp->loc.x = x;
 	sp->loc.y = y;
 	sp->cur = sp->loc;
-	sp->cursize.width  = width;
-	sp->cursize.height = height;
+	sp->width  = width;
+	sp->height = height;
 	sp->u.msg.dspcur.x = 0;
 	sp->u.msg.dspcur.y = 0;
-	sp->u.msg.canvas = sf_create_surface(width, height, sf0->depth);
+	sp->u.msg.canvas = SDL_CreateRGBSurfaceWithFormat(0, width, height, 32, SDL_PIXELFORMAT_ARGB8888);
 	sp->update = ntmsg_update;
 	
 	return sp;
@@ -72,19 +71,19 @@ sprite_t *nt_sp_msg_new(int no, int x, int y, int width, int height) {
 void nt_sp_free(sprite_t *sp) {
 	if (sp == NULL) return;
 	
-	if (sp->cg1) nt_scg_deref(sp->cg1);
-	if (sp->cg2) nt_scg_deref(sp->cg2);
-	if (sp->cg3) nt_scg_deref(sp->cg3);
+	if (sp->cg1) scg_deref(sp->cg1);
+	if (sp->cg2) scg_deref(sp->cg2);
+	if (sp->cg3) scg_deref(sp->cg3);
 
 	if (sp->type == SPRITE_MSG) {
-		sf_free(sp->u.msg.canvas);
+		SDL_FreeSurface(sp->u.msg.canvas);
 	}
 	
 	free(sp);
 }
 
-void nt_sp_set_show(sprite_t *sp, boolean show) {
-	boolean oldshow;
+void nt_sp_set_show(sprite_t *sp, bool show) {
+	bool oldshow;
 	
 	if (sp == NULL) return;
 	
@@ -103,16 +102,16 @@ void nt_sp_set_cg(sprite_t *sp, int no) {
 	if (sp == NULL) return;
 
 	if (sp->curcg)
-		nt_scg_deref(sp->curcg);
+		scg_deref(sp->curcg);
 
-	cg = no ? nt_scg_addref(no) : NULL;
+	cg = no ? scg_addref(no) : NULL;
 	
 	if (cg == NULL) {
-		sp->cursize.width  = 0;
-		sp->cursize.height = 0;
+		sp->width  = 0;
+		sp->height = 0;
 	} else {
-		sp->cursize.width  = cg->sf->width;
-		sp->cursize.height = cg->sf->height;
+		sp->width  = cg->sf->w;
+		sp->height = cg->sf->h;
 	}
 
 	sp->curcg = cg;

modules/NIGHTDLL/sprite.h

@@ -3,8 +3,8 @@
 #define __SPRITE_H__
 
 #include "portab.h"
-#include "surface.h"
-#include "graphics.h"
+#include <SDL_rect.h>
+#include "sactcg.h"
 
 #define DEFAULT_UPDATE nt_sp_draw
 
@@ -22,7 +22,6 @@
 #define SPNO_MSG_KEYANIM 12 // メッセージキー入力アニメーション
 #define SPNO_MSG_ICON_MUTE 13 // メッセージウィンドアイコン
 
-#define CGMAX 65536
 // 0-9999: reserve for Link CG
 // 2051: メッセージウィンド枠CG
 #define CGNO_MSGFRAME_LCG 2051
@@ -41,25 +40,6 @@
 #define CGNO_MSGFR_BG 10002
 
 
-// CG_XX で作るCGの種類
-enum cgtype {
-	CG_NOTUSED = 0,
-	CG_LINKED  = 1,
-	CG_SET     = 2,
-	CG_REVERSE = 3,
-	CG_STRETCH = 4
-};
-
-// cgに関する情報
-struct _cginfo {
-	enum cgtype type;  // CGの種類, 0: 未使用, 1:リンクされている, ...
-	int no;            // CGの番号
-	surface_t *sf;     // CG本体
-	int refcnt;        // 参照カウンタ。０になったら開放してもよい。
-};
-typedef struct _cginfo cginfo_t;
-
-
 enum spritetype {
 	SPRITE_NORMAL = 0,
 	SPRITE_ANIME  = 5,
@@ -73,20 +53,21 @@ struct _sprite {
 	
 	int no;
 	
-	MyDimension cursize;
+	int width;
+	int height;
 	
 	cginfo_t *curcg;
 	cginfo_t *cg1, *cg2, *cg3;
 	
-	boolean show;
+	bool show;
 	
 	int blendrate;
 	
-	MyPoint loc;
+	SDL_Point loc;
 	
-	MyPoint cur;
+	SDL_Point cur;
 
-	int (* update)(struct _sprite *sp, MyRectangle *updatearea);
+	void (* update)(struct _sprite *sp, SDL_Rect *updatearea);
 	
 	union {
 		struct {
@@ -97,8 +78,8 @@ struct _sprite {
 		} anime;
 		
 		struct {
-			surface_t *canvas;
-			MyPoint dspcur;
+			struct SDL_Surface *canvas;
+			SDL_Point dspcur;
 		} msg;
 	} u;
 };
@@ -107,31 +88,29 @@ typedef struct _sprite sprite_t;
 
 
 /* in nt_sprite.c */
-extern sprite_t *nt_sp_new(int no, int cg1, int cg2, int cg3, int type);
-extern sprite_t *nt_sp_msg_new(int no, int x, int y, int width, int height);
-extern void nt_sp_free(sprite_t *sp);
-extern void nt_sp_set_show(sprite_t *sp, boolean show);
-// extern void nt_sp_set_cg(sprite_t *sp, int no);
-extern void nt_sp_set_loc(sprite_t *sp, int x, int y);
+sprite_t *nt_sp_new(int no, int cg1, int cg2, int cg3, int type);
+sprite_t *nt_sp_msg_new(int no, int x, int y, int width, int height);
+void nt_sp_free(sprite_t *sp);
+void nt_sp_set_show(sprite_t *sp, bool show);
+// void nt_sp_set_cg(sprite_t *sp, int no);
+void nt_sp_set_loc(sprite_t *sp, int x, int y);
 
 /* in nt_sprite_update.c */
-extern int nt_sp_update_clipped();
-extern int nt_sp_update_all(boolean syncscreen);
-extern int nt_sp_updateme(sprite_t *sp);
-extern int nt_sp_updateme_part(sprite_t *sp, int x, int y, int w, int h);
-extern void nt_sp_add_updatelist(sprite_t *sp);
-extern void nt_sp_remove_updatelist(sprite_t *sp);
-extern int nt_sp_draw_wall(sprite_t *sp, MyRectangle *r);
-extern void nt_sp_clear_updatelist(void);
+void nt_sp_update_clipped();
+void nt_sp_update_all(bool syncscreen);
+void nt_sp_updateme(sprite_t *sp);
+void nt_sp_updateme_part(sprite_t *sp, int x, int y, int w, int h);
+void nt_sp_add_updatelist(sprite_t *sp);
+void nt_sp_remove_updatelist(sprite_t *sp);
+void nt_sp_draw_wall(sprite_t *sp, SDL_Rect *r);
+void nt_sp_clear_updatelist(void);
 
 /* in nt_sprite_draw.c */
-extern int nt_sp_draw(sprite_t *sp, MyRectangle *r);
-extern int nt_sp_draw2(sprite_t *sp, cginfo_t *cg, MyRectangle *r);
-extern void nt_sp_draw_dmap(void* data, void* userdata);
-extern int nt_sp_draw_scg(sprite_t *sp, MyRectangle *r);
+void nt_sp_draw(sprite_t *sp, SDL_Rect *r);
+void nt_sp_draw_scg(sprite_t *sp, SDL_Rect *r);
 
 /* in nt_sprite_eupdate.c */
-extern int nt_sp_eupdate(int type, int time, int cancel);
+void nt_sp_eupdate(int type, int time, int cancel);
 
 
 #endif /* __SPRITE_H__ */

modules/NIGHTDLL/sprite_draw.c

@@ -24,13 +24,11 @@
 #include "config.h"
 
 #include <stdio.h>
+#include <SDL.h>
 
 #include "portab.h"
 #include "system.h"
 #include "ags.h"
-#include "graphics.h"
-#include "surface.h"
-#include "ngraph.h"
 #include "sprite.h"
 
 /*
@@ -38,106 +36,60 @@
  @param sp: 描画するスプライト
  @param r : 再描画する領域
 */
-int nt_sp_draw(sprite_t *sp, MyRectangle *r) {
-	if (sp == NULL) return NG;
-	
-	return nt_sp_draw2(sp, sp->curcg, r);
-}
-
-/*
-  指定の spriteの指定のCGを surface0 に書く
-  (このインターフェイスはもう不要?)
-
-  @param sp: 描画するスプライト
-  @param cg: 描画するCG
- @param r : 再描画する領域
-*/
-int nt_sp_draw2(sprite_t *sp, cginfo_t *cg, MyRectangle *r) {
-	surface_t update;
-	int sx, sy, w, h, dx, dy;
-	
-	if (cg == NULL) return NG;
-	if (cg->sf == NULL) return NG;
+void nt_sp_draw(sprite_t *sp, SDL_Rect *r) {
+	if (sp == NULL) return;
+	cginfo_t *cg = sp->curcg;
+	if (cg == NULL) return;
+	if (cg->sf == NULL) return;
 
 	// 更新領域の確定
-	update.width  = r->w;
-	update.height = r->h;
-	sx = 0;
-	sy = 0;
-	dx = sp->cur.x - r->x;
-	dy = sp->cur.y - r->y;
-	w = cg->sf->width;
-	h = cg->sf->height;
+	SDL_Rect cg_rect = {0, 0, cg->sf->w, cg->sf->h};
+	int sx = 0;
+	int sy = 0;
+	int dx = sp->cur.x;
+	int dy = sp->cur.y;
+	int w = cg->sf->w;
+	int h = cg->sf->h;
 	
-	if (!gr_clip(cg->sf, &sx, &sy, &w, &h, &update, &dx, &dy)) {
-		return NG;
+	if (!ags_clipCopyRect(&cg_rect, r, &sx, &sy, &dx, &dy, &w, &h)) {
+		return;
 	}
-		
-	dx += r->x;
-	dy += r->y;
-	
-	if (cg->sf->alpha) {
-		// alpha map がある場合
-		gre_BlendUseAMap(sf0, dx, dy,
-				 sf0, dx, dy,
-				 cg->sf, sx, sy, w, h,
-				 cg->sf, sx, sy,
-				 sp->blendrate);
+
+	if (SDL_ISPIXELFORMAT_ALPHA(cg->sf->format->format) || sp->blendrate < 255) {
+		SDL_SetSurfaceBlendMode(cg->sf, SDL_BLENDMODE_BLEND);
+		SDL_SetSurfaceAlphaMod(cg->sf, sp->blendrate);
 	} else {
-		if (sp->blendrate == 255) {
-			// alpha値指定が無い場合
-			gr_copy(sf0, dx, dy, cg->sf, sx, sy, w, h);
-		} else if (sp->blendrate > 0) {
-			// alpha値指定がある場合
-			gre_Blend(sf0, dx, dy,
-				  sf0, dx, dy,
-				  cg->sf, sx, sy, w, h,
-				  sp->blendrate);
-		}
+		SDL_SetSurfaceBlendMode(cg->sf, SDL_BLENDMODE_NONE);
 	}
+	SDL_BlitSurface(cg->sf, &(SDL_Rect){sx, sy, w, h}, main_surface, &(SDL_Rect){dx, dy, w, h});
 	
 	SACT_DEBUG("do update no=%d, sx=%d, sy=%d, w=%d, h=%d, dx=%d, dy=%d",
 		sp->no, sx, sy, w, h, dx, dy);
-	
-	return OK;
 }
 
 // BlendScreenによる描画
-int nt_sp_draw_scg(sprite_t *sp, MyRectangle *r) {
-	surface_t update;
-	cginfo_t *cg;
-	int sx, sy, w, h, dx, dy;
-	
-	if (sp == NULL) return NG;
-	
-	cg = sp->curcg;
-	
-	if (cg == NULL) return NG;
-	if (cg->sf == NULL) return NG;
+void nt_sp_draw_scg(sprite_t *sp, SDL_Rect *r) {
+	if (sp == NULL) return;
+	cginfo_t *cg = sp->curcg;
+	if (cg == NULL) return;
+	if (cg->sf == NULL) return;
 	
 	// 更新領域の確定
-	update.width  = r->w;
-	update.height = r->h;
-	sx = 0;
-	sy = 0;
-	dx = sp->cur.x - r->x;
-	dy = sp->cur.y - r->y;
-	w = cg->sf->width;
-	h = cg->sf->height;
+	SDL_Rect cg_rect = {0, 0, cg->sf->w, cg->sf->h};
+	int sx = 0;
+	int sy = 0;
+	int dx = sp->cur.x;
+	int dy = sp->cur.y;
+	int w = cg->sf->w;
+	int h = cg->sf->h;
 	
-	if (!gr_clip(cg->sf, &sx, &sy, &w, &h, &update, &dx, &dy)) {
-		return NG;
+	if (!ags_clipCopyRect(&cg_rect, r, &sx, &sy, &dx, &dy, &w, &h)) {
+		return;
 	}
-		
-	dx += r->x;
-	dy += r->y;
 	
-	gre_BlendScreen(sf0, dx, dy,
-			sf0, dx, dy,
-			cg->sf, sx, sy, w, h);
+	SDL_SetSurfaceBlendMode(cg->sf, SDL_BLENDMODE_ADD);
+	SDL_BlitSurface(cg->sf, &(SDL_Rect){sx, sy, w, h}, main_surface, &(SDL_Rect){dx, dy, w, h});
 	
 	SACT_DEBUG("do update no=%d, sx=%d, sy=%d, w=%d, h=%d, dx=%d, dy=%d",
 		sp->no, sx, sy, w, h, dx, dy);
-	
-	return OK;
 }

modules/NIGHTDLL/sprite_eupdate.c

@@ -25,11 +25,11 @@
 
 #include "portab.h"
 #include "system.h"
-#include "ngraph.h"
 #include "ags.h"
 #include "input.h"
 #include "sprite.h"
-#include "sdl_core.h"
+#include "gfx.h"
+#include "effect.h"
 
 /*
   効果つき画面更新
@@ -37,34 +37,33 @@
   @param time: 実行時間(msec)
   @param cancel: キー抜け(0:なし, 1:あり)
 */
-int nt_sp_eupdate(int no, int time, int cancel) {
+void nt_sp_eupdate(int no, int time, int cancel) {
 	if (no == 1013) {
-		nt_sp_update_all(TRUE);
-		return OK;
+		nt_sp_update_all(true);
+		return;
 	}
 
-	nt_sp_update_all(FALSE);
+	nt_sp_update_all(false);
 	
-	enum sdl_effect_type type = from_sact_effect(no - 100);
+	enum effect_type type = from_sact_effect(no - 100);
 	if (type == EFFECT_INVALID) {
 		WARNING("Unimplemented effect %d", no);
 		type = EFFECT_CROSSFADE;
 	}
-	SDL_Rect rect = { 0, 0, sf0->width, sf0->height };
-	struct sdl_effect *eff = sdl_effect_init(&rect, NULL, 0, 0, sdl_getDIB(), 0, 0, type);
+	SDL_Rect rect = { 0, 0, main_surface->w, main_surface->h };
+	struct effect *eff = effect_init(&rect, NULL, 0, 0, gfx_getDIB(), 0, 0, type);
 
 	int sttime, curtime;
-	sttime = curtime = sdl_getTicks();
+	sttime = curtime = sys_get_ticks();
 	int edtime = curtime + time;
 
-	while ((curtime = sdl_getTicks()) < edtime) {
-		sdl_effect_step(eff, (double)(curtime - sttime) / (edtime - sttime));
-		int rest = 16 - (sdl_getTicks() - curtime);
+	while ((curtime = sys_get_ticks()) < edtime) {
+		effect_step(eff, (float)(curtime - sttime) / (edtime - sttime));
+		int rest = 16 - (sys_get_ticks() - curtime);
 		int key = sys_keywait(rest, cancel ? KEYWAIT_CANCELABLE : KEYWAIT_NONCANCELABLE);
 		if (cancel && key)
 			break;
 	}
-	sdl_effect_finish(eff);
+	effect_finish(eff);
 	ags_updateFull();
-	return OK;
 }

modules/NIGHTDLL/sprite_update.c

@@ -25,15 +25,12 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <SDL.h>
 
 #include "portab.h"
 #include "system.h"
 #include "list.h"
 #include "ags.h"
-#include "graphics.h"
-// #include "sact.h"
-#include "surface.h"
-#include "ngraph.h"
 #include "sprite.h"
 
 // スプライト再描画間の間に変更のあったスプライトの領域の和
@@ -43,22 +40,22 @@ static SList *updatearea;
 static SList *updatelist;
 
 static void disjunction(void* region, void* data);
-static MyRectangle get_updatearea();
+static SDL_Rect get_updatearea();
 static void do_update_each(void* data, void* userdata);
 
 // 領域１と領域２をすべて含む矩形領域を計算
 static void disjunction(void* region, void* data) {
-	MyRectangle *r1 = (MyRectangle *)region;
-	MyRectangle *r2 = (MyRectangle *)data;
+	SDL_Rect *r1 = (SDL_Rect *)region;
+	SDL_Rect *r2 = (SDL_Rect *)data;
 	SDL_UnionRect(r1, r2, r2);
 	free(r1);
 }
 
 // 更新の必要なスプライトの領域の和をとってクリッピングする
-static MyRectangle get_updatearea() {
-	MyRectangle clip = {0, 0, 0, 0};
-	MyRectangle rsf0 = {0, 0, sf0->width, sf0->height};
-	MyRectangle result;
+static SDL_Rect get_updatearea() {
+	SDL_Rect clip = {0, 0, 0, 0};
+	SDL_Rect screen = {0, 0, main_surface->w, main_surface->h};
+	SDL_Rect result;
 	
 	slist_foreach(updatearea, disjunction, &clip);
 	
@@ -66,7 +63,7 @@ static MyRectangle get_updatearea() {
 	updatearea = NULL;
 	
 	// surface0との領域の積をとる
-	SDL_IntersectRect(&rsf0, &clip, &result);
+	SDL_IntersectRect(&screen, &clip, &result);
 	
 	SACT_DEBUG("clipped area x=%d y=%d w=%d h=%d",
 		result.x, result.y, result.w, result.h);
@@ -77,7 +74,7 @@ static MyRectangle get_updatearea() {
 // updatelist に登録してあるすべてのスプライトを更新
 static void do_update_each(void* data, void* userdata) {
 	sprite_t *sp = (sprite_t *)data;
-	MyRectangle *r = (MyRectangle *)userdata;
+	SDL_Rect *r = (SDL_Rect *)userdata;
 	
 	// 非表示の場合はなにもしない
 	if (!sp->show) return;
@@ -92,9 +89,9 @@ static void do_update_each(void* data, void* userdata) {
   画面全体の更新
   @param syncscreen: surface0 に描画したものを Screen に反映させるかどうか
  */
-int nt_sp_update_all(boolean syncscreen) {
+void nt_sp_update_all(bool syncscreen) {
 	// 画面全体を更新領域に
-	MyRectangle r = {0, 0, sf0->width, sf0->height };
+	SDL_Rect r = {0, 0, main_surface->w, main_surface->h };
 	
 	// updatelistに登録してあるスプライトを再描画
 	// updatelistはスプライトの番号順に並んでいる
@@ -106,54 +103,48 @@ int nt_sp_update_all(boolean syncscreen) {
 	if (syncscreen) {
 		ags_updateFull();
 	}
-	
-	return OK;
 }
 
 /*
   画面の一部を更新
    updateme(_part)で登録した更新が必要なspriteの和の領域をupdate
 */
-int nt_sp_update_clipped() {
-	MyRectangle r;
+void nt_sp_update_clipped() {
+	SDL_Rect r;
 	
 	// 更新領域の確定
 	r = get_updatearea();
 	
 	if (SDL_RectEmpty(&r))
-		return OK;
+		return;
 
 	// 更新領域に入っているスプライトの再描画
 	slist_foreach(updatelist, do_update_each, &r);
 	
 	// 更新領域を Window に転送
 	ags_updateArea(r.x, r.y, r.w, r.h);
-	
-	return OK;
 }
 
 /*
   sprite全体の更新を登録
   @param sp: 更新するスプライト
 */
-int nt_sp_updateme(sprite_t *sp) {
-	MyRectangle *r;
+void nt_sp_updateme(sprite_t *sp) {
+	SDL_Rect *r;
 	
-	if (sp == NULL) return NG;
-	if (sp->cursize.width == 0 || sp->cursize.height == 0) return NG;
+	if (sp == NULL) return;
+	if (sp->width == 0 || sp->height == 0) return;
 	
-	r = malloc(sizeof(MyRectangle));
+	r = malloc(sizeof(SDL_Rect));
 	r->x = sp->cur.x;
 	r->y = sp->cur.y;
-	r->w = sp->cursize.width;
-	r->h = sp->cursize.height;
+	r->w = sp->width;
+	r->h = sp->height;
 	
 	updatearea = slist_append(updatearea, r);
 	
 	SACT_DEBUG("x = %d, y = %d, spno = %d w=%d,h=%d",
 		r->x, r->y, sp->no, r->w, r->h);
-	
-	return OK;
 }
 
 /*
@@ -164,13 +155,13 @@ int nt_sp_updateme(sprite_t *sp) {
   @param w: 更新領域幅
   @param h: 更新領域高さ
 */
-int nt_sp_updateme_part(sprite_t *sp, int x, int y, int w, int h) {
-	MyRectangle *r;
+void nt_sp_updateme_part(sprite_t *sp, int x, int y, int w, int h) {
+	SDL_Rect *r;
 	
-	if (sp == NULL) return NG;
-	if (w == 0 || h == 0) return NG;
+	if (sp == NULL) return;
+	if (w == 0 || h == 0) return;
 	
-	r = malloc(sizeof(MyRectangle));
+	r = malloc(sizeof(SDL_Rect));
 	r->x = sp->cur.x + x;
 	r->y = sp->cur.y + y;
 	r->w = w;
@@ -180,8 +171,6 @@ int nt_sp_updateme_part(sprite_t *sp, int x, int y, int w, int h) {
 	
 	SACT_DEBUG("x = %d, y = %d, spno = %d w=%d,h=%d",
 		r->x, r->y, sp->no, r->w, r->h);
-	
-	return OK;
 }
 
 // スプライトの番号順に更新するためにリストに順番に要れるためのcallbck
@@ -214,18 +203,6 @@ void nt_sp_clear_updatelist(void) {
 }
 
 // デフォルトの壁紙update
-int nt_sp_draw_wall(sprite_t *sp, MyRectangle *area) {
-	int sx, sy, w, h;
-	
-	sx = area->x;
-	sy = area->y;
-	w  = area->w;
-	h  = area->h;
-	gr_fill(sf0, sx, sy, w, h, 0, 0, 0);
-	
-	SACT_DEBUG("do update no=%d, sx=%d, sy=%d, w=%d, h=%d",
-		sp->no, sx, sy, w, h);
-	
-	return OK;
+void nt_sp_draw_wall(sprite_t *sp, SDL_Rect *area) {
+	SDL_FillRect(main_surface, area, SDL_MapRGB(main_surface->format, 0, 0, 0));
 }
-

modules/NightDemonDemo/NightDemonDemo.c

@@ -32,9 +32,8 @@
 #include "nact.h"
 #include "alk.h"
 #include "music.h"
-#include "sdl_core.h"
+#include "gfx.h"
 #include "input.h"
-#include "ngraph.h"
 #include "cg.h"
 #include "jpeg.h"
 
@@ -51,28 +50,31 @@ static void ndd_run(int demonum) {
 
 	int mus = ndemo_mus[demonum];
 	if (mus)
-		musbgm_play(mus, 0, 100);
+		musbgm_play(mus, 0, 100, 0);
 
-	uint32_t start = sdl_getTicks();
+	uint32_t start = sys_get_ticks();
 	while (!nact->is_quit) {
-		int i = (sdl_getTicks() - start) / (1000 / FPS);
+		int i = (sys_get_ticks() - start) / (1000 / FPS);
 		if (i >= alk->datanum)
 			break;
 
 		cgdata *cg = jpeg_extract(alk->entries[i].data, alk->entries[i].size);
 		if (cg) {
-			gr_drawimage24(sf0, cg, 0, 0);
+			SDL_Surface *sf = SDL_CreateRGBSurfaceWithFormatFrom(cg->pic, cg->width, cg->height, 24, cg->width * 3, SDL_PIXELFORMAT_RGB24);
+			SDL_BlitSurface(sf, NULL, main_surface, NULL);
 			ags_updateFull();
+			SDL_FreeSurface(sf);
 			cgdata_free(cg);
 		} else {
 			WARNING("Cannot decode CG %d in %s", i, alk_path);
 		}
 
-		int wait_ms = (i + 1) * (1000 / FPS) - (sdl_getTicks() - start);
+		int wait_ms = (i + 1) * (1000 / FPS) - (sys_get_ticks() - start);
 		if (wait_ms > 0) {
 			if (sys_keywait(wait_ms, KEYWAIT_CANCELABLE))
 				break;
 		} else {
+			gfx_updateScreen();
 			if (sys_getInputInfo())
 				break;
 		}
@@ -92,7 +94,7 @@ static void Init() {
 	
 	*var = 1;
 	
-	DEBUG_COMMAND("NightDemonDemo.Init %d,%d,%d,%p:", p1, p2, p3, var);
+	TRACE("NightDemonDemo.Init %d,%d,%d,%p:", p1, p2, p3, var);
 }
 
 static void Run() {
@@ -101,7 +103,7 @@ static void Run() {
 	
 	ndd_run(p1);
 	
-	DEBUG_COMMAND("NightDemonDemo.Run %d,%d:", p1, p2);
+	TRACE("NightDemonDemo.Run %d,%d:", p1, p2);
 }
 
 static const ModuleFunc functions[] = {

modules/RandMT/RandMT.c

@@ -40,7 +40,7 @@ static void Init() {
 	*/
 	int p1 = getCaliValue(); /* ITimer */
 	
-	DEBUG_COMMAND_YET("RandMT.Init %p:", p1);
+	TRACE_UNIMPLEMENTED("RandMT.Init %p:", p1);
 }
 
 static void Get() {
@@ -59,7 +59,7 @@ static void Get() {
 		*var = (int)(genrand() * num) + 1;
 	}
 	
-	DEBUG_COMMAND("RandMT.Get %d,%p:", num, var);
+	TRACE("RandMT.Get %d,%p:", num, var);
 }
 
 static void GetNoOverlap() {
@@ -69,7 +69,7 @@ static void GetNoOverlap() {
 
 	*var = (int)(genrand() * n) + min;
 
-	DEBUG_COMMAND("RandMT.GetNoOverlap %d,%d,%p:", min, n, var);
+	TRACE("RandMT.GetNoOverlap %d,%d,%p:", min, n, var);
 }
 
 static const ModuleFunc functions[] = {

modules/S3xMusic/S3xMusic.c

@@ -0,0 +1,238 @@
+/*
+ * Copyright (C) 2025 <KichikuouChrome@gmail.com>
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+#include "config.h"
+#include "modules.h"
+#include "nact.h"
+#include "bgm.h"
+#include "music.h"
+#include "music_pcm.h"
+
+#define SLOT 128
+
+static int current_no = 0;
+
+static void Init(void) {
+	int isys3x = getCaliValue();
+	TRACE("S3xMusic.Init %d:", isys3x);
+}
+
+static void CreateChannel(void) {
+	int nr_channels = getCaliValue();
+	if (nr_channels != 2)
+		SYSERROR("Unsupported number of channels: %d", nr_channels);
+	TRACE("S3xMusic.CreateChannel %d:", nr_channels);
+}
+
+static void Prepare(void) {
+	int ch = getCaliValue();
+	int no = getCaliValue();
+	int *result = getCaliVariable();
+
+	if (ch == 0) {
+		current_no = no;
+		*result = 1;
+	} else {
+		*result = muspcm_load_bgm(SLOT, no) ? 1 : 0;
+	}
+	TRACE("S3xMusic.Prepare %d, %d => %d:", ch, no, *result);
+}
+
+static void Unprepare(void) {
+	int ch = getCaliValue();
+
+	if (ch == 0) {
+		if (current_no) {
+			musbgm_stop(current_no, 0);
+			current_no = 0;
+		}
+	} else {
+		muspcm_unload(SLOT);
+	}
+	TRACE("S3xMusic.Unprepare %d:", ch);
+}
+
+static void Play(void) {
+	int p1 = getCaliValue();
+	int p2 = getCaliValue();
+	TRACE_UNIMPLEMENTED("S3xMusic.Play %d, %d:", p1, p2);
+}
+
+static void FadePlay(void) {
+	int ch = getCaliValue();
+	int fadein_time = getCaliValue();
+	int volume = getCaliValue();
+	int loop_count = getCaliValue();  // 0 = infinite
+
+	if (ch == 0) {
+		musbgm_play(current_no, fadein_time, volume, loop_count);
+	} else {
+		muspcm_start(SLOT, loop_count == 0 ? -1 : loop_count);
+	}
+	TRACE("S3xMusic.FadePlay %d, %d, %d, %d:", ch, fadein_time, volume, loop_count);
+}
+
+static void PlayPosSample(void) {
+	int p1 = getCaliValue();
+	int p2 = getCaliValue();
+	int p3 = getCaliValue();
+	int p4 = getCaliValue();
+	TRACE_UNIMPLEMENTED("S3xMusic.PlayPosSample %d, %d, %d, %d:", p1, p2, p3, p4);
+}
+
+static void IsPlay(void) {
+	int ch = getCaliValue();
+	int *result = getCaliVariable();
+
+	if (ch == 0) {
+		*result = current_no && musbgm_isplaying(current_no);
+	} else {
+		*result = muspcm_isplaying(SLOT);
+	}
+	TRACE("S3xMusic.IsPlay %d => %d:", ch, *result);
+}
+
+static void Stop(void) {
+	int ch = getCaliValue();
+
+	if (ch == 0) {
+		if (current_no)
+			musbgm_stop(current_no, 0);
+		current_no = 0;
+	} else {
+		muspcm_stop(SLOT);
+	}
+	TRACE("S3xMusic.Stop %d:", ch);
+}
+
+static void Restart(void) {
+	int p1 = getCaliValue();
+	TRACE_UNIMPLEMENTED("S3xMusic.Restart %d:", p1);
+}
+
+static void GetPlayPos(void) {
+	int ch = getCaliValue();
+	int *hour = getCaliVariable();
+	int *min = getCaliVariable();
+	int *sec = getCaliVariable();
+	int *msec = getCaliVariable();
+	if (ch == 0) {
+		int time = musbgm_getpos(current_no);
+		*hour = time / 360000;
+		*min = (time / 6000) % 60;
+		*sec = (time / 100) % 60;
+		*msec = (time % 100) * 10;
+	} else {
+		// not implemented
+		*hour = 0;
+		*min = 0;
+		*sec = 0;
+		*msec = 0;
+	}
+	TRACE("S3xMusic.GetPlayPos %d => %d, %d, %d, %d:", ch, *hour, *min, *sec, *msec);
+}
+
+static void GetPlayPosSample(void) {
+	int p1 = getCaliValue();
+	int *var1 = getCaliVariable();
+	int *var2 = getCaliVariable();
+	TRACE_UNIMPLEMENTED("S3xMusic.GetPlayPosSample %d, %p, %p:", p1, var1, var2);
+}
+
+static void SetRepeatStart(void) {
+	int p1 = getCaliValue();
+	int p2 = getCaliValue();
+	int p3 = getCaliValue();
+	TRACE_UNIMPLEMENTED("S3xMusic.SetRepeatStart %d, %d, %d:", p1, p2, p3);
+}
+
+static void SetRepeatEnd(void) {
+	int p1 = getCaliValue();
+	int p2 = getCaliValue();
+	int p3 = getCaliValue();
+	TRACE_UNIMPLEMENTED("S3xMusic.SetRepeatEnd %d, %d, %d:", p1, p2, p3);
+}
+
+static void FadeVolume(void) {
+	int ch = getCaliValue();
+	int time = getCaliValue();
+	int volume = getCaliValue();
+	int stop_after_fade = getCaliValue();
+
+	if (ch == 0) {
+		if (stop_after_fade) {
+			musbgm_stop(current_no, time / 10);
+		} else {
+			musbgm_fade(current_no, time / 10, volume);
+		}
+	} else {
+		if (stop_after_fade) {
+			muspcm_fadeout(SLOT, time);
+		} else {
+			muspcm_setvol(SLOT, volume);
+		}
+	}
+	TRACE("S3xMusic.FadeVolume %d, %d, %d, %d:", ch, time, volume, stop_after_fade);
+}
+
+static void IsFade(void) {
+	int ch = getCaliValue();
+	int *result = getCaliVariable();
+	*result = 0;
+	TRACE_UNIMPLEMENTED("S3xMusic.IsFade %d => %d:", ch, *result);
+}
+
+static void StopFade(void) {
+	int ch = getCaliValue();
+	TRACE_UNIMPLEMENTED("S3xMusic.StopFade %d:", ch);
+}
+
+static void WaitEnd(void) {
+	int p1 = getCaliValue();
+	int p2 = getCaliValue();  // IWinMsg
+	TRACE_UNIMPLEMENTED("S3xMusic.WaitEnd %d, %d:", p1, p2);
+}
+
+static void sleep(void) {
+	int p1 = getCaliValue();  // IWinMsg
+	TRACE_UNIMPLEMENTED("S3xMusic.sleep %d:", p1);
+}
+
+static const ModuleFunc functions[] = {
+	{"CreateChannel", CreateChannel},
+	{"FadePlay", FadePlay},
+	{"FadeVolume", FadeVolume},
+	{"GetPlayPos", GetPlayPos},
+	{"GetPlayPosSample", GetPlayPosSample},
+	{"Init", Init},
+	{"IsFade", IsFade},
+	{"IsPlay", IsPlay},
+	{"Play", Play},
+	{"PlayPosSample", PlayPosSample},
+	{"Prepare", Prepare},
+	{"Restart", Restart},
+	{"SetRepeatEnd", SetRepeatEnd},
+	{"SetRepeatStart", SetRepeatStart},
+	{"Stop", Stop},
+	{"StopFade", StopFade},
+	{"Unprepare", Unprepare},
+	{"WaitEnd", WaitEnd},
+	{"sleep", sleep},
+};
+
+const Module module_S3xMusic = {"S3xMusic", functions, sizeof(functions) / sizeof(ModuleFunc)};

modules/SACT/sact.h

@@ -25,20 +25,16 @@
 #define __SACT_H__
 
 #include "config.h"
-
+#include <SDL_rect.h>
 #include "portab.h"
 #include "list.h"
-#include "graphics.h"
-#include "surface.h"
+#include "ags.h"
 #include "sacttimer.h"
-#include "variable.h"
+#include "sactcg.h"
 
 // スプライトの最大数
 #define SPRITEMAX 21845
 
-// CGの最大数
-#define CGMAX 63336
-
 // メッセージの最大長さ
 #define MSGBUFMAX 257*10
 
@@ -60,24 +56,6 @@ typedef struct {
 	char *dst; // 置き換え文字列
 } strexchange_t;
 
-// CG_XX で作るCGの種類
-enum cgtype {
-	CG_NOTUSED = 0,
-	CG_LINKED  = 1,
-	CG_SET     = 2,
-	CG_REVERSE = 3,
-	CG_STRETCH = 4
-};
-
-// cgに関する情報
-struct _cginfo {
-	enum cgtype type;  // CGの種類, 0: 未使用, 1:リンクされている, ...
-	int no;            // CGの番号
-	surface_t *sf;     // CG本体
-	int refcnt;        // 参照カウンタ。０になったら開放してもよい。
-};
-typedef struct _cginfo cginfo_t;
-
 // スプライトのタイプ
 enum spritetype {
 	SPRITE_NORMAL = 0,
@@ -107,7 +85,8 @@ struct _sprite {
 	int numsound1, numsound2, numsound3;
 	
 	// 初期 sprite の大きさ(cg1の大きさ)
-	MyDimension cursize;
+	int width;
+	int height;
 	
 	// それぞれの状態で表示する CG
 	cginfo_t *cg1, *cg2, *cg3;
@@ -116,8 +95,8 @@ struct _sprite {
 	cginfo_t *curcg;
 	
 	// スプライトを表示するか
-	boolean show;
-	boolean show_save; // Zkey hide save用
+	bool show;
+	bool show_save; // Zkey hide save用
 	
 	// 表示する際のブレンド率 0:全く見えない, 255: 通常表示
 	int blendrate; 
@@ -126,10 +105,10 @@ struct _sprite {
 	int freezed_state;
 	
 	// 表示位置 (SetPos)
-	MyPoint loc;
+	SDL_Point loc;
 	
 	// 現在のスプライトの表示位置
-	MyPoint cur;
+	SDL_Point cur;
 	
 	// event callback
 	int (* eventcb)(struct _sprite *sp, agsevent_t *e);  // for key/mouse
@@ -137,27 +116,27 @@ struct _sprite {
         // sprite削除時の callback
 	void (* remove)(struct _sprite *sp);
 	// spriteを再描画するときの callback
-	int  (* update)(struct _sprite *sp);
+	void (* update)(struct _sprite *sp);
 	
-	boolean focused; // forcusを得ているか
-	boolean pressed; // このsprite上でマウスが押されているか
+	bool focused; // forcusを得ているか
+	bool pressed; // このsprite上でマウスが押されているか
 	
 	SList *expsp; // 説明スプライトのリスト
 	
 	// move command 用パラメータ
 	struct {
-		MyPoint to;     // 移動先
+		SDL_Point to;     // 移動先
 		int time;       // 移動完了時間
 		int speed;      // 移動速度
 		int starttime;  // 移動開始時刻
 		int endtime;    // 移動終了予定時刻
-		boolean moving; // 移動中かどうか
+		bool moving; // 移動中かどうか
 	} move;
 	
 	// SACT.Numeral用パラメータ
 	struct {
 		int cg[10];
-		MyPoint pos;
+		SDL_Point pos;
 		int span;
 	} numeral;
 	
@@ -170,8 +149,8 @@ struct _sprite {
 		
 		// ゲットスプライト
 		struct {
-			boolean dragging;  // ドラッグ中
-			MyPoint dragstart; // ドラッグ開始位置
+			bool dragging;  // ドラッグ中
+			SDL_Point dragstart; // ドラッグ開始位置
 		} get;
 
 		// プットスプライト
@@ -190,8 +169,8 @@ struct _sprite {
 		// メッセージスプライト
 		struct {
 			SList    *buf;       // 表示する文字のリスト
-			surface_t *canvas;    // 文字を描画するsurface
-			MyPoint    dspcur;    // 現在の表示位置
+			struct SDL_Surface *canvas;
+			SDL_Point    dspcur;    // 現在の表示位置
 		} msg;
 	} u;
 };
@@ -209,11 +188,9 @@ struct _sact {
 	SList *sp_quake;  // Quakeで揺らすスプライトのリスト
 	
 	SList *updatelist; // 再描画するスプライトのリスト
-	
-	cginfo_t *cg[CGMAX]; // cgまたはCG_xxで作った CG
-	
+
 	// 座標系の原点
-	MyPoint origin;
+	SDL_Point origin;
 	
 	// 文字列 replce 用
 	SList *strreplace;
@@ -234,7 +211,7 @@ struct _sact {
 		int align; // 行そろえ
 		void (* cbmove)(agsevent_t *);
 		void (* cbrelease)(agsevent_t *);
-		surface_t   *charcanvas;
+		struct SDL_Surface *charcanvas;
 	} sel;
 	
 	// event listener
@@ -247,14 +224,11 @@ struct _sact {
 	int movestarttime; // 一斉に移動を開始するための開始時間
 	int movecurtime;
 	
-	MyRectangle updaterect; // 更新が必要なspriteの領域の和
-	
-	// sact timer
-	stimer_t timer[65536];
+	SDL_Rect updaterect; // 更新が必要なspriteの領域の和
 	
 	// DnDに関するもの
 	sprite_t *draggedsp;  // drag中のスプライト
-	boolean dropped;      // スプライトがドロップされたかどうか
+	bool dropped;      // スプライトがドロップされたかどうか
 	
 	// keywaitの種類
 	int waittype;
@@ -273,15 +247,15 @@ struct _sact {
 	int numsoundob;
 	
 	// depth map
-	surface_t *dmap;
+	struct SDL_Surface *dmap;
 	
-	boolean zhiding;  // Zkeyによる隠し中
+	bool zhiding;  // Zkeyによる隠し中
 	int     zofftime;
-	boolean zdooff;
+	bool zdooff;
 	
 	// バックログ
-	boolean logging;
-	List  *log;
+	bool logging;
+	List *log;  // UTF-8 strings
 };
 typedef struct _sact sact_t;
 

modules/SACT/sactamask.c

@@ -25,23 +25,18 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
-#include <errno.h>
+#include <SDL.h>
 
 #include "portab.h"
 #include "system.h"
 #include "LittleEndian.h"
-#include "input.h"
+#include "ags.h"
 #include "sact.h"
-#include "surface.h"
-#include "ngraph.h"
+#include "pms.h"
 #include "sprite.h"
-#include "sdl_core.h"
+#include "effect.h"
 #include "mmap.h"
 
-static surface_t *smask_get(int no);
-static surface_t *smask_mul(surface_t *sf, int val);
-
 // SACTEFAM を使ったマスク
 typedef struct {
 	mmap_t *mmap;
@@ -52,24 +47,14 @@ typedef struct {
 
 static SACTEFAM_t am;
 
-struct ecopyparam {
-	int sttime;
-	int curtime;
-	int edtime;
-	int curstep;
-	int oldstep;
-};
-typedef struct ecopyparam ecopyparam_t;
-static ecopyparam_t ecp;
-
 // SACTEFAM.KLD の読み込み
-int smask_init(char *path) {
+bool smask_init(char *path) {
 	if (am.mmap)
-		return OK;  // already loaded
+		return true;  // already loaded
 
 	mmap_t *m = map_file(path);
 	if (!m)
-		return NG;
+		return false;
 	am.mmap = m;
 	am.datanum = LittleEndian_getDW(m->addr, 0);
 	am.no = malloc(sizeof(int) * am.datanum);
@@ -80,11 +65,11 @@ int smask_init(char *path) {
 		am.offset[i] = LittleEndian_getDW(m->addr, 16 + i * 16 + 8);
 	}
 	
-	return OK;
+	return true;
 }
 
 // 指定番号の alphamask ファイルをよみだす
-static surface_t *smask_get(int no) {
+static cgdata *smask_get(int no) {
 	int i;
 	
 	for (i = 0; i < am.datanum; i++) {
@@ -93,71 +78,25 @@ static surface_t *smask_get(int no) {
 
 	if (i == am.datanum) return NULL;
 	
-	return sf_getcg(am.mmap->addr + am.offset[i], 0 /*FIXME*/);
-}
-
-// ベースになるマスクの alpha 値を拡大して取り出す
-static surface_t *smask_mul(surface_t *sf, int val) {
-	surface_t *out = sf_create_alpha(sf->width, sf->height);
-	uint8_t *src = sf->alpha;
-	uint8_t *dst = out->alpha;
-	int pix = sf->width * sf->height;
-
-	while(pix--) {
-		int i = (*src - val) * 16;
-		if (i < 0)        *dst = 255; // 指定値よりも大きいのはコピー
-		else if (i > 255) *dst = 0;   // 指定値よりも小さいのは無視
-		else              *dst = 255-i; // それ以外は値を16倍
-		src++; dst++;
-	}
-	
-	return out;
+	return pms256_extract(am.mmap->addr + am.offset[i]);
 }
 
 /**
  * マスクつき画面更新
  */
-int sp_eupdate_amap(int index, int time, int cancel) {
-	surface_t *mask, *mask2;
-	surface_t *sfsrc, *sfdst;
-	int key;
-	
-	mask = smask_get(index);
+void sp_eupdate_amap(int index, int time, int cancel) {
+	cgdata *mask = smask_get(index);
 	if (mask == NULL) {
-		sp_update_all(TRUE);
-		return OK;
+		sp_update_all(true);
+		return;
 	}
-	
-	// 現在の sf0 をセーブ
-	sfsrc = sf_dup(sf0);
-	sp_update_all(FALSE);
-	sfdst = sf_dup(sf0);
-	sf_copyall(sf0, sfsrc);
-	
-	ecp.sttime = ecp.curtime = sdl_getTicks();
-	ecp.edtime = ecp.curtime + time*10;
-	ecp.oldstep = 0;
-	
-	while ((ecp.curtime = sdl_getTicks()) < ecp.edtime) {
-		int curstep = 255 * (ecp.curtime - ecp.sttime)/ (ecp.edtime - ecp.sttime);
-		// 元になるマスクのalpha値を16倍して欲しいところだけ取り出す
-		mask2 = smask_mul(mask, curstep);
-		
-		gre_BlendUseAMap(sf0, 0, 0, sfsrc, 0, 0, sfdst, 0, 0, sfsrc->width, sfsrc->height, mask2, 0, 0, 255);
-		ags_updateFull();
-		
-		key = sys_keywait(10, cancel ? KEYWAIT_CANCELABLE : KEYWAIT_NONCANCELABLE);
-		if (cancel && key) break;
-		
-		// 一時マスクを削除
-		sf_free(mask2);
-	}
-	
-	sf_copyall(sf0, sfdst);
+	SDL_Surface *mask_sf = SDL_CreateRGBSurfaceFrom(mask->pic, mask->width, mask->height, 8, mask->width, 0, 0, 0, 0);
+	sp_update_all(false);  // old = gfx_texture, new = main_surface
+	struct effect *eff = effect_sactamask_init(mask_sf);
+	ags_runEffect(time * 10, cancel, (ags_EffectStepFunc)effect_step, eff);
+	effect_finish(eff);
 	ags_updateFull();
-	sf_free(sfsrc);
-	sf_free(sfdst);
-	
-	sf_free(mask);
-	return OK;
+
+	SDL_FreeSurface(mask_sf);
+	cgdata_free(mask);
 }

modules/SACT/sactamask.h

@@ -24,6 +24,7 @@
 #ifndef __SACTAMASK_H__
 #define __SACTAMASK_H__
 
-extern int smask_init(const char *path);
+bool smask_init(const char *path);
+void sp_eupdate_amap(int type, int time, int key);
 
 #endif

modules/SACT/sactcg.c

@@ -1,342 +0,0 @@
-/*
- * sactcg.c: CG作成
- *
- * Copyright (C) 1997-1998 Masaki Chikama (Wren) <chikama@kasumi.ipl.mech.nagoya-u.ac.jp>
- *               1998-                           <masaki-c@is.aist-nara.ac.jp>
- *
- * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
-*/
-/* $Id: sactcg.c,v 1.7 2004/10/31 04:18:02 chikama Exp $ */
-
-#include "config.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "portab.h"
-#include "nact.h"
-#include "system.h"
-#include "ags.h"
-#include "sact.h"
-#include "sactcg.h"
-#include "surface.h"
-#include "ngraph.h"
-
-#include "sactcg_stretch.c"
-#include "sactcg_blend.c"
-
-#define spcg_assert_no(no) \
-  if ((no) > (CGMAX -1)) { \
-    WARNING("no is too large (should be %d < %d)", (no), CGMAX); \
-    return NG; \
-  } \
-
-static cginfo_t *scg_new(enum cgtype type, int no, surface_t *sf) {
-	cginfo_t *info = calloc(1, sizeof(cginfo_t));
-	info->type = type;
-	info->no = no;
-	info->sf = sf;
-	info->refcnt = 1;
-
-	scg_free(no);
-	sact.cg[no] = info;
-
-	return info;
-}
-
-/*
-  cgの読み込み
-
-    指定の番号のCGをリンクファイルから読み込んだり、
-    CG_xxxで作成したCGを参照する
-    
-  @param no: 読み込むCG番号
-*/
-static cginfo_t *scg_get(int no) {
-	if (no >= (CGMAX -1)) {
-		WARNING("no is too large (should be %d < %d)", (no), CGMAX);
-		return NULL;
-	}
-	
-	if (sact.cg[no] != NULL)
-		return sact.cg[no];
-
-	surface_t *sf = sf_loadcg_no(no - 1);
-	if (!sf) {
-		WARNING("load fail (%d)", no -1);
-		return NULL;
-	}
-	return scg_new(CG_LINKED, no, sf);
-}
-
-cginfo_t *scg_addref(int no) {
-	cginfo_t *info = scg_get(no);
-	if (info)
-		info->refcnt++;
-	return info;
-}
-
-void scg_deref(cginfo_t *cg) {
-	if (--cg->refcnt > 0)
-		return;
-
-	if (cg->sf)
-		sf_free(cg->sf);
-	free(cg);
-}
-
-//  指定の大きさ、色の矩形の CG を作成
-int scg_create(int wNumCG, int wWidth, int wHeight, int wR, int wG, int wB, int wBlendRate) {
-	spcg_assert_no(wNumCG);
-
-	surface_t *sf = sf_create_surface(wWidth, wHeight, sf0->depth);
-	gr_fill(sf, 0, 0, wWidth, wHeight, wR, wG, wB);
-	gr_fill_alpha_map(sf, 0, 0, wWidth, wHeight, wBlendRate);
-	scg_new(CG_SET, wNumCG, sf);
-	return OK;
-}
-
-// 指定のCGを反転させたCGを作成
-int scg_create_reverse(int wNumCG, int wNumSrcCG, int wReverseX, int wReverseY) {
-	spcg_assert_no(wNumCG);
-	spcg_assert_no(wNumSrcCG);
-	
-	cginfo_t *src = scg_get(wNumSrcCG);
-	if (!src)
-		return NG;
-
-	surface_t *sf = stretch(src->sf, src->sf->width, src->sf->height, (wReverseX << 1) | wReverseY);
-	scg_new(CG_REVERSE, wNumCG, sf);
-	return OK;
-}
-
-// 指定のCGを拡大/縮小したCGを作成
-int scg_create_stretch(int wNumCG, int wWidth, int wHeight, int wNumSrcCG) {
-	spcg_assert_no(wNumCG);
-	spcg_assert_no(wNumSrcCG);
-	
-	cginfo_t *src = scg_get(wNumSrcCG);
-	if (!src)
-		return NG;
-	
-	surface_t *sf = stretch(src->sf, wWidth, wHeight, 0);
-	scg_new(CG_STRETCH, wNumCG, sf);
-	return OK;
-}
-
-// ベースCGの上にブレンドCGを重ねた CG を作成
-int scg_create_blend(int wNumDstCG, int wNumBaseCG, int wX, int wY, int wNumBlendCG, int wAlphaMapMode) {
-	spcg_assert_no(wNumDstCG);
-	spcg_assert_no(wNumBaseCG);
-	spcg_assert_no(wNumBlendCG);
-
-	cginfo_t *basecg  = scg_get(wNumBaseCG);
-	cginfo_t *blendcg = scg_get(wNumBlendCG);
-	if (!basecg || !blendcg) return NG;
-
-	surface_t *sf = blend(basecg->sf, wX, wY, blendcg->sf, wAlphaMapMode);
-	scg_new(CG_SET, wNumDstCG, sf);
-	return OK;
-}
-
-// 指定の文字列のCGを作成
-int scg_create_text(int wNumCG, int wSize, int wR, int wG, int wB, int wText) {
-	spcg_assert_no(wNumCG);
-	
-	// 勝手に出ていいのかな？
-	if (svar_length(wText) == 0) return OK;
-
-	ags_setFont(FONT_GOTHIC, wSize);
-	agsurface_t *glyph = ags_drawStringToSurface(svar_get(wText));
-
-	surface_t *sf = sf_create_surface(glyph->width, wSize, nact->ags.dib->depth);
-	gr_fill(sf, 0, 0, glyph->width, wSize, wR, wG, wB);
-	gr_draw_amap(sf, 0, 0, glyph->pixel, glyph->width, wSize, glyph->bytes_per_line);
-
-	scg_new(CG_SET, wNumCG, sf);
-	return OK;
-}
-
-// 数字文字列のCGを作成
-int scg_create_textnum(int wNumCG, int wSize, int wR, int wG, int wB, int wFigs, int wZeroPadding, int wValue) {
-	spcg_assert_no(wNumCG);
-
-	char s[256], ss[256];
-	if (wZeroPadding) {
-		char *sss = "%%0%dd";
-		sprintf(ss, sss, wFigs);
-	} else {
-		char *sss = "%%%dd";
-		sprintf(ss, sss, wFigs);
-	}
-	sprintf(s, ss, wValue);
-
-	ags_setFont(FONT_GOTHIC, wSize);
-	agsurface_t *glyph = ags_drawStringToSurface(s);
-
-	surface_t *sf = sf_create_surface(glyph->width, wSize, nact->ags.dib->depth);
-	gr_fill(sf, 0, 0, glyph->width, wSize, wR, wG, wB);
-	gr_draw_amap(sf, 0, 0, glyph->pixel, glyph->width, wSize, glyph->bytes_per_line);
-
-	scg_new(CG_SET, wNumCG, sf);
-	return OK;
-}
-
-// CGを複製
-int scg_copy(int wNumDstCG, int wNumSrcCG) {
-	spcg_assert_no(wNumDstCG);
-	spcg_assert_no(wNumSrcCG);
-
-	cginfo_t *src = scg_get(wNumSrcCG);
-	if (!src)
-		return NG;
-
-	scg_new(CG_SET, wNumDstCG, sf_dup(src->sf));
-	return OK;
-}
-
-// CGの一部を切りぬいたCGを作成
-int scg_cut(int wNumDstCG, int wNumSrcCG, int wX, int wY, int wWidth, int wHeight) {
-	spcg_assert_no(wNumDstCG);
-	spcg_assert_no(wNumSrcCG);
-
-	cginfo_t *src = scg_get(wNumSrcCG);
-	if (!src)
-		return NG;
-
-	surface_t *sf = src->sf->alpha
-		? sf_create_surface(wWidth, wHeight, src->sf->depth)
-		: sf_create_pixel(wWidth, wHeight, src->sf->depth);
-
-	if (src->sf->pixel)
-		gr_copy(sf, 0, 0, src->sf, wX, wY, wWidth, wHeight);
-	if (src->sf->alpha)
-		gr_copy_alpha_map(sf, 0, 0, src->sf, wX, wY, wWidth, wHeight);
-
-	scg_new(CG_SET, wNumDstCG, sf);
-	return OK;
-}
-
-// 元のCGの一部を切りぬいたCGを作成
-int scg_partcopy(int wNumDstCG, int wNumSrcCG, int wX, int wY, int wWidth, int wHeight) {
-	spcg_assert_no(wNumDstCG);
-	spcg_assert_no(wNumSrcCG);
-
-	cginfo_t *src = scg_get(wNumSrcCG);
-	if (!src)
-		return NG;
-
-	surface_t *sf;
-	if (src->sf->alpha) {
-		sf = sf_create_surface(src->sf->width, src->sf->height, src->sf->depth);
-		gr_fill_alpha_map(sf, 0, 0, src->sf->width, src->sf->height, 255);
-	} else {
-		sf = sf_create_pixel(src->sf->width, src->sf->height, src->sf->depth);
-	}
-	
-	if (src->sf->pixel)
-		gr_copy(sf, wX, wY, src->sf, wX, wY, wWidth, wHeight);
-	if (src->sf->alpha)
-		gr_copy_alpha_map(sf, wX, wY, src->sf, wX, wY, wWidth, wHeight);
-
-	scg_new(CG_SET, wNumDstCG, sf);
-	return OK;
-}
-
-// 全てのCGの開放
-int scg_freeall() {
-	int i;
-	
-	for (i = 1; i < CGMAX; i++) {
-		scg_free(i);
-	}
-	return OK;
-}
-
-/**
- * 指定の番号の CG をオブジェクトリストから消し、オブジェクトがどこからも参照
- * されていない(参照数が0の)場合のみ、オブジェクトを削除
- */
-int scg_free(int no) {
-	spcg_assert_no(no);
-	
-	cginfo_t *cg = sact.cg[no];
-	if (!cg) return NG;
-	
-	scg_deref(cg);
-	sact.cg[no] = NULL;
-	
-	return OK;
-}
-
-// CGの種類を取得
-int scg_querytype(int wNumCG, int *ret) {
-	if (wNumCG >= (CGMAX -1)) goto errexit;
-	if (sact.cg[wNumCG] == NULL) goto errexit;
-
-	*ret = sact.cg[wNumCG]->type;
-	
-	return OK;
-
- errexit:
-	*ret = CG_NOTUSED;
-	return NG;
-}
-
-// CGの大きさを取得
-int scg_querysize(int wNumCG, int *w, int *h) {
-	if (wNumCG >= (CGMAX -1)) goto errexit;
-	if (sact.cg[wNumCG] == NULL) goto errexit;
-	if (sact.cg[wNumCG]->sf == NULL) goto errexit;
-
-	*w = sact.cg[wNumCG]->sf->width;
-	*h = sact.cg[wNumCG]->sf->height;
-	
-	return OK;
-
- errexit:
-	*w = *h = 0;
-	return NG;
-}
-
-// CGのBPPを取得
-int scg_querybpp(int wNumCG, int *ret) {
-	if (wNumCG >= (CGMAX -1)) goto errexit;
-	if (sact.cg[wNumCG] == NULL) goto errexit;
-	if (sact.cg[wNumCG]->sf == NULL) goto errexit;
-	
-	*ret = sact.cg[wNumCG]->sf->depth;
-
-	return OK;
-
- errexit:
-	*ret = 0;
-	return NG;
-}
-
-// CGの alphamap が存在するかを取得
-int scg_existalphamap(int wNumCG, int *ret) {
-	if (wNumCG >= (CGMAX -1)) goto errexit;
-	if (sact.cg[wNumCG] == NULL) goto errexit;
-	if (sact.cg[wNumCG]->sf == NULL) goto errexit;
-	
-	*ret = sact.cg[wNumCG]->sf->alpha ? 1 : 0;
-	
- errexit:
-	*ret = 0;
-	return NG;
-}

modules/SACT/sactcg.h

@@ -1,49 +0,0 @@
-/*
- * sactcg.h: CG作成
- *
- * Copyright (C) 1997-1998 Masaki Chikama (Wren) <chikama@kasumi.ipl.mech.nagoya-u.ac.jp>
- *               1998-                           <masaki-c@is.aist-nara.ac.jp>
- *
- * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
-*/
-/* $Id: sactcg.h,v 1.2 2003/11/16 15:29:52 chikama Exp $ */
-
-#ifndef __SACTCG_H__
-#define __SACTCG_H__
-
-#include "portab.h"
-#include "sact.h"
-
-extern cginfo_t *scg_addref(int no);
-extern void scg_deref(cginfo_t *cg);
-extern int scg_create(int wNumCG, int wWidth, int wHeight, int wR, int wG, int wB, int wBlendRate);
-extern int scg_create_reverse(int NumCG, int wNumSrcCG, int wReverseX, int wReverseY);
-extern int scg_create_stretch(int wNumCG, int wWidth, int wHeight, int wNumSrcCG);
-extern int scg_create_blend(int wNumDstCG, int wNumBaseCG, int wX, int wY, int wNumBlendCG, int wAlphaMapMode);
-extern int scg_create_text(int wNumCG, int wSize, int wR, int wG, int wB, int wText);
-extern int scg_create_textnum(int wNumCG, int wSize, int wR, int wG, int wB, int wFigs, int wZeroPadding, int wValue);
-extern int scg_copy(int wNumDstCG, int wNumSrcCG);
-extern int scg_cut(int wNumDstCG, int wNumSrcCG, int wX, int wY, int wWidth, int wHeight);
-extern int scg_partcopy(int wNumDstCG, int wNumSrcCG, int wX, int wY, int wWidth, int wHeight);
-extern int scg_freeall();
-extern int scg_free(int cg);
-extern int scg_querytype(int wNumCG, int *ret);
-extern int scg_querysize(int wNumCG, int *w, int *h);
-extern int scg_querybpp(int wNumCG, int *ret);
-extern int scg_existalphamap(int wNumCG, int *ret);
-extern int scg_linkcgfree(int no);
-
-#endif

modules/SACT/sactcg_blend.c

@@ -1,31 +0,0 @@
-// 
-static surface_t *blend(surface_t *base, int x, int y, surface_t *blend, int mode) {
-	surface_t *dst = sf_create_surface(base->width, base->height, base->depth);
-	
-	gr_copy(dst, 0, 0, base, 0, 0, base->width, base->height);
-	
-	if (base->alpha) {
-		// ベースに alpha map がある場合はそれをコピー
-		gr_copy_alpha_map(dst, 0, 0, base, 0, 0, base->width, base->height);
-	} else {
-		// 無い場合は全て 255 の map を作成
-		gr_fill_alpha_map(dst, 0, 0, base->width, base->height, 255);
-	}
-	
-	if (blend->alpha) {
-		// 重ね合わせ先の alpha map があるときはそれを使う
-		gre_BlendUseAMap(dst, x, y, base, x, y, blend, 0, 0, blend->width, blend->height, blend, 0, 0, 255);
-	} else {
-		// 無いときは dst の alpha map を使う
-		gre_BlendUseAMap(dst, x, y, base, x, y, blend, 0, 0, blend->width, blend->height, dst, x, y, 255);
-	}
-	
-	// alpha 作成モードが dst + blend の時は飽和加算
-	if (mode == 1) {
-		gr_saturadd_alpha_map(dst, x, y, blend, 0, 0, blend->width, blend->height);
-	}
-	
-	return dst;
-}
-
-

modules/SACT/sactcg_stretch.c

@@ -1,114 +0,0 @@
-// 拡大縮小
-static surface_t *stretch(surface_t *src, int dw, int dh, int mirror) {
-	surface_t *dst = calloc(1, sizeof(surface_t));
-	float    a1, a2, xd, yd;
-	int      sw, sh;
-	int      *row, *col;
-	int      x, y;
-	uint8_t  *sdata, *ddata;
-	
-	dst->width = dw;
-	dst->height = dh;
-	dst->depth = src->depth;
-	dst->bytes_per_line = dw * src->bytes_per_pixel;
-	dst->bytes_per_pixel = src->bytes_per_pixel;
-	
-	if (src->pixel) {
-		dst->pixel = malloc(dh * dst->bytes_per_line);
-	}
-	if (src->alpha) {
-		dst->alpha = malloc(dw * dh);
-	}
-	
-	
-	sdata = GETOFFSET_PIXEL(src, 0, 0);
-	ddata = GETOFFSET_PIXEL(dst, 0, 0);
-	sw = src->width;
-	sh = src->height;
-	
-	a1  = (float)sw / (float)dw;
-	a2  = (float)sh / (float)dh;
-	row = malloc(sizeof(int) * dw);
-	// 1おおきくして初期化しないと col[dw-1]とcol[dw]が同じになる
-	// 可能性がある。
-	col = calloc(dh +1, sizeof(int));
-	
-	if (mirror & 1) {
-		/* 上下反転 added by  tajiri@wizard */
-		for (yd = sh - a2, y = 0; y < dh; y++) {
-			col[y] = yd; yd -= a2;
-		}
-	} else {
-		for (yd = 0.0, y = 0; y < dh; y++) {
-			col[y] = yd; yd += a2;
-		}
-	}
-	if (mirror & 2) {
-		/* 左右反転 added by  tajiri@wizard */
-		for (xd = sw - a1, x = 0; x < dw; x++) {
-			row[x] = xd; xd -= a1;
-		}
-	} else {
-		for (xd = 0.0, x = 0; x < dw; x++) {
-			row[x] = xd; xd += a1;
-		}
-	}
-	
-#define SCALEDCOPYAREA(type) {                                          \
-	int x, y;                                                       \
-	type *sl, *dl;                                                  \
-	uint8_t *_sl, *_dl;                                                \
-	for (y = 0; y < dh; y++) {                                      \
-		sl = (type *)(sdata + *(y + col) * src->bytes_per_line);\
-		dl = (type *)(ddata +   y        * dst->bytes_per_line);\
-		for (x = 0; x < dw; x++) {                              \
-			*(dl + x) = *(sl + *(row + x));                 \
-		}                                                       \
-		_dl = (uint8_t *)dl;                                       \
-		while(*(col + y) == *(col + y + 1)) {                   \
-			_sl = _dl;                                      \
-			_dl += dst->bytes_per_line;                     \
-			memcpy(_dl, _sl, dw * sizeof(type));            \
-			y++;                                            \
-		}                                                       \
-	}}
-	
-	switch(dst->depth) {
-	case 8:	
-		SCALEDCOPYAREA(uint8_t); break;
-	case 16:
-		SCALEDCOPYAREA(uint16_t); break;
-	case 24:
-	case 32:
-		SCALEDCOPYAREA(uint32_t); break;
-	default:
-		break;
-	}
-	
-	if (src->alpha) {
-		int x, y;
-		uint8_t *sl, *dl;
-		uint8_t *_sl, *_dl;
-		sdata = GETOFFSET_ALPHA(src, 0, 0);
-		ddata = GETOFFSET_ALPHA(dst, 0, 0);
-		for (y = 0; y < dh; y++) {
-			sl = (uint8_t *)(sdata + *(y + col) * src->width);
-			dl = (uint8_t *)(ddata +   y        * dst->width);
-			for (x = 0; x < dw; x++) {
-				*(dl + x) = *(sl + *(row + x));
-			}
-			_dl = (uint8_t *)dl;
-			while(*(col + y) == *(col + y + 1)) {
-				_sl = _dl;
-				_dl += dst->width;
-				memcpy(_dl, _sl, dw);
-				y++;
-			}
-		}
-	}
-	
-	free(row);
-	free(col);
-	
-	return dst;
-}

modules/SACT/sactchart.c

@@ -25,13 +25,12 @@
 #include "portab.h"
 
 // グラフ用チャート作成
-int schart_pos(int *pos, int pos1, int pos2, int val1, int val2, int val) {
+void schart_pos(int *pos, int pos1, int pos2, int val1, int val2, int val) {
 	if (val1 == val2) {
 		*pos = 0;
 	} else {
 		*pos = (((pos2 - pos1) * (val - val1)) / (val2 - val1)) + pos1;
 	}
-	return OK;
 }
 
 /*