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

Have just one NiGHTS bonus option: NIGHTS and LINK together

Browse source
This commit is contained in:
mazmazz 2018-08-12 20:25:35 -04:00
parent feadcbfc94
commit 89f57cb111
2 changed files with 2 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/dehacked.c
View file

@ -1197,10 +1197,8 @@ static void readlevelheader(MYFILE *f, INT32 num)
else if (fastcmp(word2, "BOSS")) i = 1;
else if (fastcmp(word2, "ERZ3")) i = 2;
else if (fastcmp(word2, "NIGHTS")) i = 3;
else if (fastcmp(word2, "NIGHTSLINK")) i = 4;
else if (fastcmp(word2, "NIGHTSALL")) i = 5;
if (i >= -1 && i <= 5) // -1 for no bonus. Max is 2.
if (i >= -1 && i <= 3) // -1 for no bonus. Max is 3.
mapheaderinfo[num-1]->bonustype = (SINT8)i;
else
deh_warning("Level header %d: invalid bonus type number %d", num, i);

14
src/y_inter.c
View file

@ -1825,7 +1825,7 @@ static void Y_SetPerfectBonus(player_t *player, y_bonus_t *bstruct)
// This list can be extended in the future with SOC/Lua, perhaps.
typedef void (*bonus_f)(player_t *, y_bonus_t *);
bonus_f bonuses_list[7][4] = {
bonus_f bonuses_list[5][4] = {
{
Y_SetNullBonus,
Y_SetNullBonus,
@ -1850,18 +1850,6 @@ bonus_f bonuses_list[7][4] = {
Y_SetRingBonus,
Y_SetPerfectBonus,
},
{
Y_SetNullBonus,
Y_SetNullBonus,
Y_SetNightsBonus,
Y_SetNullBonus,
},
{
Y_SetNullBonus,
Y_SetNullBonus,
Y_SetLinkBonus,
Y_SetNullBonus,
},
{
Y_SetNullBonus,
Y_SetNightsBonus,