Albion release version 1.7.4

M-HT · Nov 18, 2023 · 8a72bf8 · 8a72bf8
1 parent 3cafd92
commit 8a72bf8
Show file tree

Hide file tree

Showing 6 changed files with 307 additions and 5 deletions.
diff --git a/games/Albion/SR-Main/Albion-music-midiplugin.c b/games/Albion/SR-Main/Albion-music-midiplugin.c
@@ -278,7 +278,7 @@ static void MidiPlugin_MusicPlayer(void *udata, Uint8 *stream, int len)
                     for (pos = 0; pos < curlen; pos += 4)
                     {
                         #if defined(ARMV8)
-                            int16x4_t srcval1, srcval2, srcval2;
+                            int16x4_t srcval1, srcval2, srcval3;
                             int32x4_t tmpval;
                             uint32x2_t dstval;
 
@@ -438,7 +438,7 @@ static void MidiPlugin_MusicPlayer(void *udata, Uint8 *stream, int len)
                             int32x2_t tmpval;
 
                             srcval = vreinterpret_s16_u32(vld1_dup_u32((Uint32 *) src_buf));
-                            tmpval = vpaddl_s16(srcval1);
+                            tmpval = vpaddl_s16(srcval);
                             srcval = vreinterpret_s16_s32(vshr_n_s32(tmpval, 1));
                             vst1_lane_s16((Sint16 *) stream, srcval, 0);
                         #elif defined(ARMV6)

diff --git a/games/Albion/release/linux/arm-aarch64/readme-Linux.txt b/games/Albion/release/linux/arm-aarch64/readme-Linux.txt
@@ -0,0 +1,139 @@
+Albion for Linux (arm-aarch64)
+Version 1.7.4
+
+Original Albion version 1.38 is required for playing.
+(English version preferred, but other languages should also work)
+(version from GOG.com can be used for playing)
+
+Libraries
+---------
+
+The game (SDL1 version) requires following 64-bit libraries: SDL, SDL_mixer, OpenGL
+On debian based distributions these libraries are in following packages: libsdl1.2debian libsdl-mixer1.2 libgl1
+
+The game (SDL2 version) requires following 64-bit libraries: SDL2, SDL2_mixer
+On debian based distributions these libraries are in following packages: libsdl2-2.0-0 libsdl2-mixer-2.0-0
+
+Following optional 64-bit library is needed only to create screenshots in PNG format (selectable in configuration file): zlib
+On debian based distributions this library is in following package: zlib1g
+
+Some midi plugins may require additional libraries.
+
+
+Installation
+------------
+
+Put files from this archive into the installed game's directory.
+
+Simple instructions:
+1) install Albion on your PC
+2) copy the ALBION subdirectory from CD onto harddisk (into the Albion directory tree)
+3) in file SETUP.INI change the path (SOURCE_PATH) from CD to the copied directory on disk (using relative path)
+4) copy the files from this archive into the game's directory
+5) run the game using Albion.sh
+
+Example (Detailed instructions):
+1) install Albion on your PC
+    - create directory ~/Games
+    - if you have original DOS version then install Albion using DOSBox
+      - in dosbox: mount ~/Games as C:, mount cdrom as D:
+      - in dosbox: install Albion into C:\ALBION
+    - if you have version from GOG.com then extract Albion from GOG.com windows installer
+      - extract Albion using innoextract (tested with version 1.4) into ~/Games/ALBION
+      - move everything from ~/Games/ALBION/app into ~/Games/ALBION
+
+2) copy the ALBION subdirectory from CD onto harddisk (into the Albion directory tree)
+    - create directory ~/Games/ALBION/ALBIONCD (that's C:\ALBION\ALBIONCD in dosbox)
+      (directory name must be DOS name - uppercase, at most 8 characters, no spaces, ...)
+    - if you have version from GOG.com then the file game.gog is the image of the CD in BIN format
+      - you can mount it using gCDEmu for example
+    - copy the content of directory cdrom:/ALBION into ~/Games/ALBION/ALBIONCD
+
+3) in file SETUP.INI change the path (SOURCE_PATH) from CD to the copied directory on disk (using relative path)
+    - in file ~/Games/ALBION/SETUP.INI find line which begins with SOURCE_PATH=
+    - replace it with line SOURCE_PATH=ALBIONCD\
+
+4) copy the files from this archive into the game's directory
+    - copy the content of this archive into ~/Games/ALBION
+
+5) run the game using Albion.sh
+    - run Albion.sh in the game's directory: ~/Games/ALBION/Albion.sh
+
+
+Music
+-----
+
+The game's MIDI music can be played using one of following libraries:
+ALSA sequencer, WildMIDI, BASSMIDI, libADLMIDI, SDL_mixer
+
+libADLMIDI is the default library, others can be selected in the configuration file.
+ALSA sequencer can use hardware or software synth (like Fluidsynth or TiMidity++).
+libADLMIDI requires no additional files for MIDI playback,
+WildMIDI and SDL_mixer require GUS patches for MIDI playback,
+BASSMIDI requires a soundfont for MIDI playback,
+libADLMIDI uses OPL3 emulator for MIDI playback.
+
+ALSA sequencer can detect usable synth automatically or it can be selected in the configuration file.
+
+GUS patches can be installed anywhere, but the file timidity.cfg must be
+either in the game's directory or in /etc/timidity/timidity.cfg
+EawPats is a good sounding set of patches.
+
+Soundfont (for BASSMIDI) can be either copied to the game's directory
+or it can be stored anywhere, but the soundfont location must be written
+in the configuration file.
+
+
+Enhanced 3D rendering
+---------------------
+
+Enhanced 3D rendering renders the 3d part of the game in double (or more) resolution,
+instead of rendering it in the original resolution and then scaling it.
+Rendering in more than double resolution is only available in advanced scaling mode.
+There are some minor issues:
+ - it works best when the 3D window size is set to 100%
+ - when toggling scaling or enhanced 3D rendering and the game is in 3D mode
+   and a message, dialog or popup menu is displayed, the 3D part may not be displayed correctly
+   (until the message, dialog or popup menu is closed)
+Enhanced 3D rendering can be turned off in the configuration file (or using the configurator).
+
+
+Configuration
+-------------
+
+Configuration is stored in the file Albion.cfg.
+
+Configuration can be changed either by editing the configuration file directly,
+or by configuration editor (Albion-setup.sh).
+
+
+Misc
+----
+
+WildMIDI library uses version 3 of the GNU Lesser General Public License (LGPLv3).
+libADLMIDI library uses version 3 of the GNU Lesser General Public License (LGPLv3).
+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.
+
+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.7.4 (2023-11-18)
+* fix aspect ratio in fullscreen
+* fix bug in original code
+* minor bug fixes
+
+
+v1.7.3a (2023-05-21)
+* first Linux (arm-aarch64) version
diff --git a/games/Albion/release/linux/armv7-gnueabihf/readme-Linux.txt b/games/Albion/release/linux/armv7-gnueabihf/readme-Linux.txt
@@ -1,12 +1,13 @@
 Albion for Linux (armv7-gnueabihf)
