From 0af071dbca8e51a2bd28ae7e3fde5693ef16e858 Mon Sep 17 00:00:00 2001 From: mazmazz Date: Tue, 20 Nov 2018 20:23:48 -0500 Subject: [PATCH] build errors --- src/p_map.c | 2 +- src/y_inter.c | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/p_map.c b/src/p_map.c index 648bb2bcc..b4ace61c7 100644 --- a/src/p_map.c +++ b/src/p_map.c @@ -134,7 +134,7 @@ boolean P_DoSpring(mobj_t *spring, mobj_t *object) { fixed_t vertispeed = spring->info->mass; fixed_t horizspeed = spring->info->damage; - boolean final; + boolean final = false; // Object was already sprung this tic if (object->eflags & MFE_SPRUNG) diff --git a/src/y_inter.c b/src/y_inter.c index 29e611730..1a1675fdd 100644 --- a/src/y_inter.c +++ b/src/y_inter.c @@ -1909,8 +1909,8 @@ static void Y_AwardCoopBonuses(void) } ptlives = min( - ((!ultimatemode && !modeattacking && players[i].lives != INFLIVES) ? max((players[i].score/50000) - (oldscore/50000), 0) : 0), - (mapheaderinfo[prevmap]->maxbonuslives < 0 ? INT32_MAX : mapheaderinfo[prevmap]->maxbonuslives)); + (INT32)((!ultimatemode && !modeattacking && players[i].lives != INFLIVES) ? max((INT32)((players[i].score/50000) - (oldscore/50000)), (INT32)0) : 0), + (INT32)(mapheaderinfo[prevmap]->maxbonuslives < 0 ? INT32_MAX : mapheaderinfo[prevmap]->maxbonuslives)); if (ptlives) P_GivePlayerLives(&players[i], ptlives); @@ -1955,10 +1955,9 @@ static void Y_AwardSpecialStageBonus(void) // grant extra lives right away since tally is faked ptlives = min( - ((!ultimatemode && !modeattacking && players[i].lives != INFLIVES) ? max((players[i].score/50000) - (oldscore/50000), 0) : 0), - (mapheaderinfo[prevmap]->maxbonuslives < 0 ? INT32_MAX : mapheaderinfo[prevmap]->maxbonuslives)); - if (ptlives) - P_GivePlayerLives(&players[i], ptlives); + (INT32)((!ultimatemode && !modeattacking && players[i].lives != INFLIVES) ? max((INT32)((players[i].score/50000) - (oldscore/50000)), (INT32)0) : 0), + (INT32)(mapheaderinfo[prevmap]->maxbonuslives < 0 ? INT32_MAX : mapheaderinfo[prevmap]->maxbonuslives)); + P_GivePlayerLives(&players[i], ptlives); if (i == consoleplayer) {