forked from pool/crispy-doom
69 lines
2.2 KiB
Diff
69 lines
2.2 KiB
Diff
From a45ae121549f6e589eddc64d3a038b19d5b20de1 Mon Sep 17 00:00:00 2001
|
|
From: Fabian Greffrath <fabian@greffrath.com>
|
|
Date: Tue, 29 Apr 2025 08:19:06 +0200
|
|
Subject: [PATCH] fix gcc-15 (i.e. -std=gnu23) build
|
|
|
|
---
|
|
src/doom/f_finale.c | 8 ++++----
|
|
src/doom/p_bexptr.c | 4 ++--
|
|
2 files changed, 6 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/src/doom/f_finale.c b/src/doom/f_finale.c
|
|
index f1fe24e1..2568836e 100644
|
|
--- a/src/doom/f_finale.c
|
|
+++ b/src/doom/f_finale.c
|
|
@@ -113,7 +113,7 @@ void F_CastTicker (void);
|
|
boolean F_CastResponder (event_t *ev);
|
|
void F_CastDrawer (void);
|
|
|
|
-extern void A_RandomJump();
|
|
+extern void A_RandomJump(void *, void *, void *);
|
|
|
|
//
|
|
// F_StartFinale
|
|
@@ -562,7 +562,7 @@ void F_CastTicker (void)
|
|
goto stopattack; // Oh, gross hack!
|
|
*/
|
|
// [crispy] Allow A_RandomJump() in deaths in cast sequence
|
|
- if (caststate->action.acp1 == A_RandomJump && Crispy_Random() < caststate->misc2)
|
|
+ if (caststate->action.acp3 == A_RandomJump && Crispy_Random() < caststate->misc2)
|
|
{
|
|
st = caststate->misc1;
|
|
}
|
|
@@ -655,7 +655,7 @@ void F_CastTicker (void)
|
|
if (casttics == -1)
|
|
{
|
|
// [crispy] Allow A_RandomJump() in deaths in cast sequence
|
|
- if (caststate->action.acp1 == A_RandomJump)
|
|
+ if (caststate->action.acp3 == A_RandomJump)
|
|
{
|
|
if (Crispy_Random() < caststate->misc2)
|
|
{
|
|
@@ -730,7 +730,7 @@ boolean F_CastResponder (event_t* ev)
|
|
caststate = &states[mobjinfo[castorder[castnum].type].deathstate];
|
|
casttics = caststate->tics;
|
|
// [crispy] Allow A_RandomJump() in deaths in cast sequence
|
|
- if (casttics == -1 && caststate->action.acp1 == A_RandomJump)
|
|
+ if (casttics == -1 && caststate->action.acp3 == A_RandomJump)
|
|
{
|
|
if (Crispy_Random() < caststate->misc2)
|
|
{
|
|
diff --git a/src/doom/p_bexptr.c b/src/doom/p_bexptr.c
|
|
index 0212a4f1..d4256ded 100644
|
|
--- a/src/doom/p_bexptr.c
|
|
+++ b/src/doom/p_bexptr.c
|
|
@@ -22,8 +22,8 @@
|
|
#include "m_random.h"
|
|
#include "s_sound.h"
|
|
|
|
-extern void A_Explode();
|
|
-extern void A_FaceTarget();
|
|
+extern void A_Explode(mobj_t* thingy);
|
|
+extern void A_FaceTarget(mobj_t* actor);
|
|
|
|
extern boolean P_CheckMeleeRange (mobj_t *actor);
|
|
extern void P_Thrust (player_t* player, angle_t angle, fixed_t move);
|
|
--
|
|
2.49.0
|
|
|