Albion release version 1.8.0

games/Albion/SR-Main/Game_defs.h

@@ -25,6 +25,11 @@
 #if !defined(_GAME_DEFS_H_INCLUDED_)
 #define _GAME_DEFS_H_INCLUDED_
 
+#ifdef USE_SDL2
+    #include <SDL2/SDL.h>
+#else
+    #include <SDL/SDL.h>
+#endif
 #include <limits.h>
 #include "ptr32.h"
 

games/Albion/SR-Main/input/pc.c

@@ -577,8 +577,8 @@ void Handle_Timer_Input_Event(void)
 
             event.type = SDL_USEREVENT;
             event.user.code = EC_MOUSE_MOVE;
-            event.user.data1 = (void *) deltax;
-            event.user.data2 = (void *) deltay;
+            event.user.data1 = (void *)(intptr_t) deltax;
+            event.user.data2 = (void *)(intptr_t) deltay;
 
             SDL_PushEvent(&event);
         }

games/Albion/release/linux/Albion.cfg

@@ -23,7 +23,7 @@ Music=on
 # Audio_Resolution=8/16 - 8 or 16 bits
 # Audio_Sample_Rate=X - X=frequency in Hz (11025, 22050, 44100, ...)
 # Audio_Buffer_Size=X - X=size in bytes (128, 256, 512, 1024, 2048, 4096, ...)
-# Audio_Interpolation=on/off - interpolate audio or not
+# Audio_Resampling_Quality=0/1 - audio resampling quality (higher = better)
 # Audio_Swap_Channels=yes/no - swap left and right sound channel or not (Albion has the channels swapped, so swapping them corrects it)
 # Audio_MIDI_Subsystem=alsa/wildmidi/bassmidi/adlmidi/sdl_mixer - use ALSA sequencer, WildMIDI, BASSMIDI, ADLMIDI or SDL_mixer for MIDI playback (WildMIDI sounds better than SDL_mixer. SDL_mixer can only play one MIDI stream simultaneously. ALSA sequencer can use hardware or software synth (like Fluidsynth or TiMidity++). WildMIDI and SDL_mixer use GUS patch files for playback. BASSMIDI uses soundfont for playback. ADLMIDI uses OPL3 emulator for playback.)
 # Audio_SoundFont_Path=X - X = path to soundfont file (used by BASSMIDI)
@@ -34,7 +34,7 @@ Audio_Channels=stereo
 Audio_Resolution=16
 Audio_Sample_Rate=44100
 Audio_Buffer_Size=4096
-Audio_Interpolation=on
+Audio_Resampling_Quality=1
 Audio_Swap_Channels=yes
 Audio_MIDI_Subsystem=adlmidi
 Audio_SoundFont_Path=
@@ -71,12 +71,12 @@ Display_ExtraScalerThreads=auto
 # Screenshot settings
 # -------------------
 #
-# Screenshot_Format=Original/LBM/LBM_pad16/TGA/BMP
+# Screenshot_Format=Original/LBM/LBM_pad16/TGA/BMP/PNG
 #     - Original/LBM = original image format (LBM)
 #     - LBM_pad16 = image format is LBM with lines in file padded to 16 bytes
 #     - TGA = image format is TGA
 #     - BMP = image format is BMP
-#     - PNG = image format is PNG (requires zlib library - libz.so)
+#     - PNG = image format is PNG (requires zlib library - system library libz.so.1 or local library ./libz.so)
 # Screenshot_Enhanced_Resolution=on/off - if enabled then create screenshots in enhanced resolution (720x480) when it's possible, otherwise create screenshots in original resolution (360x240)
 # Screenshot_Enabled=yes/no - select whether making screenshots (using F4 key) is enabled without entering developer mode
 # Screenshot_Automatic_Filename=yes/no - select whether screenshot filename is generated automatically (Screenshot????.???) or not
@@ -87,6 +87,16 @@ Screenshot_Enabled=no
 Screenshot_Automatic_Filename=no
 
 
+# Input settings
+# --------------
+#
+# Input_GameController=yes/no - use gamepad or joystick as mouse/keyboard
+# Controller_Deadzone=0-8190 - gamepad/joystick deadzone
+
+Input_GameController=no
+Controller_Deadzone=1000
+
+
 # Keys settings
 # -------------
 #

