Skip to content

Conversation

andrikpowell
Copy link
Contributor

@andrikpowell andrikpowell commented Jul 27, 2025

PR does what the title says.

Due to the cycle being based on other code, I brought over Nyan functionality separating the types of CREDITS (graphic and "dynamic"), as well as allowing the HELP screen to show CREDIT (or Dynamic Credits) based on what lumps are found in the PWAD.

Order goes: PWAD HELP > PWAD CREDIT > DYNAMIC CREDIT

The reasoning for this is that for the longest time, PrBoom used CREDIT for the HELP screen erroneously... which resulted in many wads (i.e Scythe 2) including a CREDIT lump, but not a HELP lump.

Edit: I think it's worth having a discussion around automatically disabling the IWAD internal demos for PWADs (w/ maps)... As Nyan Doom has this functionality tied to a config option. I don't see any reason why anyone would want to see a desyncing "Circle of Death" demo for wads that don't include custom internal demos. We could even just have it enabled by default without a config option. Thoughts?

- There are too many wads with CREDIT, but not HELP
@rfomin
Copy link
Collaborator

rfomin commented Jul 27, 2025

Edit: I think it's worth having a discussion around automatically disabling the IWAD internal demos for PWADs (w/ maps)...

I like the idea.

@andrikpowell
Copy link
Contributor Author

andrikpowell commented Jul 27, 2025

Edit: I think it's worth having a discussion around automatically disabling the IWAD internal demos for PWADs (w/ maps)...

I like the idea.

I've added Nyan's implementation in the latest commit: 7dadf59
(minus the config option - although I'm not even sure we need a config option for this)

@andrikpowell
Copy link
Contributor Author

andrikpowell commented Aug 5, 2025

Simplified / changed my approach to integrating this. It's somewhat based on an implementation proposed by @Pedro-Beirao and removes the dummy demostates I had before. I guess my thought was if ID24 demoloop functionality was ever integrated in the future, it would make sense to use another demosequence... But I will admit this approach uses less code.

Originally I had the idea of just skipping the demo states, however pushing the demostates forward caused an crash regarding the optional DEMO4.

In my opinion it's better to only check for DEMO1, since if that's been replaced it's almost guaranteed the other demos will be as well. The logic is also much simpler to follow. In addition, I'm not a fan of just skipping DEMOS, as I'd like to match ZDoom behaviour, which just limits the cycle to TITLEPIC / CREDIT.

- Add check for UDMF maps
@Pedro-Beirao Pedro-Beirao merged commit 1ad3435 into kraflab:master Aug 13, 2025
5 checks passed
@andrikpowell andrikpowell deleted the dsda-titlepic-cycle branch August 14, 2025 05:20
@andrikpowell andrikpowell restored the dsda-titlepic-cycle branch September 20, 2025 10:59
@andrikpowell andrikpowell deleted the dsda-titlepic-cycle branch September 20, 2025 11:29
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.

3 participants