0 8 1 stable lua

.editorconfig

@@ -11,7 +11,7 @@ insert_final_newline = true
 indent_style = space
 indent_size = 4
 
-[*.{sh,rb,js,yml,adoc}]
+[*.{sh,rb,js,yml,yaml,adoc}]
 indent_style = space
 indent_size = 2
 

.github/workflows/stable-compilation.yml

@@ -19,8 +19,8 @@ defaults:
 
 jobs:
   docker:
-    name: ${{ matrix.image }}
-    runs-on: ubuntu-latest
+    name: ${{ matrix.image }} (${{ matrix.os.arch }})
+    runs-on: ${{ matrix.os.name }}
     container:
       image: ${{ matrix.image }}
 
@@ -30,10 +30,22 @@ jobs:
         image:
           #   version of: # CMake  | g++    | SDL    |     support end  #
           # -------------------------------------------------------------
-          - ubuntu:20.04  # 3.16.3 |  9.3.0 | 2.0.10 | LTS       (4/25) #
           - debian:11     # 3.18.4 | 10.2.1 | 2.0.14 | oldstable (8/24) #
-          - ubuntu:22.04  # 3.22.1 | 11.2.0 | 2.0.20 | LTS       (6/27) #
+          - ubuntu:22.04  # 3.22.1 | 11.2.0 | 2.0.20 | LTS       (4/27) #
           - debian:12     # 3.25.1 | 12.2.0 | 2.26.5 | stable    (6/26) #
+          - ubuntu:24.04  # 3.28.3 | 13.2.0 | 2.30.0 | LTS       (4/29) #
+        os:
+          - arch: x86_64
+            name: ubuntu-latest
+          - arch: arm64
+            name: ubuntu-24.04-arm
+        exclude:
+          - os:
+              arch: arm64
+            image: debian:11
+          - os:
+              arch: arm64
+            image: ubuntu:22.04
 
     steps:
       - name: Install dependencies
@@ -45,7 +57,7 @@ jobs:
             libicu-dev libexpat1-dev libinih-dev nlohmann-json3-dev \
             libsdl2-dev libpng-dev libpixman-1-dev libfmt-dev \
             libfreetype6-dev libharfbuzz-dev libmpg123-dev libsndfile-dev \
-            libvorbis-dev libopusfile-dev libspeexdsp-dev \
+            libvorbis-dev libopusfile-dev libspeexdsp-dev liblhasa-dev \
             libdrm-dev libgbm-dev # only needed for sdl2 on debian 11
 
       - name: Clone Repository

.gitignore

@@ -146,3 +146,4 @@ eboot.bin
 *.pem
 *.keystore
 *.jks
+games/

CMakeLists.txt

@@ -1,9 +1,9 @@
-cmake_minimum_required(VERSION 3.16...3.31 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.18...3.31 FATAL_ERROR)
 
-project(EasyRPG_Player VERSION 0.8.1
+project(EasyRPG_Player VERSION 0.8.1.1
 	DESCRIPTION "Interpreter for RPG Maker 2000/2003 games"
 	HOMEPAGE_URL "https://easyrpg.org"
-	LANGUAGES CXX)
+	LANGUAGES C CXX)
 
 # Extra CMake Module files
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/builds/cmake/Modules")
@@ -30,6 +30,19 @@ set(CMAKE_CXX_EXTENSIONS ON)
 option(BUILD_SHARED_LIBS "Build shared easyrpg_libretro core" ON)
 
 option(CMAKE_FIND_PACKAGE_PREFER_CONFIG "Prefer config files over bundled FindXXX files. Set this to OFF when configuration fails and report a bug." ON)
