Skip to content

Commit

Permalink
A_CloseShotgun2 frame fix
Browse files Browse the repository at this point in the history
  • Loading branch information
dashodanger committed Nov 13, 2023
1 parent 74e4bab commit 7f9b136
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 1 deletion.
3 changes: 2 additions & 1 deletion CHANGELOG.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,5 @@ General Improvements/Changes
Bugs fixed
----------
- Fixed UMAPINFO entries with no sky defined and past the range of stock levels causing a CTD
- Removed sector fog color check that was causing the HOM debugging texture to appear even with debug_hom set to 0
- Removed sector fog color check that was causing the HOM debugging texture to appear even with debug_hom set to 0
- Fixed A_CloseShotgun2 frame only playing the DBCLS sound and not calling A_Refire as well
10 changes: 10 additions & 0 deletions source_files/dehacked/deh_frames.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1121,6 +1121,16 @@ void Frames::OutputState(char group, int cur, bool do_action)
(st->frame >= 32768 || force_fullbright) ? "BRIGHT" : "NORMAL", act_name);
}

// special handling for A_CloseShotgun2
// 2023.11.13: This is not stricly accurate; the real A_CloseShotgun2 will play the sound before refiring,
// but with our current sound channel handling this causes the DBCLS sound to play repeatedly and persist
// even with the refire noises (ex: Harmony re-release chaingun will constantly play its wind-down noise)
if (StrCaseCmp(action_info[action].bex_name, "A_CloseShotgun2") == 0)
{
WAD::Printf(" %s:%c:0:%s:REFIRE,\n", Sprites::GetSprite(st->sprite), 'A' + ((int)st->frame & 31),
(st->frame >= 32768 || force_fullbright) ? "BRIGHT" : "NORMAL");
}

int tics = (int)st->tics;

// kludge for EDGE and Batman TC. EDGE waits 35 tics before exiting the
Expand Down

0 comments on commit 7f9b136

Please sign in to comment.