games/Albion/release/linux/arm-aarch64/readme-Linux.txt

@@ -1,5 +1,5 @@
 Albion for Linux (arm-aarch64)
-Version 1.7.4
+Version 1.8.0
 
 Original Albion version 1.38 is required for playing.
 (English version preferred, but other languages should also work)
@@ -107,6 +107,24 @@ Configuration can be changed either by editing the configuration file directly,
 or by configuration editor (Albion-setup.sh).
 
 
+Controls
+--------
+
+The game can use gamepad or joystick to emulate mouse and keyboard, if it's enabled in the configuration file.
+
+Controller mappings can be added using file gamecontrollerdb.txt.
+
+Gamepad / joystick controls:
+Analog stick/pad: mouse movement
+Digital stick/pad: up/down/left/right arrow key
+A/X / 1st joystick button: left mouse button
+B/Y / 2nd joystick button: right mouse button
+Start / 3rd joystick button: virtual keyboard
+Back / 4th joystick button: tab key
+Left shoulder button: alt key
+Right shoulder button: ctrl key
+
+
 Misc
 ----
 
@@ -115,20 +133,27 @@ libADLMIDI library uses version 3 of the GNU Lesser General Public License (LGPL
 HQX scaler uses version 2.1 of the GNU Lesser General Public License (LGPLv2.1).
 xBRZ scaler uses version 3 of the GNU General Public License (GPLv3).
 
-Playback of background sound/music effects (played using music driver) uses modified WildMIDI library.
+The game optionally uses SpeexDSP library for audio resampling (https://github.com/xiph/speexdsp).
 
 Source code is available on GitHub: https://github.com/M-HT/SR
 
-MIDI playback using SDL_mixer can be selected in the configuration file, but
-it sounds worse and can't play more than one MIDI stream simultaneously
-(background sound/music effects (played using music driver) won't work).
-
 HQX scaler uses neon instructions.
 
 
 Changes
 -------
 
+v1.8.0 (2024-09-26)
+* add option to use higher quality audio resampling
+* remove option to interpolate audio when resampling
+* add support for higher sampling rates
+* add support for using gamepad or joystick as mouse/keyboard
+* use latest versions of libADLMIDI, WildMIDI libraries
+* change setting volume in libADLMIDI
+* modify ALSA midi plugin to try all ports with the same client number when looking for midi port based on client name
+* minor bug fixes
+
+
 v1.7.4 (2023-11-18)
 * fix aspect ratio in fullscreen
 * fix bug in original code

games/Albion/release/linux/armv7-gnueabihf/readme-Linux.txt

@@ -1,5 +1,5 @@
 Albion for Linux (armv7-gnueabihf)
-Version 1.7.4
+Version 1.8.0
 
 Original Albion version 1.38 is required for playing.
 (English version preferred, but other languages should also work)
@@ -107,6 +107,24 @@ Configuration can be changed either by editing the configuration file directly,
 or by configuration editor (Albion-setup.sh).
 
 
+Controls
+--------
+
+The game can use gamepad or joystick to emulate mouse and keyboard, if it's enabled in the configuration file.
+
+Controller mappings can be added using file gamecontrollerdb.txt.
+
+Gamepad / joystick controls:
+Analog stick/pad: mouse movement
+Digital stick/pad: up/down/left/right arrow key
+A/X / 1st joystick button: left mouse button
+B/Y / 2nd joystick button: right mouse button
+Start / 3rd joystick button: virtual keyboard
+Back / 4th joystick button: tab key
+Left shoulder button: alt key
+Right shoulder button: ctrl key
+
+
 Misc
 ----
 
@@ -115,20 +133,27 @@ libADLMIDI library uses version 3 of the GNU Lesser General Public License (LGPL
 HQX scaler uses version 2.1 of the GNU Lesser General Public License (LGPLv2.1).
 xBRZ scaler uses version 3 of the GNU General Public License (GPLv3).
 
-Playback of background sound/music effects (played using music driver) uses modified WildMIDI library.
+The game optionally uses SpeexDSP library for audio resampling (https://github.com/xiph/speexdsp).
 
 Source code is available on GitHub: https://github.com/M-HT/SR
 
-MIDI playback using SDL_mixer can be selected in the configuration file, but
-it sounds worse and can't play more than one MIDI stream simultaneously
-(background sound/music effects (played using music driver) won't work).
-
 HQX scaler uses neon instructions.
 
 
 Changes
 -------
 
+v1.8.0 (2024-09-26)
+* add option to use higher quality audio resampling
+* remove option to interpolate audio when resampling
+* add support for higher sampling rates
+* add support for using gamepad or joystick as mouse/keyboard
+* use latest versions of libADLMIDI, WildMIDI libraries
+* change setting volume in libADLMIDI
+* modify ALSA midi plugin to try all ports with the same client number when looking for midi port based on client name
+* minor bug fixes
+
+
 v1.7.4 (2023-11-18)
 * fix aspect ratio in fullscreen
 * fix bug in original code

games/Albion/release/linux/readme-Linux.txt

@@ -1,5 +1,5 @@
 Albion for Linux (x86)
-Version 1.7.4
+Version 1.8.0
 
 Original Albion version 1.38 is required for playing.
 (English version preferred, but other languages should also work)
@@ -107,6 +107,24 @@ Configuration can be changed either by editing the configuration file directly,
 or by configuration editor (Albion-setup.sh).
 
 
+Controls
+--------
+
+The game can use gamepad or joystick to emulate mouse and keyboard, if it's enabled in the configuration file.
+
+Controller mappings can be added using file gamecontrollerdb.txt.
+
+Gamepad / joystick controls:
+Analog stick/pad: mouse movement
+Digital stick/pad: up/down/left/right arrow key
+A/X / 1st joystick button: left mouse button
+B/Y / 2nd joystick button: right mouse button
+Start / 3rd joystick button: virtual keyboard
+Back / 4th joystick button: tab key
+Left shoulder button: alt key
+Right shoulder button: ctrl key
+
+
 Misc
 ----
 
@@ -115,18 +133,25 @@ libADLMIDI library uses version 3 of the GNU Lesser General Public License (LGPL
 HQX scaler uses version 2.1 of the GNU Lesser General Public License (LGPLv2.1).
 xBRZ scaler uses version 3 of the GNU General Public License (GPLv3).
 
-Playback of background sound/music effects (played using music driver) uses modified WildMIDI library.
+The game optionally uses SpeexDSP library for audio resampling (https://github.com/xiph/speexdsp).
 
 Source code is available on GitHub: https://github.com/M-HT/SR
 
-MIDI playback using SDL_mixer can be selected in the configuration file, but
-it sounds worse and can't play more than one MIDI stream simultaneously
-(background sound/music effects (played using music driver) won't work).
-
 
 Changes
 -------
 
+v1.8.0 (2024-09-26)
+* add option to use higher quality audio resampling
+* remove option to interpolate audio when resampling
+* add support for higher sampling rates
+* add support for using gamepad or joystick as mouse/keyboard
+* use latest versions of libADLMIDI, WildMIDI libraries
+* change setting volume in libADLMIDI
+* modify ALSA midi plugin to try all ports with the same client number when looking for midi port based on client name
+* minor bug fixes
+
+
 v1.7.4 (2023-11-18)
 * fix aspect ratio in fullscreen
 * fix bug in original code

games/Albion/release/linux/x64/readme-Linux.txt

@@ -1,5 +1,5 @@
 Albion for Linux (x64)
-Version 1.7.4
+Version 1.8.0
 
 Original Albion version 1.38 is required for playing.
 (English version preferred, but other languages should also work)
@@ -107,6 +107,24 @@ Configuration can be changed either by editing the configuration file directly,
 or by configuration editor (Albion-setup.sh).
 
 
+Controls
+--------
+
+The game can use gamepad or joystick to emulate mouse and keyboard, if it's enabled in the configuration file.
+
+Controller mappings can be added using file gamecontrollerdb.txt.
+
+Gamepad / joystick controls:
+Analog stick/pad: mouse movement
+Digital stick/pad: up/down/left/right arrow key
+A/X / 1st joystick button: left mouse button
+B/Y / 2nd joystick button: right mouse button
+Start / 3rd joystick button: virtual keyboard
+Back / 4th joystick button: tab key
+Left shoulder button: alt key
+Right shoulder button: ctrl key
+
+
 Misc
 ----
 
@@ -115,18 +133,25 @@ libADLMIDI library uses version 3 of the GNU Lesser General Public License (LGPL
 HQX scaler uses version 2.1 of the GNU Lesser General Public License (LGPLv2.1).
 xBRZ scaler uses version 3 of the GNU General Public License (GPLv3).
 
-Playback of background sound/music effects (played using music driver) uses modified WildMIDI library.
+The game optionally uses SpeexDSP library for audio resampling (https://github.com/xiph/speexdsp).
 
 Source code is available on GitHub: https://github.com/M-HT/SR
 
-MIDI playback using SDL_mixer can be selected in the configuration file, but
-it sounds worse and can't play more than one MIDI stream simultaneously
-(background sound/music effects (played using music driver) won't work).
-
 
 Changes
 -------
 
+v1.8.0 (2024-09-26)
+* add option to use higher quality audio resampling
+* remove option to interpolate audio when resampling
+* add support for higher sampling rates
+* add support for using gamepad or joystick as mouse/keyboard
+* use latest versions of libADLMIDI, WildMIDI libraries
+* change setting volume in libADLMIDI
+* modify ALSA midi plugin to try all ports with the same client number when looking for midi port based on client name
+* minor bug fixes
+
+
 v1.7.4 (2023-11-18)
 * fix aspect ratio in fullscreen
 * fix bug in original code

games/Albion/release/windows/Albion.cfg

@@ -23,7 +23,7 @@ Music=on
 # Audio_Resolution=8/16 - 8 or 16 bits
 # Audio_Sample_Rate=X - X=frequency in Hz (11025, 22050, 44100, ...)
 # Audio_Buffer_Size=X - X=size in bytes (128, 256, 512, 1024, 2048, 4096, ...)
-# Audio_Interpolation=on/off - interpolate audio or not
+# Audio_Resampling_Quality=0/1 - audio resampling quality (higher = better)
 # Audio_Swap_Channels=yes/no - swap left and right sound channel or not (Albion has the channels swapped, so swapping them corrects it)
 # Audio_MIDI_Subsystem=nativewindows/wildmidi/bassmidi/adlmidi/sdl_mixer - use NativeWindows, WildMIDI, BASSMIDI, ADLMIDI or SDL_mixer for MIDI playback (SDL_mixer can't play background sound/music effects. WildMIDI uses GUS patch files for playback. BASSMIDI uses soundfont for playback. ADLMIDI uses OPL3 emulator for playback.)
 # Audio_SoundFont_Path=X - X = path to soundfont file (used by BASSMIDI)
@@ -34,7 +34,7 @@ Audio_Channels=stereo
 Audio_Resolution=16
 Audio_Sample_Rate=44100
 Audio_Buffer_Size=4096
-Audio_Interpolation=on
+Audio_Resampling_Quality=1
 Audio_Swap_Channels=yes
 Audio_MIDI_Subsystem=adlmidi
 Audio_SoundFont_Path=
@@ -71,7 +71,7 @@ Display_ExtraScalerThreads=auto
 # Screenshot settings
 # -------------------
 #
-# Screenshot_Format=Original/LBM/LBM_pad16/TGA/BMP
+# Screenshot_Format=Original/LBM/LBM_pad16/TGA/BMP/PNG
 #     - Original/LBM = original image format (LBM)
 #     - LBM_pad16 = image format is LBM with lines in file padded to 16 bytes
 #     - TGA = image format is TGA
@@ -87,6 +87,16 @@ Screenshot_Enabled=no
 Screenshot_Automatic_Filename=no
 
 
+# Input settings
+# --------------
+#
+# Input_GameController=yes/no - use gamepad or joystick as mouse/keyboard
+# Controller_Deadzone=0-8190 - gamepad/joystick deadzone
+
+Input_GameController=no
+Controller_Deadzone=1000
+
+
 # Keys settings
 # -------------
 #