From 84fd5d58d7a444a9a0d85d5e896bd75b8faa3187 Mon Sep 17 00:00:00 2001 From: James R Date: Tue, 9 Jan 2024 22:38:33 -0800 Subject: [PATCH] Add battleufotest debug cheat, respawn Battle UFO instantly --- src/cvars.cpp | 1 + src/objects/battle-ufo.cpp | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/cvars.cpp b/src/cvars.cpp index 65b1f1291..6886662f4 100644 --- a/src/cvars.cpp +++ b/src/cvars.cpp @@ -791,6 +791,7 @@ consvar_t cv_votetime = UnsavedNetVar("votetime", "20").min_max(10, 3600); consvar_t cv_barriertime = OnlineCheat("barriertime", "30").values(CV_Natural).description("How long it takes for the Barrier to shrink in Battle Overtime"); consvar_t cv_battlespawn = OnlineCheat("battlespawn", "0").values(CV_Unsigned).description("Spawn every player at the same spawnpoint in Battle (0 = random spawns)"); consvar_t cv_battletest = OnlineCheat("battletest", "Off").on_off().description("Free Play goes to Battle instead of Prisons"); +consvar_t cv_battleufotest = OnlineCheat("battleufotest", "Off").on_off().description("Respawn Battle UFOs instantly after being destroyed"); #ifdef DEVELOP consvar_t cv_botcontrol = OnlineCheat("botcontrol", "On").on_off().description("Toggle bot AI movement"); diff --git a/src/objects/battle-ufo.cpp b/src/objects/battle-ufo.cpp index 3dc932550..a99617bab 100644 --- a/src/objects/battle-ufo.cpp +++ b/src/objects/battle-ufo.cpp @@ -6,6 +6,7 @@ #include "../mobj.hpp" #include "../mobj_list.hpp" +#include "../command.h" #include "../doomdef.h" #include "../m_random.h" #include "../p_local.h" @@ -17,6 +18,8 @@ using srb2::math::Fixed; using srb2::Mobj; using srb2::MobjList; +extern consvar_t cv_battleufotest; + extern mobj_t* svg_battleUfoSpawners; #define BATTLEUFO_LEG_ZOFFS (3*FRACUNIT) // Spawn height offset from the body @@ -169,7 +172,7 @@ void Obj_BattleUFODeath(mobj_t *mobj, mobj_t *inflictor) if (ufo->spawner()) { g_battleufo.previousId = ufo->spawner()->id(); - g_battleufo.due = leveltime + BATTLE_UFO_TIME; + g_battleufo.due = leveltime + (cv_battleufotest.value ? 1 : BATTLE_UFO_TIME); } }