thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

battleufotest: HUD tracking for Battle UFO spawners, show ID number

Browse source
This commit is contained in:
James R 2024-01-15 18:24:17 -08:00
parent c3748ff91a
commit bea26879ea
4 changed files with 24 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/k_hud_track.cpp
View file

@ -4,6 +4,7 @@
#include <vector> #include <vector>
#include "core/static_vec.hpp" #include "core/static_vec.hpp"
#include "v_draw.hpp"
#include "k_battle.h" #include "k_battle.h"
#include "k_hud.h" #include "k_hud.h"
@ -26,7 +27,7 @@
using namespace srb2; using namespace srb2;
extern "C" consvar_t cv_debughudtracker; extern "C" consvar_t cv_debughudtracker, cv_battleufotest;
namespace namespace
{ {
@ -190,6 +191,9 @@ private:
}}, }},
}; };
case MT_BATTLEUFO_SPAWNER:
return {};
default: default:
return { return {
{ // Near { // Near
@ -291,6 +295,9 @@ bool is_object_tracking_target(const mobj_t* mobj)
return !(mobj->renderflags & (RF_TRANSMASK | RF_DONTDRAW)) && // the spraycan wasn't collected yet return !(mobj->renderflags & (RF_TRANSMASK | RF_DONTDRAW)) && // the spraycan wasn't collected yet
P_CheckSight(stplyr->mo, const_cast<mobj_t*>(mobj)); P_CheckSight(stplyr->mo, const_cast<mobj_t*>(mobj));
case MT_BATTLEUFO_SPAWNER:
return cv_battleufotest.value;
default: default:
return false; return false;
} }
@ -512,6 +519,15 @@ void K_DrawTargetTracking(const TargetTracking& target)
colormap colormap
); );
}; };
if (target.mobj->type == MT_BATTLEUFO_SPAWNER) // debug
{
using srb2::Draw;
Draw(FixedToFloat(result.x), FixedToFloat(result.y))
.font(Draw::Font::kThin)
.align(Draw::Align::kCenter)
.text("BUFO ID: {}", Obj_BattleUFOSpawnerID(target.mobj));
}
} }
} }

1
src/k_objects.h
View file

@ -188,6 +188,7 @@ void Obj_UnlinkBattleUFOSpawner(mobj_t *spawner);
void Obj_SpawnBattleUFOFromSpawner(void); void Obj_SpawnBattleUFOFromSpawner(void);
INT32 Obj_RandomBattleUFOSpawnerID(void); INT32 Obj_RandomBattleUFOSpawnerID(void);
void Obj_BattleUFOBeamThink(mobj_t *beam); void Obj_BattleUFOBeamThink(mobj_t *beam);
INT32 Obj_BattleUFOSpawnerID(const mobj_t *spawner);
/* Power-Up Aura */ /* Power-Up Aura */
void Obj_SpawnPowerUpAura(player_t* player); void Obj_SpawnPowerUpAura(player_t* player);

5
src/objects/battle-ufo.cpp
View file

@ -251,3 +251,8 @@ void Obj_BattleUFOBeamThink(mobj_t *beam)
{ {
P_SetObjectMomZ(beam, beam->info->speed, true); P_SetObjectMomZ(beam, beam->info->speed, true);
} }
INT32 Obj_BattleUFOSpawnerID(const mobj_t *spawner)
{
return static_cast<const Spawner*>(spawner)->id();
}

1
src/p_mobj.c
View file

@ -5428,6 +5428,7 @@ static boolean P_IsTrackerType(INT32 type)
case MT_OVERTIME_CENTER: case MT_OVERTIME_CENTER:
case MT_MONITOR: case MT_MONITOR:
case MT_EMERALD: case MT_EMERALD:
case MT_BATTLEUFO_SPAWNER: // debug
case MT_BATTLEUFO: case MT_BATTLEUFO:
case MT_SUPER_FLICKY: case MT_SUPER_FLICKY:
case MT_SPRAYCAN: case MT_SPRAYCAN: