From a501b7b00d74bcdce98e2ca0d6b69ddfb0c39ea9 Mon Sep 17 00:00:00 2001
From: Steel Titanium <steeltitanium1@gmail.com>
Date: Wed, 7 Apr 2021 00:55:08 -0400
Subject: [PATCH] Reorganize the switch block, add missing int_comp case
---
src/y_inter.c | 23 +++++++++--------------
1 file changed, 9 insertions(+), 14 deletions(-)
diff --git a/src/y_inter.c b/src/y_inter.c
index 32dfb52a7c..5dd3e845df 100644
--- a/src/y_inter.c
+++ b/src/y_inter.c
@@ -263,28 +263,23 @@ void Y_LoadIntermissionData(void)
interpic = W_CachePatchName(mapheaderinfo[gamemap-1]->interscreen, PU_PATCH);
break;
}
+ case int_ctf:
+ case int_teammatch:
+ {
+ data.match.redflag = (intertype == int_ctf) ? rflagico : rmatcico;
+ data.match.blueflag = (intertype == int_ctf) ? bflagico : bmatcico;
+ }
+ /* FALLTHRU */
case int_match:
case int_race:
- case int_teammatch:
- case int_ctf:
+ case int_comp:
{
- if (intertype == int_match || intertype == int_race)
+ if (intertype == int_match || intertype == int_race || intertype == int_comp)
{
// get RESULT header
data.match.result = W_CachePatchName("RESULT", PU_PATCH);
}
- if (intertype == int_ctf)
- {
- data.match.redflag = rflagico;
- data.match.blueflag = bflagico;
- }
- else // team match
- {
- data.match.redflag = rmatcico;
- data.match.blueflag = bmatcico;
- }
-
// get background tile
bgtile = W_CachePatchName("SRB2BACK", PU_PATCH);
break;
--
GitLab