Steel Titanium
6eec21f49d
Merge branch 'master' into cmake-use-internal-libs
2018-11-13 19:46:43 -05:00
mazmazz
366aeadac4
Fix x64 build issue
2018-11-13 17:12:18 -05:00
mazmazz
4b63f20e9d
Merge branch 'musicplus-core' into musicplus-sdlmixerx
2018-11-13 14:34:40 -05:00
mazmazz
df7d23f00d
Merge branch 'master' into musicplus-core
2018-11-13 13:46:30 -05:00
Monster Iestyn
4c3bfe81bd
Merge branch 'public_next'
...
# Conflicts:
# src/Makefile
# src/doomtype.h
# src/hardware/hw_clip.c
# src/hardware/hw_main.c
# src/sdl12/sdl_sound.c
2018-11-10 19:18:34 +00:00
Monster Iestyn
51ee510b85
Merge branch 'gcc-compiling-cleanup' into 'master'
...
Compiling cleanup and fixes
See merge request STJr/SRB2!311
2018-11-10 13:56:17 -05:00
Monster Iestyn
7989e9a482
Merge branch 'public_next'
...
# Conflicts:
# src/d_netcmd.c
# src/d_netcmd.h
# src/dehacked.c
# src/g_game.h
# src/hardware/hw_draw.c
# src/hardware/hw_main.c
# src/lua_baselib.c
# src/lua_hook.h
# src/lua_hooklib.c
# src/lua_hudlib.c
# src/lua_libs.h
# src/lua_maplib.c
# src/lua_script.c
# src/m_misc.h
# src/p_mobj.c
# src/s_sound.c
# src/sdl12/mixer_sound.c
# src/w_wad.c
2018-11-10 15:41:57 +00:00
Monster Iestyn
b34e8c5390
Remove FUNCMATH from functions with a void return value or args, or examine variables other than their args (which could be modified)
2018-11-08 16:26:55 +00:00
Steel Titanium
d7a0a3c94b
Update copyright info on some files
2018-11-01 14:47:19 -04:00
Steel Titanium
9847e6d181
Merge remote-tracking branch 'upstream/master' into cmake-use-internal-libs
2018-10-30 21:06:06 -04:00
Monster Iestyn
a0c822fec8
Merge branch 'public_next'
...
# Conflicts:
# src/d_main.c
# src/m_menu.c
# src/s_sound.c
# src/sdl/sdl_sound.c
2018-10-20 15:31:48 +01:00
mazmazz
bf93dace76
Merge remote-tracking branch 'public-gitlab/master' into public-music-cleanup
2018-10-19 22:04:26 -04:00
Monster Iestyn
0b70c725c8
Merge branch 'public_next'
...
# Conflicts:
# src/nds/i_sound.c
# src/r_data.c
# src/sdl12/mixer_sound.c
# src/sdl12/sdl_sound.c
# src/win32ce/win_snd.c
2018-10-19 22:46:19 +01:00
Sryder
4132b39b9a
Add an int to I_PlaySound to tell an interface which channel number SRB2 is using.
...
I've voided this out on other sound interfaces than SDL Mixer ones because I'm both not sure whether they need it, and not sure how to make them work with it if they do.
2018-10-13 23:01:11 +01:00
Monster Iestyn
89d7c55878
Merge branch 'public_next'
...
# Conflicts:
# src/Makefile
# src/lua_script.c
# src/p_user.c
# src/sdl/i_system.c
# src/v_video.c
# src/w_wad.c
2018-10-10 14:51:34 +01:00
Sryder
a7ba0b958a
Tiny fix so that joystick2 being closed can let the JoystickSubSystem close before game close.
...
No memory leak here, just a very tiny thing I noticed.
2018-10-09 19:43:18 +01:00
Monster Iestyn
12752e0a43
Merge branch 'zlib-split' into 'master'
...
Makefile: Split zlib and libpng
See merge request STJr/SRB2!285
2018-10-08 07:20:27 -04:00
Steel Titanium
4d883e740d
Change order of the ifdef
2018-10-07 14:52:25 -04:00
Steel Titanium
fa1377d540
Move the ifdef
2018-10-07 14:45:03 -04:00
Sryder
d9d98ec1a9
Fix the crashing bug hopefully
...
A value of 1 in freesrc for Mix_LoadWAV_RW and Mix_LoadMus_RW calls SDL_RWclose on the RWops anyway.
For Mix_LoadWAV_RW the RWops is freed right after the data is loaded (because it makes a copy of the data in memory)
For Mix_LoadMUS_RW the RWops is freed when Mix_FreeMusic is called (because the data is not a copy)
So setting 1 on freesrc doesn't actually free the RWops immediately on Mix_LoadMus_RW *unless* it failed to load any music.
2018-10-07 10:37:45 +01:00
Sryder
00c36a9d9e
Fix compiler warnings.
2018-10-07 09:26:18 +01:00
Sryder
d7f373a42d
I think that should be NULL, not 0 actually.
2018-10-07 00:22:23 +01:00
Sryder
224b228089
Mix_QuickLoad_RAW sets a flag in the Mix_Chunk so that Mix_FreeChunk doesn't actually Free the sound.
...
Checks for the flag when freeing, and if it's 0, we free the data manually after Mix_FreeChunk.
I went back to Z_Malloc and Z_Free for this because they still work after this.
2018-10-07 00:15:42 +01:00
Sryder
052df3265e
Call SDL_RWclose after an SDL_RWFromMem call to close the RWops.
2018-10-07 00:15:11 +01:00
Steel Titanium
1656b77bc0
Restore deleted endif
2018-10-04 22:38:59 -04:00
Steel Titanium
2eb9bebcd9
Split zlib and libpng
2018-10-04 19:47:19 -04:00
Steel Titanium
5efb94a35b
Fix the weird indentation
2018-09-21 12:05:52 -04:00
Steel Titanium
7f7c5b60ae
Rearrange the code.
...
Thanks again MonsterIestyn!
2018-09-21 11:26:08 -04:00
Steel
502414d609
Remove this that somehow slipped in.
2018-09-21 07:21:49 -04:00
Steel
ac8658fac8
Fix up errors with buildbots
2018-09-21 07:16:54 -04:00
Steel Titanium
43cbb0d11e
Add some stuff
2018-09-20 18:33:50 -04:00
Steel Titanium
13a3f197bd
Use MemAvailable instead
2018-09-20 18:30:46 -04:00
mazmazz
fa5532b386
MP Jingle: Add fade timing hack after ending a non-looping song
2018-09-20 18:30:21 -04:00
mazmazz
3ec85a69ff
MP Mixer X: Fix double->UINT32 cast (buildbots)
2018-09-20 08:30:31 -04:00
mazmazz
82c049e80d
MP libopenmpt: Add doomdef.h header to load_libraries, resolve CONS_Printf (buildbots)
2018-09-20 08:23:29 -04:00
mazmazz
65314be0ec
MP Libopenmpt: Fix UINT32->double cast (buildbots)
2018-09-20 07:42:35 -04:00
mazmazz
bde488215f
MP Libopenmpt: SDL header in load_libraries
2018-09-20 07:39:53 -04:00
mazmazz
28b456c05d
MP Libopenmpt: Separate loading into sdl/load_libraries.c
2018-09-19 23:18:06 -04:00
mazmazz
000873cf50
Merge branch 'musicplus-core' into musicplus-sdlmixerx
2018-09-19 20:06:56 -04:00
mazmazz
6884a229f0
MP Core Mixer: Old-style function dec fixes (buildbots)
2018-09-19 19:41:38 -04:00
mazmazz
7a5cfe2514
MP Core Mixer fade: Use fixed instead of double calc (fixes buildbots)
2018-09-19 19:40:24 -04:00
mazmazz
494f172597
Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt
2018-09-19 19:32:49 -04:00
mazmazz
2db5278f47
Merge branch 'public-musicplus-core' into public-musicplus-jingle
2018-09-19 19:24:57 -04:00
mazmazz
43f6038d98
MP Core Mixer fade: Use fixed instead of double calc (fixes buildbots)
2018-09-19 19:18:35 -04:00
mazmazz
8eb2171fcd
MP Core Mixer: Old-style function dec fixes (buildbots)
2018-09-19 19:06:24 -04:00
mazmazz
ab89003cb2
Merge branch 'public-musicplus-core' into public-musicplus-jingle
2018-09-19 18:55:00 -04:00
mazmazz
a45d4e31be
Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt
2018-09-19 18:54:58 -04:00
mazmazz
fa22f65610
Merge branch 'musicplus-core' into musicplus-sdlmixerx
2018-09-19 18:53:41 -04:00
mazmazz
3d4228b8de
MP Core Mixer: Unused param fixes (buildbots)
2018-09-19 18:26:59 -04:00
mazmazz
fae377b896
MP Core Mixer: Unused param fixes (buildbots)
2018-09-19 18:26:33 -04:00
