Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
SRB2
SRB2
  • Project
    • Overview
    • Details
    • Activity
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 246
    • Issues 246
    • List
    • Board
    • Labels
    • Milestones
  • Merge Requests 71
    • Merge Requests 71
  • Wiki
    • Wiki
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Commits
  • Issue Boards
  • STJr
  • SRB2SRB2
  • Merge Requests
  • !939

Merged
Opened May 13, 2020 by Kays Ishaq@kays 
  • Report abuse
Report abuse

Console variable to select music preference

Adds musicpref to console and sound options menu, which allows users to select whether to prioritize MIDI or Digital music without disabling the other - in current SRB2 behavior, MIDI music will only play if Digital is disabled entirely, or not available for the given track.

S_GetMusicLumpNum, S_RecallMusic, S_ChangeMusicEx, GameMIDIMusic_OnChange and GameDigiMusic_OnChange updated to not assume digital music priority. The GamexxxxMusic_OnChange functions have been changed to have more consistent behavior between the two as well.

Small positive side effect of using P_RestoreMusic in the GamexxxxMusic_OnChange functions means that powerup music (speed shoes, invincibility) will restore in the correct position when reenabling the original MusicType they loaded in with.

Disabling digital music while in a map that doesn't have a MIDI track available, while MIDI is still enabled (or vice versa) will now print the standard "Music x could not be loaded..." error to the console, which deviates from current SRB2 behavior of simply stopping the music with no message - this could be changed, but I think the feedback can be helpful, and is consistent with receiving the error message in a similar situation on map load, which is currently the case.

Edited May 14, 2020 by Kays Ishaq
  • Discussion 0
  • Commits 6
  • Changes 3
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Kays Ishaq @kays

    changed the description

    May 14, 2020

    changed the description

    changed the description
    Toggle commit list
  • Kays Ishaq @kays

    changed target branch from master to next

    May 14, 2020

    changed target branch from master to next

    changed target branch from `master` to `next`
    Toggle commit list
  • Kays Ishaq @kays

    added 5 commits

    • 7f7ccc99...acdb4b42 - 4 commits from branch STJr:next
    • 53252f0d - Merge branch 'next' into musicpref-var

    Compare with previous version

    May 14, 2020

    added 5 commits

    • 7f7ccc99...acdb4b42 - 4 commits from branch STJr:next
    • 53252f0d - Merge branch 'next' into musicpref-var

    Compare with previous version

    added 5 commits <ul><li>7f7ccc99...acdb4b42 - 4 commits from branch <code>STJr:next</code></li><li>53252f0d - Merge branch &#39;next&#39; into musicpref-var</li></ul> [Compare with previous version](https://git.magicalgirl.moe/STJr/SRB2/merge_requests/939/diffs?diff_id=5390&start_sha=7f7ccc9911b058808bf5fdba892dee7643082bf3)
    Toggle commit list
  • Kays Ishaq @kays

    marked as a Work In Progress

    May 14, 2020

    marked as a Work In Progress

    marked as a **Work In Progress**
    Toggle commit list
  • Kays Ishaq @kays

    added 1 commit

    • fd31c5cd - Update

    Compare with previous version

    May 14, 2020

    added 1 commit

    • fd31c5cd - Update

    Compare with previous version

    added 1 commit <ul><li>fd31c5cd - Update</li></ul> [Compare with previous version](https://git.magicalgirl.moe/STJr/SRB2/merge_requests/939/diffs?diff_id=5391&start_sha=53252f0d1464d56f94b50dcd0080ebb6e5b23ce4)
    Toggle commit list
  • Kays Ishaq @kays

    unmarked as a Work In Progress

    May 14, 2020

    unmarked as a Work In Progress

    unmarked as a **Work In Progress**
    Toggle commit list
  • Kays Ishaq @kays

    added 1 commit

    • c2a54aca - Minor reorganization

    Compare with previous version

    May 14, 2020

    added 1 commit

    • c2a54aca - Minor reorganization

    Compare with previous version

    added 1 commit <ul><li>c2a54aca - Minor reorganization</li></ul> [Compare with previous version](https://git.magicalgirl.moe/STJr/SRB2/merge_requests/939/diffs?diff_id=5392&start_sha=fd31c5cd5eab28b2e16dc8983f8464cc9cd43628)
    Toggle commit list
  • Kays Ishaq @kays

    changed title from musicpref console variable to Console variable to select music preference

    May 14, 2020

    changed title from musicpref console variable to Console variable to select music preference

    changed title from **{-musicpref console variabl-}e** to **{+Console variable to select music preferenc+}e**
    Toggle commit list
  • Kays Ishaq @kays

    changed the description

    May 14, 2020

    changed the description

    changed the description
    Toggle commit list
  • Kays Ishaq @kays

    added 1 commit

    • 70896f90 - clean whitespace

    Compare with previous version

    May 14, 2020

    added 1 commit

    • 70896f90 - clean whitespace

    Compare with previous version

    added 1 commit <ul><li>70896f90 - clean whitespace</li></ul> [Compare with previous version](https://git.magicalgirl.moe/STJr/SRB2/merge_requests/939/diffs?diff_id=5393&start_sha=c2a54acae3665362a8f6b0eafe359c965197381e)
    Toggle commit list
  • Kays Ishaq @kays

    added 1 commit

    • f541c37e - Fix formatting

    Compare with previous version

    Jul 13, 2020

    added 1 commit

    • f541c37e - Fix formatting

    Compare with previous version

    added 1 commit <ul><li>f541c37e - Fix formatting</li></ul> [Compare with previous version](https://git.magicalgirl.moe/STJr/SRB2/merge_requests/939/diffs?diff_id=5963&start_sha=70896f9095f289eb8192ff6e533a2084425ad8f2)
    Toggle commit list
  • James R. @james

    merged

    Jul 26, 2020

    merged

    merged
    Toggle commit list
  • James R. @james

    mentioned in commit 63b15f78

    Jul 26, 2020

    mentioned in commit 63b15f78

    mentioned in commit 63b15f784f65ed1e874ca08648cc7a9de6cbf5c6
    Toggle commit list
  • Write
  • Preview
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View project labels
Reference: STJr/SRB2!939
×

Revert this merge request

This will create a new commit in order to revert the existing changes.

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.
×

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.