Skip to content
Snippets Groups Projects

Have super sparks scale with the player

Closed Eidolon requested to merge super-sparks-scaling into master

Fixes https://mb.srb2.org/showthread.php?t=40279

Should work fine, but do keep in mind that this fix is untested.

(Copied from GitHub PR https://github.com/STJr/SRB2/pull/42) (Author: wolfy852)

Edited by Monster Iestyn

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • :thumbsdown: the 2 commits should squashed together, also if this affect netplay consistently, this should be merged to next, not master

  • Does it? I don't think sparks play into the Consistancy function at all, and spark objects don't manipulate anything but themselves. They're isolated enough to not affect the game state in a significant way, so they shouldn't cause an inconsistency.

  • I think what Alam means is how it's not compatible with anything not using this fix, unlike say, the F11/F12 SDL2 fix... The spark would scale for those with it, and those without it will see no change in scale. Any physics involving the sparks could potentially cause desynchs if they affected the players directly. (Not that there'll be much for those Objects anyway, but still)

  • That's what I mean, the sparks shouldn't cause any physics changes should they?

  • Not unless SOCs, Lua scripts or some other madness was involved... yeah, I would probably merge this to next instead of master just to be safe.

  • Alright, then we will merge this into next instead.

    I am wary of squash merges because they destroy history, however. So I will give this MR a bit longer so we can discuss that and whether or not we should do it moving forward.

  • I would squash commits in the case of small errors like whitespace which are quickly corrected.

  • fixup and merged commit into next branch

  • Alam Ed Arias Status changed to closed

    Status changed to closed

  • Alam Ed Arias mentioned in commit aa7c6713

    mentioned in commit aa7c6713

  • Monster Iestyn changed the description

    changed the description

  • added Bug label

Please register or sign in to reply
Loading