jengelh/dsda-doom
SHA256
1
0
Fork 0
forked from pool/dsda-doom
Code Pull Requests Activity

dsda-doom 0.28

Browse Source
This commit is contained in:
Jan Engelhardt 2024-08-15 16:17:06 +00:00
parent 6ef5a92023
commit 1b0931d589
7 changed files with 70 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
cmake-path-suffix.diff
View File

@ -1,35 +0,0 @@
From: Jan Engelhardt <jengelh@inai.de>
Date: 2023-11-01 14:19:29.990929358 +0100
References: https://github.com/kraflab/dsda-doom/issues/434
[ 6s] src/CMakeFiles/dsda-doom.dir/build.make:3952: warning: overriding recipe for target 'dsda-doom'
[ 6s] src/CMakeFiles/dsda-doom.dir/build.make:3943: warning: ignoring old recipe for target 'dsda-doom'
[ 6s] src/CMakeFiles/dsda-doom.dir/build.make:3952: warning: overriding recipe for target 'dsda-doom'
[ 6s] src/CMakeFiles/dsda-doom.dir/build.make:3943: warning: ignoring old recipe for target 'dsda-doom'
[ 6s] make[2]: *** No rule to make target 'optimized', needed by 'dsda-doom'. Stop.
[ 6s] make[1]: *** [CMakeFiles/Makefile2:172: src/CMakeFiles/dsda-doom.dir/all] Error 2
---
prboom2/cmake/FindLibMad.cmake | 2 --
1 file changed, 2 deletions(-)
Index: dsda-doom-0.27.2/prboom2/cmake/FindLibMad.cmake
===================================================================
--- dsda-doom-0.27.2.orig/prboom2/cmake/FindLibMad.cmake
+++ dsda-doom-0.27.2/prboom2/cmake/FindLibMad.cmake
@@ -59,13 +59,13 @@ select_dll_configurations(LibMad)
find_library(
LibMad_LIBRARY_RELEASE
NAMES mad
- PATH_SUFFIXES ../../lib
+ PATH_SUFFIXES ${CMAKE_CURRENT_BINARY_DIR}/../../lib
)
find_library(
LibMad_LIBRARY_DEBUG
NAMES mad
- PATH_SUFFIXES ../debug/lib
+ PATH_SUFFIXES ${CMAKE_CURRENT_BINARY_DIR}/../debug/lib
)
include(SelectLibraryConfigurations)

10
dsda-doom.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Thu Aug 15 16:10:13 UTC 2024 - Andrea Manzini <andrea.manzini@suse.com>
- Update to release 0.28.0
* Freelook aiming and projectile behavior has been rewritten
* Added MAPINFO flags to support finite height explosion behavior
* Added MAPINFO flags to support freelook
* improvement on Tools, Console, and many Bug Fixes
see https://github.com/kraflab/dsda-doom/blob/master/patch_notes/v0.28.md
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Dec 3 16:22:11 UTC 2023 - Jan Engelhardt <jengelh@inai.de> Sun Dec 3 16:22:11 UTC 2023 - Jan Engelhardt <jengelh@inai.de>

9
dsda-doom.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package dsda-doom # spec file for package dsda-doom
# #
# Copyright (c) 2023 SUSE LLC # Copyright (c) 2024 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -17,7 +17,7 @@
Name: dsda-doom Name: dsda-doom
Version: 0.27.5 Version: 0.28.0
Release: 0 Release: 0
Summary: DOOM source port with Hexen support and demo compatibility Summary: DOOM source port with Hexen support and demo compatibility
License: GPL-2.0-or-later License: GPL-2.0-or-later
@ -27,9 +27,8 @@ URL: https://github.com/kraflab/dsda-doom
#Changelog: https://github.com/kraflab/dsda-doom/tree/master/patch_notes #Changelog: https://github.com/kraflab/dsda-doom/tree/master/patch_notes
#Announce: https://www.doomworld.com/forum/topic/118074-dsda-doom-source-port-v0243/ #Announce: https://www.doomworld.com/forum/topic/118074-dsda-doom-source-port-v0243/
Source: https://github.com/kraflab/dsda-doom/archive/refs/tags/v%version.tar.gz Source: https://github.com/kraflab/dsda-doom/archive/refs/tags/v%version.tar.gz
Patch1: cmake-path-suffix.diff Patch1: prboom-hbar-all.diff
Patch2: prboom-hbar-all.diff Patch2: prboom-hbar-gradient.diff
Patch3: prboom-hbar-gradient.diff
BuildRequires: Mesa-devel BuildRequires: Mesa-devel
BuildRequires: c++_compiler BuildRequires: c++_compiler
BuildRequires: cmake BuildRequires: cmake

