Skip to content

Conversation

andrikpowell
Copy link
Contributor

@andrikpowell andrikpowell commented Jul 27, 2025

This is a pretty simple PR. Many people complain (including me) that for Doom 2 you can't read the mapname on "Now Entering" screen, like in some other ports like GZDoom.

This PR adds an extended pause (not in demos) that is also skippable via a keypress.

I also threw in another fix that's tangentially related, which allows the "Now Entering" to show when entering MAP31. Currently it shows nothing when entering MAP31 (you can see this in Eviternity II). This is because this code was supposed to avoid the "Now Entering" for after MAP30 (i.e. next map would be MAP31), but ended up also not showing "Now Entering" for any map entering MAP31.

@rfomin
Copy link
Collaborator

rfomin commented Jul 27, 2025

This will break the compatibility for multi-level demos. We need to add checks for demorecording etc.

However, I don't think this change is appropriate in DSDA-Doom.

Edit: I didn't notice allow_incompatibility

WI_endStats();
}

#define WI_INTERMISSION_PAUSE (!dsda_StrictMode() && allow_incompatibility && gamemode == commercial && !netgame)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why !dsda_StrictMode()? It should be like this in any demo, so allow_incompatibility is enough.
And maybe WI_LONGER_NOW_ENTERING is better?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Guess I was being extra careful... There's absolutely no way for dsda_StrictMode() to be true unless it's either demo recording / playback, right?

While I'm not super crazy on the wording of WI_LONGER_NOW_ENTERING, I'll admit it does do a better job of explaining it's purpose.

@Pedro-Beirao
Copy link
Collaborator

I think this is a good change for dsda-doom. Ive definetely seen requests to make the Now Entering screen longer, and this is not a hard to mantain piece of code.

@elf-alchemist
Copy link
Contributor

I like this feature, would love to port this over to Woof once it's done 🙂

@rfomin
Copy link
Collaborator

rfomin commented Jul 27, 2025

I like this feature, would love to port this over to Woof once it's done 🙂

We already have it for the ID24 intermissions.

@andrikpowell andrikpowell force-pushed the dsda-intermission-pause branch from 2da1ec9 to 193937c Compare July 27, 2025 22:35
@andrikpowell
Copy link
Contributor Author

I like this feature, would love to port this over to Woof once it's done 🙂

We already have it for the ID24 intermissions.

Can you point me to this code? I'm curious on it's implementation.

@rfomin
Copy link
Collaborator

rfomin commented Jul 28, 2025

I like this feature, would love to port this over to Woof once it's done 🙂

We already have it for the ID24 intermissions.

Can you point me to this code? I'm curious on it's implementation.

See the calls of NextLocAnimation() function: https://github.com/fabiangreffrath/woof/blob/c8c723ea81b0623100fb24ee33ccf6a0acee4f1d/src/wi_stuff.c#L647
It's about switching into "Doom 1 mode" due to the nature of ID24 intermissions.

@andrikpowell andrikpowell force-pushed the dsda-intermission-pause branch from 193937c to 2f95f08 Compare August 9, 2025 07:51
@Pedro-Beirao Pedro-Beirao merged commit 62023da into kraflab:master Aug 9, 2025
5 checks passed
@andrikpowell andrikpowell deleted the dsda-intermission-pause branch August 10, 2025 00:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants