Skip to content
Snippets Groups Projects

Don't increment totalplaytime if a demo is playing.

Merged SteelT requested to merge SteelT/SRB2:demototalplaytime into next
All threads resolved!

Fixes issue reported by Kitoko on Discord where the total playtime would be counted during a demo playback, also effects record attack replays.

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
  • Contributor

    Oh! I wonder if I should insist we make this branch merge into next instead of master. It's netplay compatible, but it isn't conceptually savegame compatible...? Eh, what the heck, should be good to go anyways.

    Edited by toaster
  • SteelT added 1 commit

    added 1 commit

    Compare with previous version

  • SteelT added 1 commit

    added 1 commit

    Compare with previous version

  • Author Owner

    Changed branch to next just in case.

  • SteelT changed target branch from master to next

    changed target branch from master to next

  • SteelT resolved all discussions

    resolved all discussions

  • I have the funny feeling nobody's updated next recently, I'm seeing a bunch of changes I thought we already merged in weeks ago included as well. Alam or someone, could you make sure next is uptodate (I can't right now)?

  • Contributor

    I have no clue what toaster even means. That totalplaytime wouldn't be totally accurate for the version technically I guess?? But it does not affect loading or saving gamedata.dat, just prevents it from incrementing in a specific scenario, so I literally cannot think of anything it would break.

  • Contributor

    Sal, the secret is that I am a big dumy who's overcautious @@;

  • Monster Iestyn mentioned in commit 37b8be21

    mentioned in commit 37b8be21

  • Please register or sign in to reply
    Loading