Prisons: respond to game difficulty

src/k_battle.c

@@ -40,7 +40,19 @@ UINT8 numtargets = 0; // Capsules busted
 INT32 K_StartingBumperCount(void)
 {
 	if (battleprisons)
-		return 0; // always 1 hit in Prison Break
+	{
+		if (grandprixinfo.gp == true && grandprixinfo.masterbots == true)
+			return 0;
+		switch (gamespeed)
+		{
+			case KARTSPEED_HARD:
+				return 1;
+			case KARTSPEED_NORMAL:
+				return 2;
+			case KARTSPEED_EASY:
+				return 3;
+		}
+	}
 
 	return cv_kartbumpers.value;
 }

src/k_kart.c

@@ -12445,7 +12445,7 @@ tic_t K_TimeLimitForGametype(void)
 	{
 		if (battleprisons)
 		{
-			return 20*TICRATE;
+			return (gamespeed == KARTSPEED_EASY) ? 30*TICRATE : 20*TICRATE;
 		}
 
 		return gametypeDefault;

src/p_inter.c

@@ -1082,7 +1082,7 @@ static void P_AddBrokenPrison(mobj_t *target, mobj_t *inflictor, mobj_t *source)
 		S_StartSound(NULL, sfx_s221);
 		if (timelimitintics)
 		{
-			extratimeintics += 10*TICRATE;
+			extratimeintics += (gamespeed == KARTSPEED_EASY) ? 15*TICRATE : 10*TICRATE;
 			secretextratime = TICRATE/2;
 		}