Skip to content

Let -playdemo et al. fall back to lump name if file not found #770

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

Let -playdemo et al. fall back to lump name if file not found #770

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
25 changes: 18 additions & 7 deletions prboom2/src/dsda/playback.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,15 +84,13 @@ const char* dsda_PlaybackName(void) {
}

void dsda_ExecutePlaybackOptions(void) {
if (playdemo_arg)
{
G_DeferedPlayDemo(playback_name);
userdemo = true;
}
else if (playlump_arg) {
if (playlump_arg) {
if (W_CheckNumForName(playback_name) == LUMP_NOT_FOUND)
I_Error("Unable to find required internal demo lump \"%s\"", playback_name);
}

if (playdemo_arg)
{
G_DeferedPlayDemo(playback_name);
userdemo = true;
}
Expand Down Expand Up @@ -125,7 +123,7 @@ static void dsda_UpdatePlaybackName(const char* name, dboolean require_file) {
playback_name = Z_Strdup(name);

if (require_file)
playback_filename = I_RequireFile(playback_name, ".lmp");
playback_filename = I_FindFile(playback_name, ".lmp");
else
playback_filename = NULL;
}
Expand All @@ -137,13 +135,17 @@ const char* dsda_ParsePlaybackOptions(void) {
if (arg->found) {
playdemo_arg = arg;
dsda_UpdatePlaybackName(arg->value.v_string, true);
// fall back to lump if file not found
if (!playback_filename)
playlump_arg = arg;
return playback_filename;
}

arg = dsda_Arg(dsda_arg_playlump);
if (arg->found) {
playlump_arg = arg;
dsda_UpdatePlaybackName(arg->value.v_string, false);
playdemo_arg = arg;
return playback_filename;
}

Expand All @@ -152,13 +154,19 @@ const char* dsda_ParsePlaybackOptions(void) {
fastdemo_arg = arg;
fastdemo = true;
dsda_UpdatePlaybackName(arg->value.v_string, true);
// fall back to lump if file not found
if (!playback_filename)
playlump_arg = arg;
return playback_filename;
}

arg = dsda_Arg(dsda_arg_timedemo);
if (arg->found) {
timedemo_arg = arg;
dsda_UpdatePlaybackName(arg->value.v_string, true);
// fall back to lump if file not found
if (!playback_filename)
playlump_arg = arg;
return playback_filename;
}

Expand All @@ -167,6 +175,9 @@ const char* dsda_ParsePlaybackOptions(void) {
recordfromto_arg = arg;
dsda_SetDemoBaseName(arg->value.v_string_array[1]);
dsda_UpdatePlaybackName(arg->value.v_string_array[0], true);
// require a file
if (!playback_filename)
playback_filename = I_RequireFile(arg->value.v_string_array[0], ".lmp");
return playback_filename;
}

Expand Down
Loading