Commit graph

1845 commits

Author SHA1 Message Date
Ozkan Sezer
ca71fe55db SDL2: rebuilt from hg-latest (r13387:8a12cc1abc9e)
Changes include a fix for a nasty locale issue on macOS.

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1668 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-12-30 22:22:14 +00:00
Ozkan Sezer
1cc282c918 missed updating libmpg123 import libraries for Visual Studio in r6129..
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1667 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-12-30 02:10:08 +00:00
Ozkan Sezer
bd35af8922 oslibs, codecs: updated libmpg123 build.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1666 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-12-29 17:00:07 +00:00
Ozkan Sezer
65825de11a snd_mp3tag.c: check for false positives if id3v1 is not at file's end.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1665 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-12-29 16:50:06 +00:00
Ozkan Sezer
a1eff43d80 snd_mp3tags: let it consume all the tags at file end.
We do not know the order of ape, or lyrics3, or musicmatch tags,
so we loop until we consume all, scanning for each tag type once.
I don't yet care about freaky broken mp3 files with double tags.

<rant> MP3 standard has no metadata format, so everyone invented
their own thing, even with extensions, until ID3v2 became dominant:
Hence the impossible mess there.</rant>

Also remove inline directive from a few detection procedures there.

(updates from my code in SDL_mixer.)

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1664 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-12-23 21:35:16 +00:00
Ozkan Sezer
309ba8f7b6 SDL2: rebuilt from hg-latest (r13382:7cc4fc886d9e)
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1663 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-12-23 21:29:17 +00:00
Eric Wasylishen
42c0491e92 r_world.c: workaround Intel UHD 600 driver bug
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1662 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-12-15 23:52:13 +00:00
Ozkan Sezer
e0e2d16ca2 snd_mpg123.c: use mp3_skiptags(). tidy-up a little.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1661 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-12-12 14:10:14 +00:00
Ozkan Sezer
17209fd330 snd_mp3tag.c: tidy-up return code. add a failsafe for fshandle_t.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1660 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-12-12 14:04:01 +00:00
Ozkan Sezer
386e56258d snd_mp3.c: move skiptags() call to codecopen(), print error if it fails.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1659 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-12-12 14:01:02 +00:00
Ozkan Sezer
ffe43cf024 snd_mp3.c: moved mp3 tag stuff into a separate module snd_mp3tag.c
so that it can be used in snd_mpg123.c, too, if needed.

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1658 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-12-12 11:37:32 +00:00
Ozkan Sezer
b2bf251a32 snd_mp3.c: removed unnecessary file rewind calls in tag detection code.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1657 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-12-12 08:23:12 +00:00
Ozkan Sezer
3b4a07ca87 snd_mp3.c: Tag detection fixes, updates, and clean-ups:
- Updates from my code in SDL_mixer:
- Fix APE header presence detection: APEv2 doesn't guarantee header.
  We rely on bit31 of the flags field of the header/footer, instead.
- Add code to skip Lyrics3 v1 / v2 tags.
- Remove the non-standard 'Extended ID3v1' tag support: None of the
  significant libraries like getID3, taglib or libid3tag support it.
  Not supported in most, if not all mp3 players, either.
- The 'APE before ID3v1' was duplicated code because we removed the
  TAG+ support: removed it.
- Add a FIXME note about handling possible double-ID3v1 tags.
- Add a FIXME note about order of tags at the end of the file.
- A few minor tidy-ups.

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1656 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-12-08 14:00:50 +00:00
Ozkan Sezer
f2624687f1 oslibs: rebuilt libmikmod with updates applied from mainstream
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1655 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-12-08 13:29:33 +00:00
Eric Wasylishen
361c66d06a Reject lit files if they're the wrong size (eg hipnotic/start.bsp vs id1/start.lit or just a bsp that no longer has any coloured lits, etc).
From Spike.

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1654 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-11-20 02:47:04 +00:00
Ozkan Sezer
799b48d3f8 oslibs, codecs: updated libflac and libopusfile builds.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1653 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-11-18 09:51:03 +00:00
Ozkan Sezer
6abf2afbe6 lodepng.c: fix LODEPNG_RESTRICT for gcc
previously, it ignored any gcc with __GNUC_MINOR__ == 0.
(patch submitted to upstream at github as PR/120)

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1652 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-11-18 09:47:04 +00:00
Ozkan Sezer
93aca471a3 minor update from SDL-1.2 mainstream tree. (our binaries don't change.)
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1650 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-11-13 11:55:04 +00:00
Ozkan Sezer
a1ae4bdc7c revert r1647
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1649 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-11-12 07:35:22 +00:00
Ozkan Sezer
c2dbafef4b lodepng.c: minor update (cf. mainstream PR/119)
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1648 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-11-11 22:14:22 +00:00
Ozkan Sezer
626280708b oslibs: rebuilt libflac decoder after applying a fix from mainstream
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1647 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-11-11 11:38:59 +00:00
Ozkan Sezer
8ebb9dc117 lodepng.c (lodepng_zlib_compress): Fix alloc fail check.
From https://github.com/lvandeve/lodepng/pull/118

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1646 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-11-11 09:37:06 +00:00
Ozkan Sezer
da43c6a57b r_brush.c (AllocBlock): add a FIXME note about a valgrind warning.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1645 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-11-11 09:35:19 +00:00
Ozkan Sezer
82289e3de7 SDL2: rebuilt from latest SDL2-hg-r13229.
fixes a missing export in previous build.

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1644 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-11-05 07:01:09 +00:00
Ozkan Sezer
027ed8735c SDL2: rebuilt from latest SDL2-hg-r13226 to test upcoming v2.0.12.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1643 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-11-02 07:20:12 +00:00
Ozkan Sezer
0eccebd694 rebuilt SDL-1.2 from latest source.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1642 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-11-02 07:14:02 +00:00
Ozkan Sezer
abe7868de1 oslibs: rebuilt FLAC and mpg123 decoders.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1641 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-11-02 07:11:17 +00:00
Ozkan Sezer
d3294e3001 update docs
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1640 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-09-20 18:41:06 +00:00
Ozkan Sezer
21915e956c snd_sdl.c: pass NULL as the 'obtained' spec to SDL_OpenAudio():
this way, SDL will convert to hardware format for us if needed.
most of the times we do get what we want. however, for example,
the WASAPI backend of SDL2 returns AUDIO_F32LSB as the obtained
format (which is not an SDL thing but a WASAPI thing) and we do
not support that. the SDL2.dll we ship with has WASAPI disabled,
but if the user replaces our dll with a one with WASAPI enabled
(official libsdl.org build or his own build) then we refuse the
obtained AUDIO_F32LSB format and run without sound.  after this
patch, such a thing is transparent to us.

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1639 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-09-20 18:40:00 +00:00
Ozkan Sezer
e04c0b49af remove Steve's name from quit menu message too, per his request.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1638 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-09-18 09:39:00 +00:00
Ozkan Sezer
196f89a239 GL_BuildLightmaps: minor warning fixes. more accurate developer warning.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1637 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-09-18 09:17:24 +00:00
Ozkan Sezer
511d4bb908 remove Steve's name from various doco/contacts as per his request.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1636 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-09-17 11:10:18 +00:00
Ozkan Sezer
61a6d27a01 oslibs, codecs: rebuilt flac decoder after applying fixes from upstream
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1635 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-09-16 11:10:28 +00:00
Ozkan Sezer
57ad299dfa r_brush.c (AllocBlock): add casts to malloc and realloc
( in case someone wants to build using C++ compilers. )

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1634 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-09-16 11:00:38 +00:00
Ozkan Sezer
d130c42172 SDL2: rebuilt from latest SDL2-hg-r13074 to test upcoming v2.0.11.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1633 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-09-12 17:20:28 +00:00
Ozkan Sezer
ee57dddb37 oslibs: rebuilt SDL-1.2 from latest mainstream source.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1632 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-09-12 17:14:01 +00:00
Ozkan Sezer
13d8e8f704 bump version to 0.93.2, update changelog.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1631 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-09-12 12:36:59 +00:00
Ozkan Sezer
39b4fccb44 move LMBLOCK_WIDTH/HEIGHT from bspfile.h to glquake.h
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1630 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-09-12 12:34:12 +00:00
Ozkan Sezer
0a6a5c62c8 minor simplification
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1629 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-09-12 12:33:02 +00:00
Eric Wasylishen
e041b958c7 r_brush.c: dynamically allocate lightmaps, from QuakeSpasm-Spike
This raises LMBLOCK_WIDTH/HEIGHT from 128 to 256 which should
be supported everywhere and decrease draw calls

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1628 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-09-12 06:49:35 +00:00
Eric Wasylishen
f2930ef460 r_brush.c: rename BLOCK_WIDTH/HEIGHT to LMBLOCK_WIDTH/HEIGHT to match QSS
(no other changes)

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1627 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-09-12 06:49:27 +00:00
Eric Wasylishen
12e781ba46 raise MAXALIASTRIS from 2048 to 4096 so SlayerTest mdl's load.
TODO: look at switching to Spike's mdl code from QSS
TODO: add "exceeds standard limit" warnings

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1626 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-09-12 04:06:57 +00:00
Eric Wasylishen
6924a94fa6 Mod_LoadAliasModel: don't corrupt memory if MAXALIASTRIS exceeded
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1625 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-09-12 04:06:55 +00:00
Eric Wasylishen
429b29a669 Sky_NewMap: avoid stack buffer underflow on the "remove trailing spaces"
line that happened if a map had an empty string worldspawn key,
detected by ASan on macOS with demo_map.bsp from SlayerTest.

Also prevent the strcpy's from overflowing the buffers in case of long
keys.

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1624 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-09-12 04:06:54 +00:00
Ozkan Sezer
0e6c4f27cc update lodepng to 20190824 version from mainstream.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1623 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-08-28 00:10:02 +00:00
Ozkan Sezer
e4eae98ab4 watcom makefiles: make wlink quiet
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1622 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-08-28 00:01:04 +00:00
Ozkan Sezer
c762d597fc SDL2: rebuilt from latest SDL2-hg-r13033 to test upcoming v2.0.11.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1621 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-08-24 09:21:07 +00:00
Ozkan Sezer
0351068457 oslibs, SDL-1.2: rebuilt from latest code (1.2.16).
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1620 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-08-23 08:47:40 +00:00
Ozkan Sezer
92758e8591 update lodepng to 20190814 version from mainstream.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1619 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-08-15 12:01:54 +00:00
Ozkan Sezer
0e6d131547 oslibs, SDL-1.2: rebuilt from latest code (1.2.16).
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1618 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-08-03 11:47:14 +00:00