-Version 1.7.3
+Version 1.7.4
 
 Original Albion version 1.38 is required for playing.
 (English version preferred, but other languages should also work)
 (version from GOG.com can be used for playing)
 
 Libraries
 ---------
+
 The game (SDL1 version) requires following 32-bit libraries: SDL, SDL_mixer, OpenGL
 On debian based distributions these libraries are in following packages: libsdl1.2debian libsdl-mixer1.2 libgl1
 
@@ -61,6 +62,7 @@ Example (Detailed instructions):
 
 Music
 -----
+
 The game's MIDI music can be played using one of following libraries:
 ALSA sequencer, WildMIDI, BASSMIDI, libADLMIDI, SDL_mixer
 
@@ -84,6 +86,7 @@ in the configuration file.
 
 Enhanced 3D rendering
 ---------------------
+
 Enhanced 3D rendering renders the 3d part of the game in double (or more) resolution,
 instead of rendering it in the original resolution and then scaling it.
 Rendering in more than double resolution is only available in advanced scaling mode.
@@ -126,6 +129,12 @@ HQX scaler uses neon instructions.
 Changes
 -------
 
+v1.7.4 (2023-11-18)
+* fix aspect ratio in fullscreen
+* fix bug in original code
+* minor bug fixes
+
+
 v1.7.3 (2023-03-26)
 * optimize HQX and xBRZ scalers for more speed
 * use more threads for advanced scaling (HQX and xBRZ)

