AnarchistGamers/woof
1
0
Fork 0
mirror of https://github.com/fabiangreffrath/woof.git synced 2025-09-27 23:22:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

umapinfo: fix default intermission (#225)

Browse Source
This commit is contained in:
Roman Fomin 2021-06-22 13:36:07 +07:00 committed by GitHub
parent af65f7ed8d
commit a02a6a5576
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
Source/f_finale.c
View File

@ -72,6 +72,8 @@ boolean using_FMI;
// //
void F_StartFinale (void) void F_StartFinale (void)
{ {
boolean mus_changed = false;
gameaction = ga_nothing; gameaction = ga_nothing;
gamestate = GS_FINALE; gamestate = GS_FINALE;
viewactive = false; viewactive = false;
@ -80,42 +82,17 @@ void F_StartFinale (void)
// killough 3/28/98: clear accelerative text flags // killough 3/28/98: clear accelerative text flags
acceleratestage = midstage = 0; acceleratestage = midstage = 0;
if (gamemapinfo) finaletext = NULL;
finaleflat = NULL;
if (gamemapinfo && gamemapinfo->intermusic[0])
{ {
if (gamemapinfo->intertextsecret && secretexit && gamemapinfo->intertextsecret[0] != '-') // '-' means that any default intermission was cleared. int l = W_CheckNumForName(gamemapinfo->intermusic);
if (l >= 0)
{ {
finaletext = gamemapinfo->intertextsecret; S_ChangeMusInfoMusic(l, true);
mus_changed = true;
} }
else if (gamemapinfo->intertext && !secretexit && gamemapinfo->intertext[0] != '-') // '-' means that any default intermission was cleared.
{
finaletext = gamemapinfo->intertext;
}
if (!finaletext) finaletext = "The End"; // this is to avoid a crash on a missing text in the last map.
finaleflat = gamemapinfo->interbackdrop[0] ? gamemapinfo->interbackdrop : "FLOOR4_8"; // use a single fallback for all maps.
if (gamemapinfo->intermusic[0])
{
int l = W_CheckNumForName(gamemapinfo->intermusic);
if (l >= 0) S_ChangeMusInfoMusic(l, true);
}
else
{
S_ChangeMusic(gamemode == commercial ? mus_read_m : mus_victor, true);
}
finalestage = 0;
finalecount = 0;
using_FMI = true;
// [FG] do the "char* vs. const char*" dance
if (finaletext_rw)
{
(free)(finaletext_rw);
finaletext_rw = NULL;
}
finaletext_rw = M_StringDuplicate(finaletext);
return;
} }
// Okay - IWAD dependend stuff. // Okay - IWAD dependend stuff.
@ -128,7 +105,7 @@ void F_StartFinale (void)
case registered: case registered:
case retail: case retail:
{ {
S_ChangeMusic(mus_victor, true); if (!mus_changed) S_ChangeMusic(mus_victor, true);
switch (gameepisode) switch (gameepisode)
{ {
@ -158,7 +135,7 @@ void F_StartFinale (void)
// DOOM II and missions packs with E1, M34 // DOOM II and missions packs with E1, M34
case commercial: case commercial:
{ {
S_ChangeMusic(mus_read_m, true); if (!mus_changed) S_ChangeMusic(mus_read_m, true);
// Ty 08/27/98 - added the gamemission logic // Ty 08/27/98 - added the gamemission logic
@ -205,12 +182,35 @@ void F_StartFinale (void)
// Indeterminate. // Indeterminate.
default: // Ty 03/30/98 - not externalized default: // Ty 03/30/98 - not externalized
S_ChangeMusic(mus_read_m, true); if (!mus_changed) S_ChangeMusic(mus_read_m, true);
finaleflat = "F_SKY1"; // Not used anywhere else. finaleflat = "F_SKY1"; // Not used anywhere else.
finaletext = s_C1TEXT; // FIXME - other text, music? finaletext = s_C1TEXT; // FIXME - other text, music?
break; break;
} }
if (gamemapinfo)
{
if (gamemapinfo->intertextsecret && secretexit && gamemapinfo->intertextsecret[0] != '-') // '-' means that any default intermission was cleared.
{
finaletext = gamemapinfo->intertextsecret;
}
else if (gamemapinfo->intertext && !secretexit && gamemapinfo->intertext[0] != '-') // '-' means that any default intermission was cleared.
{
finaletext = gamemapinfo->intertext;
}
if (!finaletext) finaletext = "The End"; // this is to avoid a crash on a missing text in the last map.
if (gamemapinfo->interbackdrop[0])
{
finaleflat = gamemapinfo->interbackdrop;
}
if (!finaleflat) finaleflat = "FLOOR4_8"; // use a single fallback for all maps.
using_FMI = true;
}
finalestage = 0; finalestage = 0;
finalecount = 0; finalecount = 0;