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

build errors

This commit is contained in:
mazmazz 2018-11-20 20:23:48 -05:00
parent b2c3a39a2f
commit 0af071dbca
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/p_map.c
View File

@ -134,7 +134,7 @@ boolean P_DoSpring(mobj_t *spring, mobj_t *object)
{ {
fixed_t vertispeed = spring->info->mass; fixed_t vertispeed = spring->info->mass;
fixed_t horizspeed = spring->info->damage; fixed_t horizspeed = spring->info->damage;
boolean final; boolean final = false;
// Object was already sprung this tic // Object was already sprung this tic
if (object->eflags & MFE_SPRUNG) if (object->eflags & MFE_SPRUNG)

11
src/y_inter.c
View File

@ -1909,8 +1909,8 @@ static void Y_AwardCoopBonuses(void)
} }
ptlives = min( ptlives = min(
((!ultimatemode && !modeattacking && players[i].lives != INFLIVES) ? max((players[i].score/50000) - (oldscore/50000), 0) : 0), (INT32)((!ultimatemode && !modeattacking && players[i].lives != INFLIVES) ? max((INT32)((players[i].score/50000) - (oldscore/50000)), (INT32)0) : 0),
(mapheaderinfo[prevmap]->maxbonuslives < 0 ? INT32_MAX : mapheaderinfo[prevmap]->maxbonuslives)); (INT32)(mapheaderinfo[prevmap]->maxbonuslives < 0 ? INT32_MAX : mapheaderinfo[prevmap]->maxbonuslives));
if (ptlives) if (ptlives)
P_GivePlayerLives(&players[i], ptlives); P_GivePlayerLives(&players[i], ptlives);
@ -1955,10 +1955,9 @@ static void Y_AwardSpecialStageBonus(void)
// grant extra lives right away since tally is faked // grant extra lives right away since tally is faked
ptlives = min( ptlives = min(
((!ultimatemode && !modeattacking && players[i].lives != INFLIVES) ? max((players[i].score/50000) - (oldscore/50000), 0) : 0), (INT32)((!ultimatemode && !modeattacking && players[i].lives != INFLIVES) ? max((INT32)((players[i].score/50000) - (oldscore/50000)), (INT32)0) : 0),
(mapheaderinfo[prevmap]->maxbonuslives < 0 ? INT32_MAX : mapheaderinfo[prevmap]->maxbonuslives)); (INT32)(mapheaderinfo[prevmap]->maxbonuslives < 0 ? INT32_MAX : mapheaderinfo[prevmap]->maxbonuslives));
if (ptlives) P_GivePlayerLives(&players[i], ptlives);
P_GivePlayerLives(&players[i], ptlives);
if (i == consoleplayer) if (i == consoleplayer)
{ {