85
prboom-hbar-all.diff
View File

@ -19,11 +19,11 @@ remaining life.
prboom2/src/m_misc.c | 1 + prboom2/src/m_misc.c | 1 +
8 files changed, 24 insertions(+), 3 deletions(-) 8 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/prboom2/src/dsda/configuration.c b/prboom2/src/dsda/configuration.c Index: dsda-doom-0.28.0/prboom2/src/dsda/configuration.c
index e0fe40ecf..b1197ee17 100644 ===================================================================
--- a/prboom2/src/dsda/configuration.c --- dsda-doom-0.28.0.orig/prboom2/src/dsda/configuration.c
+++ b/prboom2/src/dsda/configuration.c +++ dsda-doom-0.28.0/prboom2/src/dsda/configuration.c
@@ -597,6 +597,10 @@ dsda_config_t dsda_config[dsda_config_count] = { @@ -604,6 +604,10 @@ dsda_config_t dsda_config[dsda_config_co
"gl_health_bar", dsda_config_gl_health_bar, "gl_health_bar", dsda_config_gl_health_bar,
CONF_BOOL(0), NULL, STRICT_INT(0) CONF_BOOL(0), NULL, STRICT_INT(0)
}, },
@ -34,11 +34,11 @@ index e0fe40ecf..b1197ee17 100644
[dsda_config_gl_usevbo] = { [dsda_config_gl_usevbo] = {
"gl_usevbo", dsda_config_gl_usevbo, "gl_usevbo", dsda_config_gl_usevbo,
CONF_BOOL(1), NULL, NOT_STRICT CONF_BOOL(1), NULL, NOT_STRICT
diff --git a/prboom2/src/dsda/configuration.h b/prboom2/src/dsda/configuration.h Index: dsda-doom-0.28.0/prboom2/src/dsda/configuration.h
index 4bf8531b4..f32f4c6b2 100644 ===================================================================
--- a/prboom2/src/dsda/configuration.h --- dsda-doom-0.28.0.orig/prboom2/src/dsda/configuration.h
+++ b/prboom2/src/dsda/configuration.h +++ dsda-doom-0.28.0/prboom2/src/dsda/configuration.h
@@ -119,6 +119,7 @@ typedef enum { @@ -121,6 +121,7 @@ typedef enum {
dsda_config_gl_render_multisampling, dsda_config_gl_render_multisampling,
dsda_config_gl_render_fov, dsda_config_gl_render_fov,
dsda_config_gl_health_bar, dsda_config_gl_health_bar,
@ -46,11 +46,11 @@ index 4bf8531b4..f32f4c6b2 100644
dsda_config_gl_usevbo, dsda_config_gl_usevbo,
dsda_config_gl_fade_mode, dsda_config_gl_fade_mode,
dsda_config_use_mouse, dsda_config_use_mouse,
diff --git a/prboom2/src/dsda/settings.c b/prboom2/src/dsda/settings.c Index: dsda-doom-0.28.0/prboom2/src/dsda/settings.c
index c417705bd..6019ed07d 100644 ===================================================================
--- a/prboom2/src/dsda/settings.c --- dsda-doom-0.28.0.orig/prboom2/src/dsda/settings.c
+++ b/prboom2/src/dsda/settings.c +++ dsda-doom-0.28.0/prboom2/src/dsda/settings.c
@@ -248,6 +248,11 @@ dboolean dsda_ShowHealthBars(void) { @@ -251,6 +251,11 @@ dboolean dsda_ShowHealthBars(void) {
return dsda_IntConfig(dsda_config_gl_health_bar); return dsda_IntConfig(dsda_config_gl_health_bar);
} }
@ -62,10 +62,10 @@ index c417705bd..6019ed07d 100644
dboolean dsda_WipeAtFullSpeed(void) { dboolean dsda_WipeAtFullSpeed(void) {
return dsda_IntConfig(dsda_config_wipe_at_full_speed); return dsda_IntConfig(dsda_config_wipe_at_full_speed);
} }
diff --git a/prboom2/src/dsda/settings.h b/prboom2/src/dsda/settings.h Index: dsda-doom-0.28.0/prboom2/src/dsda/settings.h
index a2fc9bf95..1988c5140 100644 ===================================================================
--- a/prboom2/src/dsda/settings.h --- dsda-doom-0.28.0.orig/prboom2/src/dsda/settings.h
+++ b/prboom2/src/dsda/settings.h +++ dsda-doom-0.28.0/prboom2/src/dsda/settings.h
@@ -50,6 +50,7 @@ dboolean dsda_ShowMinimap(void); @@ -50,6 +50,7 @@ dboolean dsda_ShowMinimap(void);
dboolean dsda_ShowLevelSplits(void); dboolean dsda_ShowLevelSplits(void);
dboolean dsda_ShowDemoAttempts(void); dboolean dsda_ShowDemoAttempts(void);
@ -74,11 +74,11 @@ index a2fc9bf95..1988c5140 100644
dboolean dsda_MapCoordinates(void); dboolean dsda_MapCoordinates(void);
dboolean dsda_MapTotals(void); dboolean dsda_MapTotals(void);
dboolean dsda_MapTime(void); dboolean dsda_MapTime(void);
diff --git a/prboom2/src/gl_intern.h b/prboom2/src/gl_intern.h Index: dsda-doom-0.28.0/prboom2/src/gl_intern.h
index 0040edd1d..f55c66049 100644 ===================================================================
--- a/prboom2/src/gl_intern.h --- dsda-doom-0.28.0.orig/prboom2/src/gl_intern.h
+++ b/prboom2/src/gl_intern.h +++ dsda-doom-0.28.0/prboom2/src/gl_intern.h
@@ -218,6 +218,7 @@ typedef enum @@ -216,6 +216,7 @@ typedef enum
health_bar_null, health_bar_null,
health_bar_red, health_bar_red,
health_bar_yellow, health_bar_yellow,
@ -86,11 +86,11 @@ index 0040edd1d..f55c66049 100644
} health_bar_color_t; } health_bar_color_t;
typedef struct typedef struct
diff --git a/prboom2/src/gl_main.c b/prboom2/src/gl_main.c Index: dsda-doom-0.28.0/prboom2/src/gl_main.c
index e2458fd9f..92e5a7b38 100644 ===================================================================
--- a/prboom2/src/gl_main.c --- dsda-doom-0.28.0.orig/prboom2/src/gl_main.c
+++ b/prboom2/src/gl_main.c +++ dsda-doom-0.28.0/prboom2/src/gl_main.c
@@ -2033,12 +2033,18 @@ static void gld_DrawSprite(GLSprite *sprite) @@ -2031,12 +2031,18 @@ static void gld_DrawSprite(GLSprite *spr
static void gld_AddHealthBar(mobj_t* thing, GLSprite *sprite) static void gld_AddHealthBar(mobj_t* thing, GLSprite *sprite)
{ {
@ -111,7 +111,7 @@ index e2458fd9f..92e5a7b38 100644
if (health_percent <= 50) if (health_percent <= 50)
hbar.color = health_bar_red; hbar.color = health_bar_red;
else if (health_percent <= 99) else if (health_percent <= 99)
@@ -2065,10 +2071,11 @@ static void gld_AddHealthBar(mobj_t* thing, GLSprite *sprite) @@ -2063,10 +2069,11 @@ static void gld_AddHealthBar(mobj_t* thi
} }
} }
@ -124,23 +124,23 @@ index e2458fd9f..92e5a7b38 100644
}; };
static void gld_DrawHealthBars(void) static void gld_DrawHealthBars(void)
diff --git a/prboom2/src/m_menu.c b/prboom2/src/m_menu.c Index: dsda-doom-0.28.0/prboom2/src/m_menu.c
index fc3d22c82..7bc30508b 100644 ===================================================================
--- a/prboom2/src/m_menu.c --- dsda-doom-0.28.0.orig/prboom2/src/m_menu.c
+++ b/prboom2/src/m_menu.c +++ dsda-doom-0.28.0/prboom2/src/m_menu.c
@@ -3052,6 +3052,7 @@ setup_menu_t demo_settings[] = { @@ -3155,6 +3155,7 @@ setup_menu_t demo_settings[] = {
{ "Casual Play Settings", S_SKIP | S_TITLE, m_null, G_X}, { "Coop Spawns", S_YESNO, m_conf, G_X, dsda_config_coop_spawns },
{ "Allow Jumping", S_YESNO, m_conf, G_X, dsda_config_allow_jumping }, { "Allow Jumping", S_YESNO, m_conf, G_X, dsda_config_allow_jumping },
{ "OpenGL Show Health Bars", S_YESNO, m_conf, G_X, dsda_config_gl_health_bar }, { "OpenGL Show Health Bars", S_YESNO, m_conf, G_X, dsda_config_gl_health_bar },
+ { "All Shootables have Health Bar", S_YESNO, m_conf, G_X, dsda_config_gl_health_bar_shootables }, + { "All Shootables have Health Bar", S_YESNO, m_conf, G_X, dsda_config_gl_health_bar_shootables },
PREV_PAGE(mapping_settings), PREV_PAGE(mapping_settings),
NEXT_PAGE(tas_settings), NEXT_PAGE(tas_settings),
diff --git a/prboom2/src/m_misc.c b/prboom2/src/m_misc.c Index: dsda-doom-0.28.0/prboom2/src/m_misc.c
index 62b7160a1..b7cc44a72 100644 ===================================================================
--- a/prboom2/src/m_misc.c --- dsda-doom-0.28.0.orig/prboom2/src/m_misc.c
+++ b/prboom2/src/m_misc.c +++ dsda-doom-0.28.0/prboom2/src/m_misc.c
@@ -169,6 +169,7 @@ cfg_def_t cfg_defs[] = @@ -171,6 +171,7 @@ cfg_def_t cfg_defs[] =
MIGRATED_SETTING(dsda_config_gl_render_fov), MIGRATED_SETTING(dsda_config_gl_render_fov),
MIGRATED_SETTING(dsda_config_gl_skymode), MIGRATED_SETTING(dsda_config_gl_skymode),
MIGRATED_SETTING(dsda_config_gl_health_bar), MIGRATED_SETTING(dsda_config_gl_health_bar),
@ -148,6 +148,3 @@ index 62b7160a1..b7cc44a72 100644
MIGRATED_SETTING(dsda_config_gl_usevbo), MIGRATED_SETTING(dsda_config_gl_usevbo),
MIGRATED_SETTING(dsda_config_gl_fade_mode), MIGRATED_SETTING(dsda_config_gl_fade_mode),
--
2.42.1

27
prboom-hbar-gradient.diff
View File

@ -9,11 +9,11 @@ I drew inspiration from the gradient bars from Fire Fight.
prboom2/src/gl_main.c | 52 ++++++++++++++++++++++++----------------- prboom2/src/gl_main.c | 52 ++++++++++++++++++++++++-----------------
2 files changed, 31 insertions(+), 32 deletions(-) 2 files changed, 31 insertions(+), 32 deletions(-)
diff --git a/prboom2/src/gl_intern.h b/prboom2/src/gl_intern.h Index: dsda-doom-0.28.0/prboom2/src/gl_intern.h
index f55c66049..b5a0d7f83 100644 ===================================================================
--- a/prboom2/src/gl_intern.h --- dsda-doom-0.28.0.orig/prboom2/src/gl_intern.h
+++ b/prboom2/src/gl_intern.h +++ dsda-doom-0.28.0/prboom2/src/gl_intern.h
@@ -213,18 +213,9 @@ typedef struct @@ -211,18 +211,9 @@ typedef struct
float light; float light;
} GLShadow; } GLShadow;
@ -33,11 +33,11 @@ index f55c66049..b5a0d7f83 100644
float x1, x2, x3; float x1, x2, x3;
float z1, z2, z3; float z1, z2, z3;
float y; float y;
diff --git a/prboom2/src/gl_main.c b/prboom2/src/gl_main.c Index: dsda-doom-0.28.0/prboom2/src/gl_main.c
index 92e5a7b38..b5f023c60 100644 ===================================================================
--- a/prboom2/src/gl_main.c --- dsda-doom-0.28.0.orig/prboom2/src/gl_main.c
+++ b/prboom2/src/gl_main.c +++ dsda-doom-0.28.0/prboom2/src/gl_main.c
@@ -2034,24 +2034,41 @@ static void gld_DrawSprite(GLSprite *sprite) @@ -2032,24 +2032,41 @@ static void gld_DrawSprite(GLSprite *spr
static void gld_AddHealthBar(mobj_t* thing, GLSprite *sprite) static void gld_AddHealthBar(mobj_t* thing, GLSprite *sprite)
{ {
bool all_shoot = dsda_ShowHealthBarsForShootables(); bool all_shoot = dsda_ShowHealthBarsForShootables();
@ -87,7 +87,7 @@ index 92e5a7b38..b5f023c60 100644
float sx2 = (float)thing->radius / 2.0f / MAP_SCALE; float sx2 = (float)thing->radius / 2.0f / MAP_SCALE;
float sx1 = sx2 - (float)health_percent * (float)thing->radius / 100.0f / MAP_SCALE; float sx1 = sx2 - (float)health_percent * (float)thing->radius / 100.0f / MAP_SCALE;
float sx3 = -sx2; float sx3 = -sx2;
@@ -2071,17 +2088,10 @@ static void gld_AddHealthBar(mobj_t* thing, GLSprite *sprite) @@ -2069,17 +2086,10 @@ static void gld_AddHealthBar(mobj_t* thi
} }
} }
@ -106,7 +106,7 @@ index 92e5a7b38..b5f023c60 100644
count = gld_drawinfo.num_items[GLDIT_HBAR]; count = gld_drawinfo.num_items[GLDIT_HBAR];
if (count > 0) if (count > 0)
@@ -2092,12 +2102,10 @@ static void gld_DrawHealthBars(void) @@ -2090,12 +2100,10 @@ static void gld_DrawHealthBars(void)
for (i = count - 1; i >= 0; i--) for (i = count - 1; i >= 0; i--)
{ {
GLHealthBar *hbar = gld_drawinfo.items[GLDIT_HBAR][i].item.hbar; GLHealthBar *hbar = gld_drawinfo.items[GLDIT_HBAR][i].item.hbar;
@ -123,6 +123,3 @@ index 92e5a7b38..b5f023c60 100644
} }
glVertex3f(hbar->x1, hbar->y, hbar->z1); glVertex3f(hbar->x1, hbar->y, hbar->z1);
--
2.42.1

3
v0.27.5.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5e01be417033e1abf708bb22509d4d910b158a159a2790c4d5b46690daba67f0
size 11111842

BIN
v0.28.0.tar.gz (Stored with Git LFS) Normal file
View File

Binary file not shown.