Repository navigation
P3: Fix three editor bugs and an in-game briefing icon bug - #8027
Open
dustinspace217 wants to merge 4 commits into
Open
dustinspace217 wants to merge 4 commits into
dustinspace217 wants to merge 4 commits into
Conversation
… change Icons that moved between two stages vanished after a cut or a jump of more than one stage, until the camera was moved. The engine builds icon movers from the previous stage and divides by the transition time, so a zero-time change needs the previous stage cleared first, as the game does before a cut or a jump. The same reset now also runs when the stage index is unchanged, because Delete Stage and a team switch put a different stage under the same index and the preview kept the old camera. The zero-time part is the scp-fs2open#7726 hunk from scp-fs2open#7675. Fixes scp-fs2open#7726.
Opening a campaign from the Campaign Specs tab fitted the graph to a view that had never been laid out, so the whole flow shrank to a speck and the Campaign Flow tab looked empty until the campaign was opened again. A fit asked for while the view is hidden now runs when the view is shown.
FRED and qtFRED never start the game state machine. Capturing a game state context there, which async.run does by default, asserted in gameseq_get_state_instance_id in Debug builds and read before the start of the state array in Release. The instance id is now 0 without a state stack, like gameseq_get_state returns GS_STATE_INVALID, and a context captured without a stack stays valid while there is still none. Fixes scp-fs2open#6521.
…hange In the game, a briefing stage with a camera time of 0 and no cut flag lost every icon that had moved from the previous stage. The icon mover divides by the transition time, so its speed became infinite and the icon was never drawn. An icon now gets no mover when the time is exactly 0 and is drawn at its new position instead. Other times, and the fades for icons that appear or disappear, are unchanged. No retail FreeSpace 2 briefing has a stage with a camera time of 0.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What?
Three small editor fixes and one in the game's briefing screen. Fixes #7726 and #6521.
Why?
$camera_time: 0and no cut flag, an icon that sits at a different position than in the previous stage is never drawn on that stage.How?
Testing?
$camera_time: 0. Master: Iota is missing on stage 3. Branch: drawn. Same under OpenGL and Vulkan. The unmodified SM1-01 briefing looks the same on both builds under both renderers.Anything Else?