Skip to content
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

Jump to bottom

Heretic/Hexen: No extended demos after advancing in demosequence #1256

Merged
merged 5 commits into from
Jan 6, 2025
Merged

Heretic/Hexen: No extended demos after advancing in demosequence #1256

merged 5 commits into from
Jan 6, 2025

Conversation

Noseey
Copy link

@Noseey Noseey commented Jan 6, 2025

Related Issue:
#1255

Changes Summary

  • Disable extended demos when advancing in the startup demosequence to align demo1 and demo3 with vanilla behavior. No extended demos required after this time in the code sequence.

@fabiangreffrath
Copy link
Owner

Thank you! Feel free to do the same in H2_DoAdvanceDemo() in Hexen.

@Noseey
Copy link
Author

Noseey commented Jan 6, 2025

Thank you! Feel free to do the same in H2_DoAdvanceDemo() in Hexen.

Sure, I have added it to Hexen as well to be consistent.

@Noseey Noseey changed the title Heretic: No extended demos after advancing in demosequence Heretic/Hexen: No extended demos after advancing in demosequence Jan 6, 2025
fabiangreffrath
fabiangreffrath approved these changes Jan 6, 2025
View reviewed changes
Copy link
Owner

@fabiangreffrath fabiangreffrath left a comment

Choose a reason for hiding this comment

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

Thank you!

@fabiangreffrath fabiangreffrath merged commit b0ce5af into fabiangreffrath:master Jan 6, 2025
5 of 6 checks passed
@Noseey
Copy link
Author

Noseey commented Jan 6, 2025

The failed build of the macOS package is probably not related with the change itself, but instead just an occassional build issue, like it reads in the log?

sleep 2 # pause to workaround occasional "Can’t get disk" (-1728) issues
./dmgfix "/Users/runner/work/crispy-doom/crispy-doom/pkg/osx/tmp.dmg" "Crispy Doom 7.0.0" "Crispy Doom.app"
./dmgfix:1021:1034: execution error: Finder got an error: Can’t get disk "Crispy Doom 7.0.0". (-1728)
make: *** [crispy-doom-7.0.0-x86.dmg] Error 1

@fabiangreffrath
Copy link
Owner

No problems on the master branch.

@Noseey
Copy link
Author

Noseey commented Jan 6, 2025

No problems on the master branch.

Alright, thanks for checking! Was worried that I broke something.. 😄

@Noseey Noseey deleted the Heretic_DemoReel_NotExtended branch January 6, 2025 20:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fabiangreffrath fabiangreffrath fabiangreffrath approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Noseey @fabiangreffrath