diff --git a/games/Albion/release/linux/readme-Linux.txt b/games/Albion/release/linux/readme-Linux.txt
@@ -1,12 +1,13 @@
 Albion for Linux (x86)
-Version 1.7.3
+Version 1.7.4
 
 Original Albion version 1.38 is required for playing.
 (English version preferred, but other languages should also work)
 (version from GOG.com can be used for playing)
 
 Libraries
 ---------
+
 The game (SDL1 version) requires following 32-bit libraries: SDL, SDL_mixer, OpenGL
 On debian based distributions these libraries are in following packages: libsdl1.2debian:i386 libsdl-mixer1.2:i386 libgl1:i386
 
@@ -61,6 +62,7 @@ Example (Detailed instructions):
 
 Music
 -----
+
 The game's MIDI music can be played using one of following libraries:
 ALSA sequencer, WildMIDI, BASSMIDI, libADLMIDI, SDL_mixer
 
@@ -84,6 +86,7 @@ in the configuration file.
 
 Enhanced 3D rendering
 ---------------------
+
 Enhanced 3D rendering renders the 3d part of the game in double (or more) resolution,
 instead of rendering it in the original resolution and then scaling it.
 Rendering in more than double resolution is only available in advanced scaling mode.
@@ -124,6 +127,12 @@ it sounds worse and can't play more than one MIDI stream simultaneously
 Changes
 -------
 
+v1.7.4 (2023-11-18)
+* fix aspect ratio in fullscreen
+* fix bug in original code
+* minor bug fixes
+
+
 v1.7.3 (2023-03-26)
 * optimize HQX and xBRZ scalers for more speed
 * use more threads for advanced scaling (HQX and xBRZ)

