mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2025-10-30 08:01:28 +00:00
Correct Ring Shooter countdown
This commit is contained in:
parent
a458490639
commit
f9317b265e
1 changed files with 3 additions and 6 deletions
|
|
@ -1878,7 +1878,7 @@ void P_XYMovement(mobj_t *mo)
|
||||||
FIXED_TO_FLOAT(AngleFixed(oldangle-newangle))
|
FIXED_TO_FLOAT(AngleFixed(oldangle-newangle))
|
||||||
);
|
);
|
||||||
*/
|
*/
|
||||||
|
|
||||||
}
|
}
|
||||||
else if (predictedz - mo->z > abs(slopemom.z / 2))
|
else if (predictedz - mo->z > abs(slopemom.z / 2))
|
||||||
{
|
{
|
||||||
|
|
@ -4657,11 +4657,8 @@ static void P_RingShooterCountdown(mobj_t *mo)
|
||||||
if (mo->reactiontime == -1)
|
if (mo->reactiontime == -1)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (mo->reactiontime > 0)
|
if (--mo->reactiontime > 0)
|
||||||
{
|
|
||||||
mo->reactiontime--;
|
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
|
|
||||||
while (!P_MobjWasRemoved(part->tracer))
|
while (!P_MobjWasRemoved(part->tracer))
|
||||||
{
|
{
|
||||||
|
|
@ -10563,7 +10560,7 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
|
||||||
|
|
||||||
if (type == MT_NULL)
|
if (type == MT_NULL)
|
||||||
{
|
{
|
||||||
#if 0
|
#if 0
|
||||||
#ifdef PARANOIA
|
#ifdef PARANOIA
|
||||||
I_Error("Tried to spawn MT_NULL\n");
|
I_Error("Tried to spawn MT_NULL\n");
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue