Compare commits

...
Sign in to create a new pull request.

19 commits

Author SHA1 Message Date
Fedora Release Engineering
4321cd4061 Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild 2026-01-16 03:34:30 +00:00
Fedora Release Engineering
446b8e0440 Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-23 16:53:04 +00:00
Fedora Release Engineering
1a714c3450 Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-16 10:50:15 +00:00
Fedora Release Engineering
efac2ac1e0 Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-17 16:49:20 +00:00
Miroslav Suchý
cb9a31ed9e convert GPL+ license to SPDX
This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4
2024-06-17 12:23:30 +02:00
Fedora Release Engineering
9d5ba30360 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-22 22:52:55 +00:00
Fedora Release Engineering
1eec839880 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-19 12:39:09 +00:00
Fedora Release Engineering
1d61b34025 Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-19 13:06:09 +00:00
Fedora Release Engineering
53230feb08 Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-18 21:34:24 +00:00
Fedora Release Engineering
39f1b05ebf Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-20 20:37:23 +00:00
Fedora Release Engineering
6a9c793e8c - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-19 21:06:05 +00:00
Fedora Release Engineering
6db4e01492 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-21 17:25:22 +00:00
Fedora Release Engineering
c9237aca50 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-21 12:30:03 +00:00
Fedora Release Engineering
f33992ca87 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-01-25 23:57:50 +00:00
Tom Stellard
3982ddf1b3 Add BuildRequires: make
https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
2020-12-16 23:22:56 +00:00
Fedora Release Engineering
ec101877ca - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-31 23:54:04 +00:00
Fedora Release Engineering
39170e91f1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-27 11:54:26 +00:00
Hans de Goede
48f5e4eaee Fix FTBFS (rhbz#1799146) 2020-02-14 23:31:19 +01:00
Fedora Release Engineering
2d4d3e46bf - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-01-28 11:23:59 +00:00
3 changed files with 242 additions and 2 deletions

177
alex4-fcommon-fix.patch Normal file
View file

@ -0,0 +1,177 @@
diff -ur alex4src/src/bullet.c alex4src.nre/src/bullet.c
--- alex4src/src/bullet.c 2003-07-26 12:53:52.000000000 +0200
+++ alex4src.nre/src/bullet.c 2020-02-14 16:55:54.227165835 +0100
@@ -26,6 +26,8 @@
#include "timer.h"
#include "../data/data.h"
+// the bullets themselves
+Tbullet bullet[MAX_BULLETS];
// sets values on a bullet
void set_bullet(Tbullet *b, int x, int y, double dx, double dy, BITMAP *bmp, int bad) {
diff -ur alex4src/src/bullet.h alex4src.nre/src/bullet.h
--- alex4src/src/bullet.h 2020-02-14 20:21:00.557446660 +0100
+++ alex4src.nre/src/bullet.h 2020-02-14 16:55:54.227165835 +0100
@@ -42,7 +42,7 @@
#define MAX_BULLETS 64
// the bullets themselves
-Tbullet bullet[MAX_BULLETS];
+extern Tbullet bullet[MAX_BULLETS];
// functions
void reset_bullets(Tbullet *b, int max);
diff -ur alex4src/src/edit.c alex4src.nre/src/edit.c
--- alex4src/src/edit.c 2020-02-14 20:21:00.559446658 +0100
+++ alex4src.nre/src/edit.c 2020-02-14 20:14:07.160857305 +0100
@@ -33,8 +33,6 @@
int edit_tile = 0;
// path to current map
char edit_path_and_file[1024];
-// datafile to use
-DATAFILE *data;
// current edit mode
int edit_mode;
diff -ur alex4src/src/main.h alex4src.nre/src/main.h
--- alex4src/src/main.h 2020-02-14 20:21:00.556446662 +0100
+++ alex4src.nre/src/main.h 2020-02-14 20:13:57.681842152 +0100
@@ -59,6 +59,7 @@
#define SMPL_TALK 24
#define SMPL_BEAM 25
+extern DATAFILE *data;
// functions
char *get_init_string();
diff -ur alex4src/src/particle.c alex4src.nre/src/particle.c
--- alex4src/src/particle.c 2003-07-26 12:53:52.000000000 +0200
+++ alex4src.nre/src/particle.c 2020-02-14 20:17:53.166697996 +0100
@@ -21,16 +21,11 @@
+#include "main.h"
#include "particle.h"
-// pointer to datafile
-DATAFILE *data;
-
-
-// set datafile to use
-void set_datafile(DATAFILE *d) {
- data = d;
-}
+// the particles themselves
+Tparticle particle[MAX_PARTICLES];
// inits variables in a particle
diff -ur alex4src/src/particle.h alex4src.nre/src/particle.h
--- alex4src/src/particle.h 2020-02-14 20:21:00.555446663 +0100
+++ alex4src.nre/src/particle.h 2020-02-14 20:15:57.210817230 +0100
@@ -42,10 +42,9 @@
// the particles themselves
-Tparticle particle[MAX_PARTICLES];
+extern Tparticle particle[MAX_PARTICLES];
// functions
-void set_datafile(DATAFILE *d);
void reset_particles(Tparticle *p, int max);
Tparticle *get_free_particle(Tparticle *p, int max);
void set_particle(Tparticle *p, int x, int y, double dx, double dy, int color, int life, int bmp);
diff -ur alex4src/src/player.c alex4src.nre/src/player.c
--- alex4src/src/player.c 2003-07-26 12:53:52.000000000 +0200
+++ alex4src.nre/src/player.c 2020-02-14 16:55:54.229165835 +0100
@@ -25,6 +25,9 @@
#include "timer.h"
#include "../data/data.h"
+// the player
+Tplayer player;
+
// draws the player depending on his state
void draw_player(BITMAP *bmp, Tplayer *p, int x, int y) {
BITMAP *head, *body;
diff -ur alex4src/src/player.h alex4src.nre/src/player.h
--- alex4src/src/player.h 2020-02-14 20:21:00.554446664 +0100
+++ alex4src.nre/src/player.h 2020-02-14 16:55:54.229165835 +0100
@@ -53,7 +53,7 @@
// the player
-Tplayer player;
+extern Tplayer player;
// functions
void draw_player(BITMAP *bmp, Tplayer *p, int x, int y);
diff -ur alex4src/src/script.c alex4src.nre/src/script.c
--- alex4src/src/script.c 2020-02-14 20:21:00.560446657 +0100
+++ alex4src.nre/src/script.c 2020-02-14 20:14:25.441886527 +0100
@@ -33,9 +33,8 @@
// silly value
#define NO_CHANGE -3249587
-
-// datafile to use
-DATAFILE *data;
+// array holding the sounds ids
+int active_sounds[MAX_SCRIPT_SOUNDS];
// internal buffers
BITMAP *buffer;
BITMAP *swap_buffer;
diff -ur alex4src/src/script.h alex4src.nre/src/script.h
--- alex4src/src/script.h 2020-02-14 20:21:00.556446662 +0100
+++ alex4src.nre/src/script.h 2020-02-14 16:55:54.230165835 +0100
@@ -42,7 +42,7 @@
// max number of sounds played by the script
#define MAX_SCRIPT_SOUNDS 16
// array holding the sounds ids
-int active_sounds[MAX_SCRIPT_SOUNDS];
+extern int active_sounds[MAX_SCRIPT_SOUNDS];
// functions
diff -ur alex4src/src/timer.c alex4src.nre/src/timer.c
--- alex4src/src/timer.c 2020-02-14 20:21:00.557446660 +0100
+++ alex4src.nre/src/timer.c 2020-02-14 16:55:54.226165836 +0100
@@ -23,6 +23,14 @@
#include "allegro.h"
#include "timer.h"
+// the variables used by the timers
+volatile int frame_count;
+volatile int fps;
+volatile int logic_count;
+volatile int lps;
+volatile int cycle_count;
+volatile int game_count;
+
// keeps track of frames each second
void fps_counter(void) {
fps = frame_count;
diff -ur alex4src/src/timer.h alex4src.nre/src/timer.h
--- alex4src/src/timer.h 2020-02-14 20:21:00.556446662 +0100
+++ alex4src.nre/src/timer.h 2020-02-14 16:55:54.227165835 +0100
@@ -24,12 +24,12 @@
#define _TIMERS_H_
// the variables used by the timers
-volatile int frame_count;
-volatile int fps;
-volatile int logic_count;
-volatile int lps;
-volatile int cycle_count;
-volatile int game_count;
+extern volatile int frame_count;
+extern volatile int fps;
+extern volatile int logic_count;
+extern volatile int lps;
+extern volatile int cycle_count;
+extern volatile int game_count;
// functions

View file

@ -1,8 +1,8 @@
Name: alex4
Version: 1.0
Release: 30%{?dist}
Release: 47%{?dist}
Summary: Alex the Allegator 4 - Platform game
License: GPL+
License: GPL-1.0-or-later
URL: https://obiot.github.io/Alex4-WE/readme.html
Source0: http://downloads.sf.net/allegator/Alex4/source%20and%20data/alex4src_data.zip
Source1: alex4.desktop
@ -14,8 +14,10 @@ Patch2: alex4-dot-files-endian-clean.patch
Patch3: alex4-fsf-address.patch
Patch4: alex4-ini-comment.patch
Patch5: alex4src-warnings.patch
Patch6: alex4-fcommon-fix.patch
BuildRequires: gcc
BuildRequires: allegro-devel dumb-devel desktop-file-utils libappstream-glib
BuildRequires: make
Requires: hicolor-icon-theme
%description
@ -64,6 +66,58 @@ appstream-util validate-relax --nonet \
%changelog
* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-47
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-46
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-45
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-44
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Mon Jun 17 2024 Miroslav Suchý <msuchy@redhat.com> - 1.0-43
- convert license to SPDX
* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-42
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-41
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-40
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-39
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-38
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-37
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-36
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-35
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Fri Jul 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-34
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-33
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Fri Feb 14 2020 Hans de Goede <hdegoede@redhat.com> - 1.0-32
- Fix FTBFS (rhbz#1799146)
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-31
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-30
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

View file

@ -1,6 +1,15 @@
diff -up alex4src/src/main.c~ alex4src/src/main.c
--- alex4src/src/main.c~ 2017-09-08 12:11:48.000000000 +0200
+++ alex4src/src/main.c 2017-09-08 12:15:45.784592931 +0200
@@ -452,7 +452,7 @@ void load_level_files(const char *filena
mode = 2;
}
else {
- char full_path_to_map[1024];
+ char full_path_to_map[2048];
clear_trailing_whitespace(buf);
sprintf(full_path_to_map, "%s%s", path, buf);
@@ -2579,7 +2579,7 @@ int get_string(BITMAP *bmp, char *string
if (block == NULL)
return 1;