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

Merge branch 'ufo-health-fix' into 'master'

Browse source 
Sealed Stars: fix UFODebugSetHealth always running

Closes #686

See merge request KartKrew/Kart!1501
This commit is contained in:
toaster 2023-09-16 19:32:21 +00:00
commit 8eb5115b8e
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/cvars.cpp
View file

@ -803,7 +803,7 @@ consvar_t cv_restrictskinchange = OnlineCheat("restrictskinchange", "Yes").yes_n
consvar_t cv_spbtest = OnlineCheat("spbtest", "Off").on_off().description("SPB can never target a player");
consvar_t cv_timescale = OnlineCheat(cvlist_timer)("timescale", "1.0").floating_point().min_max(FRACUNIT/20, 20*FRACUNIT).description("Overclock or slow down the game");
consvar_t cv_ufo_follow = OnlineCheat("ufo_follow", "0").min_max(0, MAXPLAYERS).description("Make UFO Catcher folow this player");
consvar_t cv_ufo_health = OnlineCheat("ufo_health", "100").min_max(0, 100).description("Override UFO Catcher health -- applied at spawn or when value is changed");
consvar_t cv_ufo_health = OnlineCheat("ufo_health", "-1").min_max(-1, 100).description("Override UFO Catcher health -- applied at spawn or when value is changed");
//

9
src/objects/ufo.c
View file

@ -295,7 +295,7 @@ static void UFOUpdateSpeed(mobj_t *ufo)
SpawnEmeraldSpeedLines(ufo);
}
else if (ufo_speed(ufo) > 70*FRACUNIT && !S_SoundPlaying(ufo, sfx_clawzm))
{
{
S_StartSound(ufo, sfx_clawzm);
}
}
@ -580,7 +580,10 @@ void Obj_SpecialUFOThinker(mobj_t *ufo)
{
{
extern consvar_t cv_ufo_health;
UFODebugSetHealth(ufo, cv_ufo_health.value);
if (cv_ufo_health.value != -1)
{
UFODebugSetHealth(ufo, cv_ufo_health.value);
}
}
UFOMove(ufo);
@ -700,7 +703,7 @@ static void UFOCopyHitlagToPieces(mobj_t *ufo)
{
spawn_debris (piece);
}
piece = ufo_piece_next(piece);
}
}