Skip to content

Commit ffa9a39

Browse files
fix fast doors reopening with wrong sound (#2139)
* fix fast doors reopening with wrong sound Thanks @MrAlaux for pointing me to this fix. * change comp flag description accordingly
1 parent d915c18 commit ffa9a39

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

src/g_game.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -4780,7 +4780,7 @@ void G_BindCompVariables(void)
47804780
BIND_COMP(comp_vile, 0, "Arch-viles can create ghost monsters");
47814781
BIND_COMP(comp_pain, 0, "Pain elementals are limited to 20 lost souls");
47824782
BIND_COMP(comp_skull, 0, "Lost souls can spawn past impassable lines");
4783-
BIND_COMP(comp_blazing, 0, "Blazing doors make double closing sounds");
4783+
BIND_COMP(comp_blazing, 0, "Incorrect sound behavior for blazing doors");
47844784
BIND_COMP(comp_doorlight, 0, "Door lighting changes are immediate");
47854785
BIND_COMP(comp_god, 0, "God mode isn't absolute");
47864786
BIND_COMP(comp_skymap, 0, "Don't apply invulnerability palette to skies");

src/p_doors.c

+10
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,16 @@ void T_VerticalDoor (vldoor_t *door)
174174
case doorClose: // Close types do not bounce, merely wait
175175
break;
176176

177+
case blazeRaise:
178+
case genBlazeRaise:
179+
door->direction = 1;
180+
if (!STRICTMODE_COMP(comp_blazing))
181+
{
182+
S_StartSound((mobj_t *)&door->sector->soundorg,sfx_bdopn);
183+
break;
184+
}
185+
// fallthrough
186+
177187
default: // other types bounce off the obstruction
178188
door->direction = 1;
179189
S_StartSound((mobj_t *)&door->sector->soundorg,sfx_doropn);

0 commit comments

Comments
 (0)