mazmazz
95c41dd822
Detect GME more simply
2018-08-24 17:58:56 -04:00
mazmazz
5e48d50178
Stub I_UnloadSong because we already unload in I_StopMusic
...
* Stop-gap for now. Ideally the logic would be in the respective places.
2018-08-24 17:56:22 -04:00
mazmazz
8493d0bfcc
Volume fixes
2018-08-24 17:56:14 -04:00
mazmazz
2961d32e4a
A word
2018-08-24 13:41:26 -04:00
mazmazz
76ab06cdb2
Merge branch 'music-cleanup' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into music-cleanup
2018-08-24 13:36:07 -04:00
mazmazz
4962a2b9aa
GME fix: play song in I_PlaySong, not I_LoadSong
2018-08-24 13:35:41 -04:00
mazmazz
e1a8319013
Lua S_MusicInfo fix and FMOD GME fix: play song in I_PlaySong, not I_LoadSong
2018-08-24 13:12:14 -04:00
mazmazz
052f9f8a7c
Checkpoint: Revised fading routines for new load/play pattern
...
* Perform fade-out/fade-in using callbacks
* Move queued music from interface to s_sound
2018-08-24 13:11:38 -04:00
toaster
9acd891394
No longer are orbiting/trailing objects in charge of removing themselves.
...
* They're clearly not quick enough at the job, since it causes a bunch of silly race conditions.
* Instead, K_UpdateHnextList and K_CleanHnextList are in charge of removing them, which are called in the circumstances itemamount (and itemheld/eggmanheld) is changed.
* Also, tweak a few places so that trailers AND orbiters can use the same system.
Also, some minor thingies.
* Turn all the useless ```if (a) { A } else if (!a) { B }``` bullshit into ```if (a) { A } else { B }``` bullshit.
* Fix up some minor inaccuracies in the playerarrow stuff that doesn't result in creating more sprites.
2018-08-24 15:14:18 +01:00
toaster
75e8f19f71
Fix up the bugs from last night's hell netgame.
...
* The tab and intermissions rankings...
* ...now have parity in behaviour!
* ...now properly handle player counts over 8, and no longer supports player counts over 16!
* The Item Arrow in Battle...
* No longer develops any extremely stupid bugs due to Orbinaut sprites that makes all objects in state S_INVISIBLE develop <!>'s! (Ask me about this if you're curious as to how it affected everything else too.)
2018-08-24 13:36:03 +01:00
mazmazz
5188dcfd87
Lua method reordering for Musicplus
...
* Change to S_MusicName to S_MusicInfo for API
2018-08-23 21:23:55 -04:00
mazmazz
1f5e62197e
Merge branch 'music-cleanup' into musicplus-core
...
Pending rewrite of fade music changing
# Conflicts:
# src/android/i_sound.c
# src/djgppdos/i_sound.c
# src/i_sound.h
# src/s_sound.c
# src/s_sound.h
# src/sdl/mixer_sound.c
# src/sdl/sdl_sound.c
# src/win32/win_snd.c
2018-08-23 21:07:39 -04:00
mazmazz
5972ff3e90
Refactor I_MusicType MusicPlaying and MusicPaused other targets
2018-08-23 20:23:16 -04:00
mazmazz
8533e08ded
Refactor I_MusicType MusicPlaying and MusicPaused -> I_SongType ...
2018-08-23 20:14:46 -04:00
Monster Iestyn
c22102b465
Rewrite seenames HUD code even more; use text color flags rather than the special text color chars
2018-08-23 23:00:15 +01:00
mazmazz
2b9cadd477
Refactoring and reordering other targets
2018-08-23 17:54:40 -04:00
Monster Iestyn
f97ea7db39
Add INFLIVES as a constant that Lua/SOC can use
2018-08-23 22:18:52 +01:00
Monster Iestyn
62caadbf19
Make switch case for cv_seenames.value in ST_Drawer
2018-08-23 22:09:48 +01:00
mazmazz
13dfbb0fdb
Minor refactoring and reordering
...
* I_GetMusicType() -> I_MusicType()
* Wrap MIDI volume hack in #ifdef _WIN32
2018-08-23 17:05:37 -04:00
Monster Iestyn
e37a6c767c
Add quick macro for drawing the 1st person timer icons with timer string, add comments to ST_drawPowerupHUD
2018-08-23 22:00:37 +01:00
mazmazz
c8b1f07e9b
Play the opposite type music (Digital/MIDI) when toggling between them in menu
...
* S_MusicInfo method to retrieve name, flags, and looping
2018-08-23 16:46:40 -04:00
Monster Iestyn
bf5d0385d8
ST_drawNiGHTSHUD tweaks: Split NiGHTS link drawing into its own function, remove "minlink" hack and just do things properly
2018-08-23 21:13:45 +01:00
Monster Iestyn
2a307f4524
Make switch case for stplyr->textvar in ST_drawNightsRecords
2018-08-23 20:27:40 +01:00
Monster Iestyn
dc6b52a449
Add INFLIVES macro, to make it easier to find infinite lives-related code
2018-08-23 20:09:39 +01:00
mazmazz
5bd77e605a
Toggle Digi/MIDI music in menu accurately; add S_MusicType
2018-08-23 13:09:20 -04:00
TehRealSalt
00befcf281
Spring jump changes for Grow & Shrink
...
All spring jump issues on the sheet are fixed now.
2018-08-23 12:53:29 -04:00
mazmazz
971b5c6727
nodigimusic nomusic nosound refactor other targets
2018-08-23 12:43:38 -04:00
mazmazz
675bb16521
nodigimusic nomusic nosound -> digital_disabled midi_disabled sound_disabled
2018-08-23 12:42:57 -04:00
mazmazz
8830943906
I_MusicPlaying, I_MusicPaused other targets
2018-08-23 12:31:01 -04:00
mazmazz
ff26baa6a1
Refactoring, music statues
...
* S_Init -> S_InitSfxChannels because it did mostly SFX anyway
* S_MusicPlaying, S_MusicPaused, S_MusicName, S_MusicExists new status methods
* I_MusicPlaying, I_MusicPaused
2018-08-23 12:30:47 -04:00
mazmazz
d79f38871e
Consolidate I_SetDigMusicVolume and I_SetMIDIMusicVolume other targets
2018-08-23 11:54:58 -04:00
mazmazz
a672d38bba
Consolidate I_SetDigMusicVolume and I_SetMIDIMusicVolume into one method
...
* In s_sound, they are merged to one method as well, but there are still two separate digvolume and seqvolume variables
* Simplified Dig/MidiMusicDisabled in s_sound
* Method reordering
2018-08-23 11:54:36 -04:00
mazmazz
70d3315ac4
Added I_GetMusicType and removed midimode variable: other targets
2018-08-23 10:19:04 -04:00
mazmazz
f2c4396299
Added I_GetMusicType and removed midimode variable
...
* Revised S_PlayMusic arguments
* Now music plays again!
2018-08-23 10:18:38 -04:00
mazmazz
a7df3be449
Loose ends other targets
2018-08-23 09:37:02 -04:00
mazmazz
ad7bfb49fa
Loose ends from previous work
...
* Pause/ResumeSong remove handle argument
* LoadSong declare char *data argument
* Variable weirdness
2018-08-23 09:36:51 -04:00
mazmazz
b4b4285666
Revert "Nix'd midimusicvolume other targets"
...
This reverts commit 31fd0f0cf5
2018-08-23 09:09:12 -04:00
mazmazz
8be165db5b
Playback routines other targets
2018-08-23 09:06:31 -04:00
mazmazz
69bee086bf
Revert "Nix'd midimusicvolume", don't know what I want to do with this yet
...
This reverts commit 5a2663704e
2018-08-23 09:06:13 -04:00
mazmazz
e8815df145
Playback routines: Load, Play, Pause, Stop, Unload
...
* Re-purpose I_LoadSong for digital music loading
* I_StartDigSong logic split between I_LoadSong and I_PlaySong
* Pause, Stop, and Unload routines are combined from Digi and MIDI
* music_lumpnum, music_data, music_handle from s_sound.c are gone
2018-08-23 09:02:14 -04:00
mazmazz
d159d8cad7
Revert "CHANGED MIND: Nix'd S_MIDIMusic, I_PlaySong, and I_RegisterSong"
...
This reverts commit 3b94dd8d34
2018-08-23 07:50:02 -04:00
mazmazz
3b94dd8d34
CHANGED MIND: Nix'd S_MIDIMusic, I_PlaySong, and I_RegisterSong
...
* music_lumpnum, music_data, music_handle are gone
* Relevant interfaces I_PlaySong are transferred to I_StartDigSong
2018-08-23 07:49:09 -04:00
mazmazz
31fd0f0cf5
Nix'd midimusicvolume other targets
2018-08-23 07:39:45 -04:00
mazmazz
5a2663704e
Nix'd midimusicvolume
2018-08-23 07:39:32 -04:00
Monster Iestyn
785ba3abdd
Merge branch 'master' into tutorial-time
2018-08-22 21:30:29 +01:00
Monster Iestyn
dbec486af1
Merge branch 'cez-bramble-hardcode' into 'master'
...
CEZ Bramble Hardcode
See merge request STJr/SRB2Internal!169
2018-08-22 14:47:04 -04:00
Monster Iestyn
fa637475ae
Hardcoded Brambles.lua from CEZRes.pk3, changed thing type to 1125
2018-08-22 17:16:11 +01:00
mazmazz
adce4db5aa
Update SDL Windows dependency to 2.0.8
...
* To do: Update Visual Studio .lib files
2018-08-22 11:39:29 -04:00
mazmazz
43e908e7c4
SDL Mixer X compile on Windows x86
2018-08-22 00:17:25 -04:00
mazmazz
593176c664
Initial work on SDL Mixer X
2018-08-21 14:57:53 -04:00
