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.

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

fix -fastdemo with -skipsec #1310

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

rfomin
Copy link
Collaborator

@rfomin rfomin commented Dec 7, 2023

Fix #1307

@MrAlaux
Copy link
Collaborator

MrAlaux commented Dec 8, 2023

This fixes -skipsec for me. However, using -warp still disables fast playback, but weirdly enough, using both -warp and -skipsec together doesn't disable it.

@fabiangreffrath
Copy link
Owner

This fixes -skipsec for me. However, using -warp still disables fast playback, but weirdly enough, using both -warp and -skipsec together doesn't disable it.

I think this is also needed:

--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -1559,7 +1559,11 @@ void P_SetupLevel(int episode, int map, int playermask, skill_t skill)
   if (playback_warp == map || playback_nextlevel)
   {
     if (!playback_skiptics)
+    {
       G_EnableWarp(false);
+      if (fastdemo)
+        I_SetFastdemoTimer(true);
+    }
 
     playback_warp = -1;
     playback_nextlevel = false;

@rfomin
Copy link
Collaborator Author

rfomin commented Dec 8, 2023

Wait, I remembered why I implemented it this way. @MrAlaux, did you know that you can enable fastdemo at any time during normal demo playback by pressing the "fast forward" key?
So the -fastdemo command line parameter only matters if you want to play the demo non-interactively.

@MrAlaux
Copy link
Collaborator

MrAlaux commented Dec 8, 2023

@MrAlaux, did you know that you can enable fastdemo at any time during normal demo playback by pressing the "fast forward" key?

I saw the key binding for it, but I never used it. Regardless, I think this should be fixed anyways.

@fabiangreffrath
Copy link
Owner

@rfomin how do we proceed here?

@rfomin
Copy link
Collaborator Author

rfomin commented Dec 11, 2023

@rfomin how do we proceed here?

Let's wait a bit. I don't remember the details and it needed testing.

I'm trying to fix the sky in Sigil 2 right now 😄

@fabiangreffrath

This comment was marked as off-topic.

@rfomin

This comment was marked as off-topic.

@fabiangreffrath

This comment was marked as off-topic.

@rfomin

This comment was marked as off-topic.

@fabiangreffrath

This comment was marked as off-topic.

@fabiangreffrath
Copy link
Owner

This is still pending...

@rfomin
Copy link
Collaborator Author

rfomin commented Jan 2, 2024

This is still pending...

Let's postpone this even more 😄 It might not be worth fixing this - skipping a few levels with nodrawers and then continuing in fastdemo mode is not very useful. It might be worth refactoring playdemo and related functions. I wanted to revisit this after the menu and DRS changes.

@fabiangreffrath
Copy link
Owner

Oki.

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.

-fastdemo doesn't work with -skipsec
3 participants