Award Player Rings uses args for overload

This commit is contained in:
Sally Coolatta 2022-10-10 07:02:45 -04:00
parent a8ac5a9922
commit 032ffafd39
2 changed files with 3 additions and 3 deletions

View file

@ -5356,6 +5356,7 @@ static void P_ConvertBinaryLinedefTypes(void)
case 460: //Award rings
lines[i].args[0] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS;
lines[i].args[1] = sides[lines[i].sidenum[0]].rowoffset >> FRACBITS;
lines[i].args[2] = !!(lines[i].flags & ML_NOCLIMB);
break;
case 461: //Spawn object
lines[i].args[0] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS;

View file

@ -3475,9 +3475,8 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
if (delay <= 0 || !(leveltime % delay))
{
// No Climb: don't cap rings to 20
K_AwardPlayerRings(mo->player, rings,
(line->flags & ML_NOCLIMB) == ML_NOCLIMB);
// args[2]: don't cap rings to 20
K_AwardPlayerRings(mo->player, rings, line->args[2]);
}
}
}