From 3c1e13084b11ab8e101eb684b32e8f9d30fbd126 Mon Sep 17 00:00:00 2001 From: James R Date: Sat, 30 Mar 2024 22:33:43 -0700 Subject: [PATCH] Add Obj_SpawnCustomBrolyKi --- src/k_objects.h | 1 + src/objects/broly.cpp | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/k_objects.h b/src/k_objects.h index abc5913cf..4182dfcfe 100644 --- a/src/k_objects.h +++ b/src/k_objects.h @@ -83,6 +83,7 @@ void Obj_DuelBombInit(mobj_t *bomb); /* Broly Ki */ mobj_t *Obj_SpawnBrolyKi(mobj_t *source, tic_t duration); +mobj_t *Obj_SpawnCustomBrolyKi(mobj_t *source, tic_t duration, fixed_t start, fixed_t end); boolean Obj_BrolyKiThink(mobj_t *ki); /* Special Stage UFO */ diff --git a/src/objects/broly.cpp b/src/objects/broly.cpp index a7c589d6c..7b6b584fc 100644 --- a/src/objects/broly.cpp +++ b/src/objects/broly.cpp @@ -16,11 +16,13 @@ using namespace srb2::objects; mobj_t * -Obj_SpawnBrolyKi +Obj_SpawnCustomBrolyKi ( mobj_t * source, - tic_t duration) + tic_t duration, + fixed_t start, + fixed_t end) { - Broly* x = Broly::spawn(static_cast(source), duration, {64 * mapobjectscale, 0}); + Broly* x = Broly::spawn(static_cast(source), duration, {start, end}); if (!x) { @@ -36,6 +38,14 @@ Obj_SpawnBrolyKi return x; } +mobj_t * +Obj_SpawnBrolyKi +( mobj_t * source, + tic_t duration) +{ + return Obj_SpawnCustomBrolyKi(source, duration, 64 * mapobjectscale, 0); +} + boolean Obj_BrolyKiThink (mobj_t *x) {