lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Reconcile spheres at end of destruct if you somehow gained or lost an unexpected # after timing calculations

Browse source
This commit is contained in:
mazmazz 2018-08-15 14:40:25 -04:00
parent 45612f9add
commit c3cb08d712
1 changed files with 25 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/p_user.c
View file

@ -5925,7 +5925,7 @@ static void P_NightsTransferPoints(player_t *player, fixed_t xspeed, fixed_t rad
// //
static void P_DoNiGHTSCapsule(player_t *player) static void P_DoNiGHTSCapsule(player_t *player)
{ {
INT32 i, spherecount, totalduration, popduration, deductinterval, deductquantity, sphereresult, firstpoptic; INT32 i, spherecount, totalduration, popduration, deductinterval, deductquantity, sphereresult, firstpoptic, startingspheres;
INT32 tictimer = ++player->capsule->extravalue2; INT32 tictimer = ++player->capsule->extravalue2;
if (abs(player->mo->x-player->capsule->x) <= 3*FRACUNIT) if (abs(player->mo->x-player->capsule->x) <= 3*FRACUNIT)
@ -6021,11 +6021,17 @@ static void P_DoNiGHTSCapsule(player_t *player)
if (tictimer - firstpoptic < popduration) if (tictimer - firstpoptic < popduration)
{ {
if (!((tictimer - firstpoptic) % deductinterval) if (!((tictimer - firstpoptic) % deductinterval))
&& player->capsule->health > sphereresult)
{ {
player->spheres -= deductquantity; // Did you somehow get more spheres during destruct?
player->capsule->health -= deductquantity; if (player->capsule->health <= sphereresult && player->spheres > 0 && player->capsule->health > 0)
sphereresult = max(sphereresult - player->spheres, 0);
if (player->capsule->health > sphereresult && player->spheres > 0)
{
player->spheres -= deductquantity;
player->capsule->health -= deductquantity;
}
if (player->spheres < 0) if (player->spheres < 0)
player->spheres = 0; player->spheres = 0;
@ -6043,12 +6049,20 @@ static void P_DoNiGHTSCapsule(player_t *player)
} }
else else
{ {
if (player->capsule->health > sphereresult) if (player->spheres != 0 && player->capsule->health > 0)
player->capsule->health = sphereresult; {
if (player->spheres < player->capsule->health)
// did player somehow get more spheres? deduct that too {
if (player->spheres > 0) player->capsule->health -= player->spheres;
player->capsule->health -= player->spheres; player->spheres = 0;
}
else
{
startingspheres = player->spheres - player->capsule->health;
player->capsule->health = 0;
player->spheres = startingspheres;
}
}
if (player->capsule->health <= 0) if (player->capsule->health <= 0)
{ {