Skip to content

Fix "Pistol Start" Temporary Modifier to Actually Update #774

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 26, 2025
Merged

Fix "Pistol Start" Temporary Modifier to Actually Update #774

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions prboom2/src/dsda/skill_info.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,25 +246,27 @@ void dsda_RefreshPistolStart(void)
{
dboolean pistol_start_conflict = dsda_IntConfig(dsda_config_always_pistol_start) && !dsda_IntConfig(dsda_config_pistol_start);

// Fix pistolstart option "conflict"
if (allow_incompatibility || in_game)
if (pistol_start_conflict)
{
dsda_UpdateIntConfig(dsda_config_always_pistol_start, false, true);
dsda_ResetGameModifiers();
}

// Refresh pistolstart status
dsda_ResetGameModifiers();
}

// if "Always Pistol Start" is enabled, enable "Pistol Start" (avoid impossible condition)
void dsda_RefreshAlwaysPistolStart(void)
{
dboolean pistol_start_conflict = dsda_IntConfig(dsda_config_always_pistol_start) && !dsda_IntConfig(dsda_config_pistol_start);

// Fix pistolstart option "conflict"
if (allow_incompatibility || in_game)
if (pistol_start_conflict)
{
dsda_UpdateIntConfig(dsda_config_pistol_start, true, true);
dsda_ResetGameModifiers();
}

// Refresh pistolstart status
dsda_ResetGameModifiers();
}

// During demo recording/playback only use args, else use cfgs
Expand Down
Loading