+if (NOT CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+	add_compile_options(
+		-Wall
+		-Wextra
+		$<$<CONFIG:Release>:-funroll-loops>
+	)
+endif()
+
+file(GLOB_RECURSE LEASY_SRC CONFIGURE_DEPENDS
+	src/leasy/lua/*.c
+	src/leasy/*.cpp
+	src/leasy/*.hpp
+)
 
 # Source Files
 add_library(${PROJECT_NAME} OBJECT
@@ -68,8 +81,6 @@ add_library(${PROJECT_NAME} OBJECT
 	src/baseui.h
 	src/battle_animation.cpp
 	src/battle_animation.h
-	src/battle_message.cpp
-	src/battle_message.h
 	src/bitmap.cpp
 	src/bitmapfont.h
 	src/bitmapfont_glyph.h
@@ -192,6 +203,8 @@ add_library(${PROJECT_NAME} OBJECT
 	src/game_map.h
 	src/game_message.cpp
 	src/game_message.h
+	src/game_message_terms.cpp
+	src/game_message_terms.h
 	src/game_party_base.cpp
 	src/game_party_base.h
 	src/game_party.cpp
@@ -476,6 +489,7 @@ add_library(${PROJECT_NAME} OBJECT
 	src/window_teleport.h
 	src/window_varlist.cpp
 	src/window_varlist.h
+	${LEASY_SRC}
 )
 
 # These are actually unused when building in CMake
@@ -607,7 +621,7 @@ elseif(PLAYER_TARGET_PLATFORM STREQUAL "SDL2")
 	# SDL2 depends on some systems on SDL2::SDL2main but SDL2::SDL2 is not always a dependency of it
 	# Manually add the dependencies
 	player_find_package(NAME SDL2
-		VERSION 2.0.5
+		VERSION 2.0.14
 		TARGET SDL2::SDL2
 		REQUIRED)
 
@@ -779,6 +793,10 @@ endif()
 # Shared by homebrew platforms
 if(NINTENDO_3DS OR NINTENDO_WII OR NINTENDO_WIIU OR NINTENDO_WIIU OR NINTENDO_SWITCH OR VITA)
 	target_compile_options(${PROJECT_NAME} PUBLIC -fno-exceptions -fno-rtti)
+	if(VITA)
+		# This optimisation is unstable on Vita (crashes at the end of MainLoop)
+		target_compile_options(${PROJECT_NAME} PUBLIC -fno-optimize-sibling-calls)
+	endif()
 	set(CMAKE_DL_LIBS "") # hack4icu!
 	set(PLAYER_ENABLE_TESTS OFF)
 	option(PLAYER_VERSIONED_PACKAGES "Create zip packages with versioned name (for internal use)" ON)

Makefile.am

@@ -42,8 +42,6 @@ libeasyrpg_player_a_SOURCES = \
 	src/baseui.h \
 	src/battle_animation.cpp \
 	src/battle_animation.h \
-	src/battle_message.cpp \
-	src/battle_message.h \
 	src/bitmap.cpp \
 	src/bitmap.h \
 	src/bitmapfont.h \
@@ -168,6 +166,8 @@ libeasyrpg_player_a_SOURCES = \
 	src/game_map.h \
 	src/game_message.cpp \
 	src/game_message.h \
+	src/game_message_terms.cpp \
+	src/game_message_terms.h \
 	src/game_party.cpp \
 	src/game_party.h \
 	src/game_party_base.cpp \

README.md

@@ -17,7 +17,7 @@ Documentation is available at the documentation wiki: https://wiki.easyrpg.org
 ### minimal / required
 
 - [liblcf] for RPG Maker data reading.
-- SDL3 or SDL2 >= 2.0.5 for screen backend support.
+- SDL3 or SDL2 >= 2.0.14 for screen backend support.
 - Pixman for low level pixel manipulation.
 - libpng for PNG image support.
 - zlib for XYZ image and ZIP archive support.

builds/android/app/build.gradle

@@ -5,9 +5,9 @@ android {
     assetPacks = [":assets"]
     defaultConfig {
         applicationId "org.easyrpg.player"
-        compileSdk 34
+        compileSdk 36
         minSdkVersion 21
-        targetSdkVersion 34
+        targetSdkVersion 36
         versionName VERSION_NAME
         versionCode Integer.parseInt(VERSION_CODE)
     }
@@ -77,10 +77,11 @@ allprojects {
 
 dependencies {
     implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation "androidx.activity:activity:1.10.1"
     implementation 'com.google.android.material:material:1.12.0'
     implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.recyclerview:recyclerview:1.3.2'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'androidx.recyclerview:recyclerview:1.4.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
     implementation 'androidx.documentfile:documentfile:1.0.1'
     implementation 'org.ini4j:ini4j:0.5.4'
 }

builds/android/app/src/main/AndroidManifest.xml

@@ -36,7 +36,9 @@
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        android:enableOnBackInvokedCallback="true"
+        >
 
         <!-- Setting SDL hints from AndroidManifest.xml: -->
         <meta-data android:name="SDL_ENV.SDL_ACCELEROMETER_AS_JOYSTICK" android:value="0" />
@@ -106,6 +108,7 @@
         </activity>
         <activity
             android:name=".button_mapping.ButtonMappingActivity"
+            android:theme="@style/AppTheme.NoActionBar"
             android:configChanges="orientation|screenSize" />
 
         <provider

builds/android/app/src/main/java/org/easyrpg/player/BaseActivity.java

@@ -3,14 +3,17 @@
 import android.os.Bundle;
 import android.util.Log;
 
+import androidx.activity.OnBackPressedCallback;
 import androidx.appcompat.app.AppCompatActivity;
+
 import org.easyrpg.player.settings.SettingsManager;
 
 /**
  * This activity is used by the GameBrowser and the settings.
  */
 public class BaseActivity extends AppCompatActivity {
     public static Boolean libraryLoaded = false;
+    protected OnBackPressedCallback onBackPressedCallback = null;
 
     private static void loadNativeLibraries() {
         if (!libraryLoaded) {
@@ -44,5 +47,18 @@ protected void init() {
         SettingsManager.init(getApplicationContext());
 
         loadNativeLibraries();
+
+        // Handle pressing of back button on newer Android 35+
+        onBackPressedCallback = new OnBackPressedCallback(false) {
+            @Override
+            public void handleOnBackPressed() {
+                backPressed();
+            }
+        };
+        getOnBackPressedDispatcher().addCallback(this, onBackPressedCallback);
+    }
+
+    public void backPressed() {
+        // no-op, to be overwritten
     }
 }

builds/android/app/src/main/java/org/easyrpg/player/Helper.java

@@ -8,17 +8,20 @@
 import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.graphics.Color;
+import android.graphics.Insets;
 import android.graphics.Paint;
 import android.graphics.Paint.Style;
 import android.graphics.Point;
 import android.net.Uri;
+import android.os.Build;
 import android.os.ParcelFileDescriptor;
 import android.provider.DocumentsContract;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.util.TypedValue;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.WindowInsets;
 import android.widget.Button;
 import android.widget.RelativeLayout;
 import android.widget.RelativeLayout.LayoutParams;
@@ -68,17 +71,41 @@ public static int getPixels(Activity v, double dipValue) {
 	 *            Y position from 0 to 1
 	 */
 	public static void setLayoutPosition(Activity a, View view, double x, double y) {
-		DisplayMetrics displayMetrics = a.getResources().getDisplayMetrics();
-		float screenWidthDp = displayMetrics.widthPixels / displayMetrics.density;
-		float screenHeightDp = displayMetrics.heightPixels / displayMetrics.density;
+        int padW = 0;
+        int padH = 0;
+
+        // Consider the display cut out when calculating the button position to avoid that they are
+        // rendered out of bounds.
+        // Starting from Android 15 (SDK35) the reported display metrics are of the entire screen
+        // including the system bar but our activity has insets configured
+        // Substract the size of the display cutout to prevent that our buttons are displayed out of
+        // bounds.
+        if (Build.VERSION.SDK_INT >= 35) {
+            WindowInsets insets = a.getWindow().getDecorView().getRootWindowInsets();
+            if (insets != null) {
+                Insets systemBar = insets.getInsets(WindowInsets.Type.displayCutout());
+
+                padW = systemBar.left + systemBar.right;
+                padH = systemBar.top + systemBar.bottom;
+            }
+        }
+
+        DisplayMetrics displayMetrics = a.getResources().getDisplayMetrics();
+        float screenWidthDp = (displayMetrics.widthPixels) / displayMetrics.density;
+        float screenHeightDp = (displayMetrics.heightPixels) / displayMetrics.density;
+
+        float screenWidthDpFit = (displayMetrics.widthPixels - padW) / displayMetrics.density;
+        float screenHeightDpFit = (displayMetrics.heightPixels - padH) / displayMetrics.density;
+
+        float widthRatio = screenWidthDpFit / screenWidthDp;
+        float heightRatio = screenHeightDpFit / screenHeightDp;
 
-		RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(LayoutParams.WRAP_CONTENT,
-				LayoutParams.WRAP_CONTENT);
+        RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
 
-		params.leftMargin = Helper.getPixels(a, screenWidthDp * x);
-		params.topMargin = Helper.getPixels(a, screenHeightDp * y);
+        params.leftMargin = Helper.getPixels(a, screenWidthDpFit * x * widthRatio);
+        params.topMargin = Helper.getPixels(a, screenHeightDpFit * y * heightRatio);
 
-		view.setLayoutParams(params);
+        view.setLayoutParams(params);
 	}
 
     public static Paint getUIPainter() {