capsule->extravalue2 tic timer
This commit is contained in:
parent
f19b7bfacf
commit
9faace9e5d
|
@ -8751,7 +8751,8 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
|
||||||
nummaprings = -1; // no perfect bonus, rings are free
|
nummaprings = -1; // no perfect bonus, rings are free
|
||||||
break;
|
break;
|
||||||
case MT_EGGCAPSULE:
|
case MT_EGGCAPSULE:
|
||||||
mobj->extravalue1 = -1; // timer for how long a player has been at the capsule
|
mobj->extravalue1 = -1; // sphere timer for how long a player has been at the capsule
|
||||||
|
mobj->extravalue2 = -1; // tic timer for how long a player has been at the capsule
|
||||||
break;
|
break;
|
||||||
case MT_REDTEAMRING:
|
case MT_REDTEAMRING:
|
||||||
mobj->color = skincolor_redteam;
|
mobj->color = skincolor_redteam;
|
||||||
|
|
|
@ -5927,6 +5927,8 @@ static void P_DoNiGHTSCapsule(player_t *player)
|
||||||
{
|
{
|
||||||
INT32 i;
|
INT32 i;
|
||||||
|
|
||||||
|
player->capsule->extravalue2++;
|
||||||
|
|
||||||
if (abs(player->mo->x-player->capsule->x) <= 2*FRACUNIT)
|
if (abs(player->mo->x-player->capsule->x) <= 2*FRACUNIT)
|
||||||
{
|
{
|
||||||
P_UnsetThingPosition(player->mo);
|
P_UnsetThingPosition(player->mo);
|
||||||
|
@ -6011,7 +6013,7 @@ static void P_DoNiGHTSCapsule(player_t *player)
|
||||||
player->capsule->flags &= ~MF_NOGRAVITY;
|
player->capsule->flags &= ~MF_NOGRAVITY;
|
||||||
player->capsule->momz = 5*FRACUNIT;
|
player->capsule->momz = 5*FRACUNIT;
|
||||||
player->capsule->reactiontime = 0;
|
player->capsule->reactiontime = 0;
|
||||||
player->capsule->extravalue1 = -1;
|
player->capsule->extravalue1 = player->capsule->extravalue2 = -1;
|
||||||
|
|
||||||
for (i = 0; i < MAXPLAYERS; i++)
|
for (i = 0; i < MAXPLAYERS; i++)
|
||||||
if (playeringame[i] && !player->exiting && players[i].mare == player->mare)
|
if (playeringame[i] && !player->exiting && players[i].mare == player->mare)
|
||||||
|
@ -6088,7 +6090,7 @@ static void P_DoNiGHTSCapsule(player_t *player)
|
||||||
player->texttimer = 4*TICRATE;
|
player->texttimer = 4*TICRATE;
|
||||||
player->textvar = 3; // Get more rings!
|
player->textvar = 3; // Get more rings!
|
||||||
player->capsule->reactiontime = 0;
|
player->capsule->reactiontime = 0;
|
||||||
player->capsule->extravalue1 = -1;
|
player->capsule->extravalue1 = player->capsule->extravalue2 = -1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in a new issue