diff --git a/src/f_finale.c b/src/f_finale.c
index 3c69dc63169dce9d042e3bf45f88e27f50d5346d..57f8a87121dd096b49285f4c98025ad364720f7e 100644
--- a/src/f_finale.c
+++ b/src/f_finale.c
@@ -531,7 +531,7 @@ static void F_IntroDrawScene(void)
{
case 0:
bgxoffs = 28;
- break;
+ break;
case 1:
background = W_CachePatchName("INTRO1", PU_PATCH);
break;
@@ -620,7 +620,7 @@ static void F_IntroDrawScene(void)
V_DrawScaledPatch(bgxoffs, 0, 0, background);
}
else if (intro_scenenum == 0) // STJr presents
- {
+ {
if (intro_curtime > 1 && intro_curtime < (INT32)introscenetime[intro_scenenum])
{
V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31);
@@ -628,13 +628,13 @@ static void F_IntroDrawScene(void)
sprintf(stjrintro, "STJRI%03u", intro_curtime-1);
else if (intro_curtime >= TICRATE-6 && intro_curtime < 2*TICRATE-20) // Pause on black screen for just a second
return;
- else if (intro_curtime == 2*TICRATE-19)
+ else if (intro_curtime == 2*TICRATE-19)
{
// Fade in the text
// The text fade out is automatically handled when switching to a new intro scene
strncpy(stjrintro, "STJRI029", 9);
S_ChangeMusicInternal("_stjr", false);
-
+
background = W_CachePatchName(stjrintro, PU_PATCH);
wipestyleflags = WSF_FADEIN;
F_WipeStartScreen();
@@ -643,7 +643,7 @@ static void F_IntroDrawScene(void)
F_WipeEndScreen();
F_RunWipe(0,true);
}
-
+
if (!WipeInAction) // Draw the patch if not in a wipe
{
background = W_CachePatchName(stjrintro, PU_PATCH);
@@ -863,7 +863,7 @@ void F_IntroDrawer(void)
F_WipeEndScreen();
F_RunWipe(99,true);
}
-
+
S_ChangeMusicInternal("_intro", false);
}
else if (intro_scenenum == 10)
@@ -1067,60 +1067,56 @@ static const char *credits[] = {
"\1Credits",
"",
"\1Game Design",
- "Ben \"Mystic\" Geyer",
+ "Sonic Team Junior",
"\"SSNTails\"",
"Johnny \"Sonikku\" Wallbank",
"",
"\1Programming",
"Alam \"GBC\" Arias",
"Logan \"GBA\" Arias",
+ "Colette \"fickleheart\" Bordelon",
+ "Andrew \"orospakr\" Clunis",
+ "Sally \"TehRealSalt\" Cochenour",
+ "Gregor \"Oogaland\" Dick",
"Callum Dickinson",
"Scott \"Graue\" Feeney",
"Victor \"SteelT\" Fuentes",
"Nathan \"Jazz\" Giroux",
+ "\"Golden\"",
"Vivian \"toaster\" Grannell",
+ "Julio \"Chaos Zero 64\" Guir",
+ "\"Hannu_Hanhi\"", // For many OpenGL performance improvements!
"Kepa \"Nev3r\" Iceta",
"Thomas \"Shadow Hog\" Igoe",
"\"james\"",
"Iestyn \"Monster Iestyn\" Jealous",
"\"Jimita\"",
- "Ronald \"Furyhunter\" Kinard", // The SDL2 port
- "Louis-Antoine \"LJ Sonic\" de Moulins", // de Rochefort doesn't quite fit on the screen sorry lol
- "John \"JTE\" Muniz",
- "Ehab \"Wolfy\" Saeed",
- "Jonas \"MascaraSnake\" Sauer",
"\"Kaito Sinclaire\"",
- "\"SSNTails\"",
- "Lachlan \"Lach\" Wright",
- "Marco \"mazmazz\" Zafra",
- "",
- "\1Programming",
- "\1Assistance",
- "Colette \"fickleheart\" Bordelon",
- "\"chi.miru\"", // helped port slope drawing code from ZDoom
- "Andrew \"orospakr\" Clunis",
- "Sally \"TehRealSalt\" Cochenour",
- "Gregor \"Oogaland\" Dick",
- "Julio \"Chaos Zero 64\" Guir",
- "\"Hannu_Hanhi\"", // For many OpenGL performance improvements!
"\"Kalaron\"", // Coded some of Sryder13's collection of OpenGL fixes, especially fog
+ "Ronald \"Furyhunter\" Kinard", // The SDL2 port
"\"Lat'\"", // SRB2-CHAT, the chat window from Kart
"Matthew \"Shuffle\" Marsalko",
"Steven \"StroggOnMeth\" McGranahan",
"\"Morph\"", // For SRB2Morphed stuff
+ "Louis-Antoine \"LJ Sonic\" de Moulins", // de Rochefort doesn't quite fit on the screen sorry lol
+ "John \"JTE\" Muniz",
"Colin \"Sonict\" Pfaff",
"Sean \"Sryder13\" Ryder",
+ "Ehab \"Wolfy\" Saeed",
"Tasos \"tatokis\" Sahanidis", // Corrected C FixedMul, making 64-bit builds netplay compatible
+ "Jonas \"MascaraSnake\" Sauer",
"Wessel \"sphere\" Smit",
- "Ben \"Cue\" Woodford",
+ "\"SSNTails\"",
+ "\"Varren\"",
"\"VelocitOni\"", // Wrote the original dashmode script
"Ikaro \"Tatsuru\" Vinhas",
- // Git contributors with 5+ approved merges of substantive quality,
- // or contributors with at least one groundbreaking merge, may be named.
- // Everyone else is acknowledged under "Special Thanks > SRB2 Community Contributors".
+ "Ben \"Cue\" Woodford",
+ "Lachlan \"Lach\" Wright",
+ "Marco \"mazmazz\" Zafra",
"",
"\1Art",
"Victor \"VAdaPEGA\" Ara\x1Fjo", // Araújo -- sorry for our limited font! D:
+ "\"Arrietty\"",
"Ryan \"Blaze Hedgehog\" Bloom",
"Graeme P. \"SuperPhanto\" Caldwell", // for the new brak render
"\"ChrispyPixels\"",
@@ -1143,6 +1139,7 @@ static const char *credits[] = {
"Andrew \"Senku Niola\" Moran",
"\"MotorRoach\"",
"Phillip \"TelosTurntable\" Robinson",
+ "\"Scizor300\"",
"Wessel \"sphere\" Smit",
"David \"Instant Sonic\" Spencer Jr.",
"\"SSNTails\"",
@@ -1156,9 +1153,9 @@ static const char *credits[] = {
"Malcolm \"RedXVI\" Brown",
"Dave \"DemonTomatoDave\" Bulmer",
"Paul \"Boinciel\" Clempson",
+ "\"Cyan Helkaraxe\"",
"Shane \"CobaltBW\" Ellis",
"James \"SeventhSentinel\" Hall",
- "Cyan Helkaraxe",
"Kepa \"Nev3r\" Iceta",
"Iestyn \"Monster Iestyn\" Jealous",
"Jarel \"Arrow\" Jones",
@@ -1185,8 +1182,9 @@ static const char *credits[] = {
"James \"SeventhSentinel\" Hall",
"Kepa \"Nev3r\" Iceta",
"Thomas \"Shadow Hog\" Igoe",
- "Alexander \"DrTapeworm\" Moench-Ford",
"\"Kaito Sinclaire\"",
+ "Alexander \"DrTapeworm\" Moench-Ford",
+ "\"Revan\"",
"Anna \"QueenDelta\" Sandlin",
"Wessel \"sphere\" Smit",
"\"Spazzo\"",
@@ -1226,13 +1224,6 @@ static const char *credits[] = {
"Pascal \"CodeImp\" vd Heiden", // Doom Builder developer
"Randi Heit (<!>)", // For their MSPaint <!> sprite that we nicked
"Simon \"sirjuddington\" Judd", // SLADE developer
- // Acknowledged here are the following:
- // Minor merge request authors, see guideline above
- // - Golden - Expanded thin font
- // Creators of small quantities of sprite/texture assets
- // - Arietty - New Green Hill-styled textures
- // - Scizor300 - the only other contributor to the 2.0 SRB2 Asset Pack
- // - Revan/Icefox - the new Nimbus Ruins skybox
"SRB2 Community Contributors",
"",
"\1Produced By",