diff --git a/games/Albion/release/linux/x64/readme-Linux.txt b/games/Albion/release/linux/x64/readme-Linux.txt
@@ -0,0 +1,137 @@
+Albion for Linux (x64)
+Version 1.7.4
+
+Original Albion version 1.38 is required for playing.
+(English version preferred, but other languages should also work)
+(version from GOG.com can be used for playing)
+
+Libraries
+---------
+
+The game (SDL1 version) requires following 64-bit libraries: SDL, SDL_mixer, OpenGL
+On debian based distributions these libraries are in following packages: libsdl1.2debian libsdl-mixer1.2 libgl1
+
+The game (SDL2 version) requires following 64-bit libraries: SDL2, SDL2_mixer
+On debian based distributions these libraries are in following packages: libsdl2-2.0-0 libsdl2-mixer-2.0-0
+
+Following optional 64-bit library is needed only to create screenshots in PNG format (selectable in configuration file): zlib
+On debian based distributions this library is in following package: zlib1g
+
+Some midi plugins may require additional libraries.
+
+
+Installation
+------------
+
+Put files from this archive into the installed game's directory.
+
+Simple instructions:
+1) install Albion on your PC
+2) copy the ALBION subdirectory from CD onto harddisk (into the Albion directory tree)
+3) in file SETUP.INI change the path (SOURCE_PATH) from CD to the copied directory on disk (using relative path)
+4) copy the files from this archive into the game's directory
+5) run the game using Albion.sh
+
+Example (Detailed instructions):
+1) install Albion on your PC
+    - create directory ~/Games
+    - if you have original DOS version then install Albion using DOSBox
+      - in dosbox: mount ~/Games as C:, mount cdrom as D:
+      - in dosbox: install Albion into C:\ALBION
+    - if you have version from GOG.com then extract Albion from GOG.com windows installer
+      - extract Albion using innoextract (tested with version 1.4) into ~/Games/ALBION
+      - move everything from ~/Games/ALBION/app into ~/Games/ALBION
+
+2) copy the ALBION subdirectory from CD onto harddisk (into the Albion directory tree)
+    - create directory ~/Games/ALBION/ALBIONCD (that's C:\ALBION\ALBIONCD in dosbox)
+      (directory name must be DOS name - uppercase, at most 8 characters, no spaces, ...)
+    - if you have version from GOG.com then the file game.gog is the image of the CD in BIN format
+      - you can mount it using gCDEmu for example
+    - copy the content of directory cdrom:/ALBION into ~/Games/ALBION/ALBIONCD
+
+3) in file SETUP.INI change the path (SOURCE_PATH) from CD to the copied directory on disk (using relative path)
+    - in file ~/Games/ALBION/SETUP.INI find line which begins with SOURCE_PATH=
+    - replace it with line SOURCE_PATH=ALBIONCD\
+
+4) copy the files from this archive into the game's directory
+    - copy the content of this archive into ~/Games/ALBION
+
+5) run the game using Albion.sh
+    - run Albion.sh in the game's directory: ~/Games/ALBION/Albion.sh
+
+
+Music
+-----
+
+The game's MIDI music can be played using one of following libraries:
+ALSA sequencer, WildMIDI, BASSMIDI, libADLMIDI, SDL_mixer
+
+libADLMIDI is the default library, others can be selected in the configuration file.
+ALSA sequencer can use hardware or software synth (like Fluidsynth or TiMidity++).
+libADLMIDI requires no additional files for MIDI playback,
+WildMIDI and SDL_mixer require GUS patches for MIDI playback,
+BASSMIDI requires a soundfont for MIDI playback,
+libADLMIDI uses OPL3 emulator for MIDI playback.
+
+ALSA sequencer can detect usable synth automatically or it can be selected in the configuration file.
+
+GUS patches can be installed anywhere, but the file timidity.cfg must be
+either in the game's directory or in /etc/timidity/timidity.cfg
+EawPats is a good sounding set of patches.
+
+Soundfont (for BASSMIDI) can be either copied to the game's directory
+or it can be stored anywhere, but the soundfont location must be written
+in the configuration file.
+
+
+Enhanced 3D rendering
+---------------------
+
+Enhanced 3D rendering renders the 3d part of the game in double (or more) resolution,
+instead of rendering it in the original resolution and then scaling it.
+Rendering in more than double resolution is only available in advanced scaling mode.
+There are some minor issues:
+ - it works best when the 3D window size is set to 100%
+ - when toggling scaling or enhanced 3D rendering and the game is in 3D mode
+   and a message, dialog or popup menu is displayed, the 3D part may not be displayed correctly
+   (until the message, dialog or popup menu is closed)
+Enhanced 3D rendering can be turned off in the configuration file (or using the configurator).
+
+
+Configuration
+-------------
+
+Configuration is stored in the file Albion.cfg.
+
+Configuration can be changed either by editing the configuration file directly,
+or by configuration editor (Albion-setup.sh).
+
+
+Misc
+----
+
+WildMIDI library uses version 3 of the GNU Lesser General Public License (LGPLv3).
+libADLMIDI library uses version 3 of the GNU Lesser General Public License (LGPLv3).
+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.
+
+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.7.4 (2023-11-18)
+* fix aspect ratio in fullscreen
+* fix bug in original code
+* minor bug fixes
+
+
+v1.7.3a (2023-05-21)
+* first Linux (x64) version