Merge branch 'toastmiiisc' into 'master'

toastmiiisc

See merge request KartKrew/Kart!464

src/console.c

@@ -1916,6 +1916,8 @@ void CON_SetLoadingProgress(con_loadprogress_t newStep)
 	if (con_startup_loadprogress < LOADED_ISTARTUPGRAPHICS) // rendering not possible?
 		return;
 	CON_DrawLoadBar(); // here we display the console text
+	I_OsPolling();
+	I_UpdateNoBlit();
 	I_FinishUpdate(); // page flip or blit buffer
 }
 

src/d_player.h

@@ -209,7 +209,7 @@ typedef enum
 {
 	// Unsynced, HUD or clientsided effects
 	// Item box
-	khud_itemblink,		// Item flashing after roulette, prevents Hyudoro stealing AND serves as a mashing indicator
+	khud_itemblink,		// Item flashing after roulette, serves as a mashing indicator
 	khud_itemblinkmode,	// Type of flashing: 0 = white (normal), 1 = red (mashing), 2 = rainbow (enhanced items)
 
 	// Rings

src/f_wipe.c

@@ -299,16 +299,23 @@ static void F_DoWipe(fademask_t *fademask, lighttable_t *fadecolormap, boolean r
 					e = e_base + relativepos;
 					draw_rowstogo = draw_rowend - draw_rowstart;
 
-					while (draw_rowstogo--)
+					if (fadecolormap)
 					{
-						if (fadecolormap != NULL)
+						if (reverse)
+							s = e;
+						while (draw_rowstogo--)
+							*w++ = fadecolormap[ ( m << 8 ) + *s++ ];
+					}
+					else while (draw_rowstogo--)
+					{
+						/*if (fadecolormap != NULL)
 						{
 							if (reverse)
 								*w++ = fadecolormap[ ( m << 8 ) + *e++ ];
 							else
 								*w++ = fadecolormap[ ( m << 8 ) + *s++ ];
 						}
-						else
+						else*/
 							*w++ = transtbl[ ( *e++ << 8 ) + *s++ ];
 					}
 

src/k_kart.c

@@ -4973,8 +4973,7 @@ static void K_DoHyudoroSteal(player_t *player)
 			// Has an item
 			&& (players[i].itemtype
 			&& players[i].itemamount
-			&& !(players[i].pflags & PF_ITEMOUT)
+			&& !(players[i].pflags & PF_ITEMOUT))
-			&& !players[i].karthud[khud_itemblink]))
 		{
 			playerswappable[numplayers] = i;
 			numplayers++;
@@ -6443,6 +6442,12 @@ void K_KartPlayerHUDUpdate(player_t *player)
 	else if (player->karthud[khud_fault] > 0 && player->karthud[khud_fault] < 2*TICRATE)
 		player->karthud[khud_fault]++;
 
+	if (player->karthud[khud_itemblink] && player->karthud[khud_itemblink]-- <= 0)
+	{
+		player->karthud[khud_itemblinkmode] = 0;
+		player->karthud[khud_itemblink] = 0;
+	}
+
 	if (gametype == GT_RACE)
 	{
 		// 0 is the fast spin animation, set at 30 tics of ring boost or higher!
@@ -6961,13 +6966,6 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
 			K_HandleTumbleBounce(player);
 	}
 
-	// This doesn't go in HUD update because it has potential gameplay ramifications
-	if (player->karthud[khud_itemblink] && player->karthud[khud_itemblink]-- <= 0)
-	{
-		player->karthud[khud_itemblinkmode] = 0;
-		player->karthud[khud_itemblink] = 0;
-	}
-
 	K_KartPlayerHUDUpdate(player);
 
 	if (battleovertime.enabled && !(player->pflags & PF_ELIMINATED) && player->bumpers <= 0 && player->karmadelay <= 0)