Version 2.15.1

This fixes #66. It was a regression by commit 6b646b3.

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 2.15.1 - 2024-05-14
+- Fixed a text rendering issue in Rance 5D (#66)
+
+## 2.15.0 - 2024-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 - 2024-04-01
 - Fixed build for big endian architectures.
 

CMakeLists.txt

@@ -10,7 +10,7 @@ set(CMAKE_C_STANDARD 99)
 enable_testing()
 set(CMAKE_EXPORT_COMPILE_COMMANDS TRUE)
 
-set(XSYSTEM35_VERSION "2.14.3")
+set(XSYSTEM35_VERSION "2.15.1")
 
 include(CheckSymbolExists)
 include(FetchContent)

android/README.md

@@ -6,7 +6,44 @@ Minimum supported Android version: 5.0
 You can download prebuilt APKs
 [here](https://github.com/kichikuou/xsystem35-sdl2/releases).
 
-## Build
+## 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. 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.
+
+### Preparing a ZIP
+- 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 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.)
+
+Note: This ZIP format is also compatible with
+[Kichikuou on Web](http://kichikuou.github.io/web/).
+
+### Miscellaneous
+- You can export or import save files via the game list's option menu.
+- To uninstall a game, long-tap its title in the game list.
+
+## Known Issues
+- Android versions older than 7.0 cannot handle ZIP files containing Shift-JIS
+  filenames. This issue occurs with some ZIP files distributed on
+  [retroc.net](http://retropc.net/alice/). If you encounter the error message
+  "This type of ZIP is not supported," unzip the file on your PC and re-archive
+  it using modern ZIP creation software.
+
+## Building from Source
 
 ### Using Android Studio
 Open this directory as an Android Studio project.
@@ -34,39 +71,3 @@ git clone https://github.com/kichikuou/xsystem35-sdl2.git
 cd xsystem35-sdl2/android
 ./gradlew build  # or ./gradlew installDebug if you have a connected device
 ```
-
-## 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.
-3. Select the ZIP file you created in step 1.
-4. The game will start. To simulate a right-click, tap the black bars on either
-   the left or right, or top or bottom of the screen.
-
-### Preparing a ZIP
-- Include all files from the `GAMEDATA` folder (such as `.ALD` files and
-  others). `.EXE` and `.DLL` files are not necessary, but you can include them
-  if you want.
-- Music files (`.mp3`, `.ogg`, or `.wav`) whose filenames end with a number
-  will be recognized as BGM files. For example:
-  - `Track2.mp3`
-  - `15.ogg`
-  - `rance4_03.wav` (Note: The filename shouldn't be `rance403.wav`, as it
-    would be treated as the 403rd track.)
-
-Note: This ZIP format is also compatible with
-[Kichikuou on Web](http://kichikuou.github.io/web/).
-
-### Miscellaneous
-- You can export or import save files via the game list's option menu.
-- To uninstall a game, long-tap its title in the game list.
-
-## Known Issues
-- Android versions older than 7.0 cannot handle ZIP files containing Shift-JIS
-  filenames. This issue occurs with some ZIP files distributed on
-  [retroc.net](http://retropc.net/alice/). If you encounter the error message
-  "This type of ZIP is not supported," unzip the file on your PC and re-archive
-  it using modern ZIP creation software.

android/app/build.gradle

@@ -16,8 +16,8 @@ android {
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 34
-        versionCode 32
-        versionName "2.14.3" + gitRevision()
+        versionCode 34
+        versionName "2.15.1" + gitRevision()
         externalNativeBuild {
             cmake {
                 arguments "-DANDROID_APP_PLATFORM=android-19", "-DANDROID_STL=c++_static"

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

@@ -127,6 +127,7 @@ class Launcher private constructor(private val rootDir: File) {
         if (!saveDirFound) {
             File(rootDir, SAVE_DIR).mkdir()
         }
+        observer?.onGameListChange()
     }
 
     private fun createDirForGame(): File {
@@ -219,16 +220,17 @@ class Launcher private constructor(private val rootDir: File) {
         var gameDir: String? = null
             private set
         private val aldRegex = """.*?s[a-z]\.ald""".toRegex(RegexOption.IGNORE_CASE)
-        private val audioRegex = """.*?(\d+)\.(wav|mp3|ogg)""".toRegex(RegexOption.IGNORE_CASE)
+        private val audioRegex = """((\d+).*|.*?(\d+))\.(wav|mp3|ogg)""".toRegex(RegexOption.IGNORE_CASE)
         private val audioFiles: Array<String?> = arrayOfNulls(100)
 
         fun maybeAdd(path: String) {
-            aldRegex.matchEntire(path)?.let {
+            val name = File(path).name
+            aldRegex.matchEntire(name)?.let {
                 gameDir = File(path).parent
                 ready = true
             }
-            audioRegex.matchEntire(path)?.let {
-                val track = it.groupValues[1].toInt()
+            audioRegex.matchEntire(name)?.let {
+                val track = it.groupValues[2].toIntOrNull() ?: it.groupValues[3].toInt()
                 if (0 < track && track <= audioFiles.size)
                     audioFiles[track - 1] = path
             }

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,23 +78,15 @@ 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.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()
         return true
     }
 
@@ -102,6 +97,12 @@ class LauncherActivity : Activity(), LauncherObserver {
 
     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,6 +117,12 @@ class LauncherActivity : Activity(), LauncherObserver {
                                        SAVEDATA_IMPORT_REQUEST)
                 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)
@@ -157,7 +164,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)
     }

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,17 @@
 <?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/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,14 +2,15 @@
 <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="cancel">キャンセル</string>
     <string name="cannot_find_ald">System 3.x のファイル (*.ald) が見つかりません。</string>
     <string name="choose_a_file">ファイルを選択</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>
@@ -19,4 +20,21 @@
     <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,14 +1,15 @@
 <resources>
     <string name="app_name">xsystem35</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="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="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>
@@ -19,4 +20,22 @@
     <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>

doc/xsystem35.6.adoc

@@ -30,7 +30,8 @@ finds System 3.x game files (*.ALD) from the current directory.
 *-game* _game_::
   Enables game-specific hacks. Usually auto-detected, but must be specified for
   games with modified / translated titles. Possible values are: `toushin2`,
-  `rance3_eng`, `rance4_eng`, `rance4_v2`, `persiom`, `agake`.
+  `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

modules/lib/drawtext.c

@@ -71,6 +71,7 @@ int dt_drawtext_col(SDL_Surface *sf, int x, int y, char *buf, int r, int g, int
 	if (glyph == NULL) return 0;
 
 	SDL_Rect rect = {x, y, glyph->w, glyph->h};
+	SDL_SetSurfaceBlendMode(glyph, SDL_BLENDMODE_NONE);
 	SDL_BlitSurface(glyph, NULL, sf, &rect);
 	SDL_FreeSurface(glyph);
 	return rect.w;

src/CMakeLists.txt

@@ -170,7 +170,7 @@ if (EMSCRIPTEN)
     -sALLOW_MEMORY_GROWTH=1
     -sNO_EXIT_RUNTIME=1
     -sEXPORTED_FUNCTIONS=_main,_malloc
-    -sEXPORTED_RUNTIME_METHODS=FS,IDBFS,getValue,addRunDependency,removeRunDependency,stringToUTF8OnStack
+    -sEXPORTED_RUNTIME_METHODS=FS,IDBFS,HEAPU8,HEAP16,getValue,addRunDependency,removeRunDependency,stringToUTF8OnStack
     --emit-tsd=xsystem35.d.ts
     )
 

src/cmdz.c

@@ -126,6 +126,10 @@ void commandZW() {
 	int sw = getCaliValue();
 	
 	if (sw < 256) {
+		// System 3.5 has a bug in which ZW 1 does not disable message waiting,
+		// and Rance 2 depends on it.
+		if (game_id == GAME_RANCE2)
+			sw = 2;
 		nact->messagewait_enable = ((sw & 0xff) > 1);
 		nact->messagewait_cancelled = false;
 	} else {

src/hacks.c

@@ -27,6 +27,7 @@
 #define GT_TOSHIN2 "闘神都市Ⅱ　ｆｏｒ　Ｗｉｎ９５　"
 #define GT_RANCE4 "Ｒａｎｃｅ４　－教団の遺産－　Ｆｏｒ　Ｗｉｎ９５　"
 #define GT_RANCE4_V2 "RanceⅣ　－教団の遺産－　for Windows　"
+#define GT_RANCE2 "ＲＡＮＣＥ２"
 #define GT_RANCE3 "Ｒａｎｃｅ３"
 #define GT_RANCE3_ENG "Rance3"
 #define GT_RANCE4_ENG "Rance4 -Legacy of the Sect- For Win95 "
@@ -42,6 +43,8 @@ bool daiakuji_cx_hack;
 void enable_hack_by_gameid(const char *gameid) {
 	if (!strcmp(gameid, "toushin2"))
 		game_id = GAME_TT2;
+	else if (!strcmp(gameid, "rance2"))
+		game_id = GAME_RANCE2;
 	else if (!strcmp(gameid, "rance3"))
 		game_id = GAME_RANCE3;
 	else if (!strcmp(gameid, "rance3_eng"))
@@ -69,6 +72,8 @@ void enable_hack_by_title(const char *title_utf8) {
 		game_id = GAME_TT2;
 	else if (!strcmp(title_utf8, GT_RANCE4_V2))
 		game_id = GAME_RANCE4_V2;
+	else if (!strcmp(title_utf8, GT_RANCE2))
+		game_id = GAME_RANCE2;
 	else if (!strcmp(title_utf8, GT_RANCE3))
 		game_id = GAME_RANCE3;
 	else if (!strcmp(title_utf8, GT_RANCE3_ENG))

src/hacks.h

@@ -25,6 +25,7 @@
 enum gameId {
 	GAME_UNKNOWN = 0,
 	GAME_TT2,
+	GAME_RANCE2,
 	GAME_RANCE3,
 	GAME_RANCE3_ENG,
 	GAME_RANCE4_ENG,

src/message.c

@@ -129,18 +129,18 @@ void msg_putMessage(const char *m) {
 	MyRectangle drawn;
 	msgcur.x += ags_drawString(msgcur.x, msgcur.y, m, msg.MsgFontColor, &drawn);
 
-	if (nact->messagewait_enable && !nact->messagewait_cancelled && !msgskip_isSkipping()) {
+	if (nact->messagewait_enable && nact->messagewait_time > 0 &&
+		!nact->messagewait_cancelled && !msgskip_isSkipping()) {
 		int x;
 		for (x = 0; x < drawn.w; x+=16) {
 			ags_updateArea(drawn.x + x, drawn.y, 16, drawn.h);
-			if (nact->messagewait_cancel) {
-				if (sys_getInputInfo()) {
-					nact->messagewait_cancelled = true;
-					ags_updateArea(drawn.x, drawn.y, drawn.w, drawn.h);
-					break;
-				}
-				sdl_sleep(nact->messagewait_time * 10);
+			int key = sys_getInputInfo();
+			if (nact->messagewait_cancel && key) {
+				nact->messagewait_cancelled = true;
+				ags_updateArea(drawn.x, drawn.y, drawn.w, drawn.h);
+				break;
 			}
+			sdl_sleep(nact->messagewait_time * 10);
 			nact->callback();
 		}
 	} else {

src/sdl_draw.c

@@ -128,7 +128,7 @@ void sdl_updateAll(MyRectangle *view_rect) {
 
 /* Color の複数個指定 */
 void sdl_setPalette(SDL_Color *pal, int first, int count) {
-	SDL_SetPaletteColors(sdl_palette, pal, first, count);
+	SDL_SetPaletteColors(sdl_palette, pal + first, first, count);
 }
 
 /* 矩形の描画 */