comment out directsound thing

somehow this still applied on 32 bit build

libs/SDL2_mixer/CHANGES.txt

@@ -1,3 +1,69 @@
+2.8.1:
+ * Added Stop/Start/Pause/Resume for Fluidsynth
+
+2.8.0:
+ * Added support for loading wavpack sound files (https://www.wavpack.com/)
+ * Added support for loading classic console sound files using Game_Music_Emu (https://github.com/libgme/game-music-emu)
+ * Use minimp3 instead of dr_mp3 as the default backend for MP3 music
+ * Use libxmp instead of modplug as the default backend for MOD music
+   To use libmodplug instead, configure using --enable-music-mod-modplug --disable-music-mod-xmp
+ * Added support for FLAC audio in Ogg containers
+ * Added Mix_PauseAudio() to pause and resume all audio playback
+ * Added Mix_GetNumTracks() and Mix_StartTrack() for managing tracks in GME files
+
+2.6.2:
+ * Updated autotools to use ax_compute_relative_paths, fixing homebrew on macOS
+
+2.6.1:
+ * Fixed issue with incorrect version reported by pkg-config
+
+2.6.0:
+ * Added support for building with CMake
+ * Added support for playing Ogg files using stb_vorbis, which is now the default Vorbis backend.
+   To use libvorbis instead, configure using --disable-music-ogg-stb --enable-music-ogg-vorbis
+ * Added support for playing FLAC files using dr_flac, which is now the default FLAC music backend.
+   To use libflac instead, configure using --disable-music-flac-drflac --enable-music-flac-libflac
+ * Added support for playing MP3 files using dr_mp3, which is now the default MP3 music backend.
+   To use libmpg123 instead, configure using --disable-music-mp3-drmp3 --enable-music-mp3-mpg123
+ * Added libxmp support for mod music playback. Modplug is still the default backend for MOD music.
+   To use libxmp instead, configure using --disable-music-mod-modplug --enable-music-mod-xmp
+ * Removed support for libmad as a MP3 music backend.
+ * Removed support for libmikmod as a MOD music backend.
+ * Added Mix_MasterVolume() for additional volume control over all channels
+ * Update Mix_Init() return value to match documentation, including MIXER_INIT_* flags for already-initialized modules
+ * Added Mix_HasMusicDecoder()
+ * Memory leak fixes and F32 format support to fluidsynth player
+ * Fixed distorted MIDI playback with FluidSynth if sample rate is out of library's limits
+ * Added Mix_ModMusicJumpToOrder() for mod music formats
+ * Enabled module internal loops in modplug player
+ * Respect original mp3 file offset
+ * Support setting soundfont via SDL_SOUNDFONTS in OSX native midi
+ * Fixed mp3 file detection
+ * Fixes to ogg playback on big-endian devices
+ * Added functions to get metadata information:
+    Mix_GetMusicTitle()
+    Mix_GetMusicTitleTag()
+    Mix_GetMusicArtistTag()
+    Mix_GetMusicAlbumTag()
+    Mix_GetMusicCopyrightTag()
+ * Add functions to get loop point information:
+    Mix_GetMusicLoopStartTime()
+    Mix_GetMusicLoopEndTime()
+    Mix_GetMusicLoopLengthTime()
+ * Added Mix_GetMusicVolume() and Mix_GetMusicPosition()
+ * Added Mix_MusicDuration() to return music duration in seconds
+ * Fixed music_mpg123 seek bug when sample rate of the file and the stream don't match
+ * Timidity improvements, added Mix_SetTimidityCfg()
+ * Improved mp3 tag detection/skipping
+ * Extended support for WAV files
+ * Allow rmid files be opened by native midi
+ * Fixed possible crash in win32 native midi
+ * Prevent clipping due to volume settings in modplug music
+ * Added looping support for Opus files
+ * Added looping support for FLAC files
+ * Improved OGG looping support
+ * Fixed loading Opus audio as audio chunks
+
 2.0.4:
 Ozkan Sezer - Wed, 10 Oct 2018 14:56:10
  * Removed smpeg support for mp3 music, now that it's replaced by libmpg123

libs/SDL2_mixer/COPYING.txt

@@ -1,20 +0,0 @@
-/*
-  SDL_mixer:  An audio mixer library based on the SDL library
-  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/

libs/SDL2_mixer/LICENSE.FLAC.txt

@@ -1,32 +0,0 @@
-The source code to this library used with SDL_mixer can be found here:
-https://hg.libsdl.org/SDL_mixer/file/default/external
----
-
-Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007  Josh Coalson
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-- Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-- Neither the name of the Xiph.org Foundation nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

libs/SDL2_mixer/LICENSE.modplug.txt

@@ -1,5 +0,0 @@
-The source code to this library used with SDL_mixer can be found here:
-https://hg.libsdl.org/SDL_mixer/file/default/external
----
-
-ModPlug-XMMS and libmodplug are now in the public domain.

libs/SDL2_mixer/LICENSE.mpg123.txt

@@ -1,776 +0,0 @@
-The source code to this library used with SDL_mixer can be found here:
-https://hg.libsdl.org/SDL_mixer/file/default/external
----
-
-This is the file that contains the terms of use, copying, etc. for the mpg123 distribution package.
-
-Main message, to include in "About ..." boxes, etc:
-
-	Copyright (c) 1995-2013 by Michael Hipp and others,
-	free software under the terms of the LGPL v2.1
-
-There is an attempt to cover the actual list of authors in the AUTHORS file.
-Project maintainer since 2006 is Thomas Orgis and many people have contributed
-since the Michael Hipp era, but he stays the initial source and it would
-be impractical to count them all individually, so it's "and others".
-Source files contain the phrase "the mpg123 project" to the same effect
-in their license boilerplate; especially those that were added after
-maintainership changed. The person mainly responsible for the first version
-is usually named in the phrase "initially written by ...".
-
-All files in the distribution that don't carry a license note on their own are
-licensed under the terms of the LGPL 2.1; exceptions may apply, especially to
-files not in the official distribution but in the revision control repository.
-
-The formal license text follows.
-
-=======================
-1. The LGPL version 2.1
-=======================
-
-
-  GNU LESSER GENERAL PUBLIC LICENSE
-       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-  
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-     END OF TERMS AND CONDITIONS
-
-
-====================
-2. The GPL version 2
-====================
-
-
-   GNU GENERAL PUBLIC LICENSE
-       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-     END OF TERMS AND CONDITIONS

libs/SDL2_mixer/LICENSE.ogg-vorbis.txt

@@ -1,32 +0,0 @@
-The source code to this library used with SDL_mixer can be found here:
-https://hg.libsdl.org/SDL_image/file/default/external
----
-
-Copyright (c) 2002-2008 Xiph.org Foundation
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-- Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-- Neither the name of the Xiph.org Foundation nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION
-OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

libs/SDL2_mixer/LICENSE.opus.txt

@@ -1,48 +0,0 @@
-The source code to this library used with SDL_mixer can be found here:
-https://hg.libsdl.org/SDL_mixer/file/default/external
----
-
-Copyright 2001-2011 Xiph.Org, Skype Limited, Octasic,
-                    Jean-Marc Valin, Timothy B. Terriberry,
-                    CSIRO, Gregory Maxwell, Mark Borgerding,
-                    Erik de Castro Lopo
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-- Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-- Neither the name of Internet Society, IETF or IETF Trust, nor the 
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Opus is subject to the royalty-free patent licenses which are
-specified at:
-
-Xiph.Org Foundation:
-https://datatracker.ietf.org/ipr/1524/
-
-Microsoft Corporation:
-https://datatracker.ietf.org/ipr/1914/
-
-Broadcom Corporation:
-https://datatracker.ietf.org/ipr/1526/

libs/SDL2_mixer/LICENSE.opusfile.txt

@@ -1,32 +0,0 @@
-The source code to this library used with SDL_mixer can be found here:
-https://hg.libsdl.org/SDL_mixer/file/default/external
----
-
-Copyright (c) 1994-2013 Xiph.Org Foundation and contributors
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-- Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-- Neither the name of the Xiph.Org Foundation nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION
-OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

libs/SDL2_mixer/LICENSE.txt

@@ -0,0 +1,17 @@
+Copyright (C) 1997-2025 Sam Lantinga <slouken@libsdl.org>
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.

libs/SDL2_mixer/README.txt

@@ -1,54 +1,31 @@
 
 SDL_mixer 2.0
 
-The latest version of this library is available from:
-http://www.libsdl.org/projects/SDL_mixer/
+The latest version of this library is available from GitHub:
+https://github.com/libsdl-org/SDL_mixer/releases
 
 Due to popular demand, here is a simple multi-channel audio mixer.
-It supports 8 channels of 16 bit stereo audio, plus a single channel
-of music.
+It supports 8 channels of 16 bit stereo audio, plus a single channel of music. It can load FLAC, MP3, Ogg, VOC, and WAV format audio. It can also load MIDI, MOD, and Opus audio, depending on build options (see the note below for details.)
 
-See the header file SDL_mixer.h and the examples playwave.c and playmus.c
-for documentation on this mixer library.
+See the header file SDL_mixer.h and the examples playwave.c and playmus.c for documentation on this mixer library. This documentation is also available online at https://wiki.libsdl.org/SDL2_mixer
 
-The mixer can currently load Microsoft WAVE files and Creative Labs VOC
-files as audio samples, it can load FLAC files with libFLAC, it can load
-Ogg Vorbis files with Ogg Vorbis or Tremor libraries, it can load MP3 files
-using mpg123 or libmad, and it can load MIDI files with Timidity,
-FluidSynth, and natively on Windows, Mac OSX, and Linux, and finally it can
-load the following file formats via ModPlug or MikMod: .MOD .S3M .IT .XM.
+The process of mixing MIDI files to wave output is very CPU intensive, so if playing regular WAVE files sound great, but playing MIDI files sound choppy, try using 8-bit audio, mono audio, or lower frequencies.
 
-Tremor decoding is disabled by default; you can enable it by passing
-	--enable-music-ogg-tremor
-to configure, or by defining MUSIC_OGG and OGG_USE_TREMOR.
-
-libmad decoding is disabled by default; you can enable it by passing
-	--enable-music-mp3-mad
-to configure, or by defining MUSIC_MP3_MAD
-vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
-WARNING: The license for libmad is GPL, which means that in order to
-         use it your application must also be GPL!
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The process of mixing MIDI files to wave output is very CPU intensive,
-so if playing regular WAVE files sound great, but playing MIDI files
-sound choppy, try using 8-bit audio, mono audio, or lower frequencies.
-
-To play MIDI files using FluidSynth, you'll need to set the SDL_SOUNDFONTS
-environment variable to a Sound Font 2 (.sf2) file containing the musical
-instruments you want to use for MIDI playback.
+If you have built with FluidSynth support, you'll need to set the SDL_SOUNDFONTS environment variable to a Sound Font 2 (.sf2) file containing the musical instruments you want to use for MIDI playback.
 (On some Linux distributions you can install the fluid-soundfont-gm package)
 
-To play MIDI files using Timidity, you'll need to get a complete set of
-GUS patches from:
+To play MIDI files using Timidity, you'll need to get a complete set of GUS patches from:
 http://www.libsdl.org/projects/mixer/timidity/timidity.tar.gz
 and unpack them in /usr/local/lib under UNIX, and C:\ under Win32.
 
-iOS:
-In order to use this library on iOS, you should include the SDL.xcodeproj
-and Xcode-iOS/SDL_mixer.xcodeproj in your application, add the SDL/include
-and SDL_mixer directories to your "Header Search Paths" setting, then add the
-libSDL2.a and libSDL2_mixer.a to your "Link Binary with Libraries" setting.
+This library is under the zlib license, see the file "LICENSE.txt" for details.
 
-This library is under the zlib license, see the file "COPYING.txt" for details.
+Note:
+Support for software MIDI, MOD, and Opus are not included by default because of the size of the decode libraries, but you can get them by running external/download.sh
+- When building with CMake, you can enable the appropriate SDL2MIXER_* options defined in CMakeLists.txt. SDL2MIXER_VENDORED allows switching between system and vendored libraries.
+- When building with configure/make, you can build and install them normally and the configure script will detect and use them.
+- When building with Visual Studio, you will need to build the libraries and then add the appropriate LOAD_* preprocessor define to the Visual Studio project.
+- When building with Xcode, you can edit the config at the top of the project to enable them, and you will need to include the appropriate framework in your application.
+- For Android, you can edit the config at the top of Android.mk to enable them.
 
+The default MP3 support is provided using minimp3. SDL_mixer also supports using libmpg123: you can enable it by passing --enable-music-mp3-mpg123 to configure.

libs/SDL2_mixer/i686-w64-mingw32/lib/cmake/SDL2_mixer/FindFLAC.cmake

@@ -0,0 +1,44 @@
+include(FindPackageHandleStandardArgs)
+
+find_package(PkgConfig QUIET)
+pkg_check_modules(PC_FLAC QUIET flac)
+
+find_library(FLAC_LIBRARY
+    NAMES FLAC
+    HINTS ${PC_FLAC_LIBDIR}
+)
+
+find_path(FLAC_INCLUDE_PATH
+    NAMES FLAC/all.h
+    HINTS ${PC_FLAC_INCLUDEDIR}
+)
+
+if(PC_FLAC_FOUND)
+    get_flags_from_pkg_config("${FLAC_LIBRARY}" "PC_FLAC" "_flac")
+endif()
+
+set(FLAC_COMPILE_OPTIONS "${_flac_compile_options}" CACHE STRING "Extra compile options of FLAC")
+
+set(FLAC_LINK_LIBRARIES "${_flac_link_libraries}" CACHE STRING "Extra link libraries of FLAC")
+
+set(FLAC_LINK_OPTIONS "${_flac_link_options}" CACHE STRING "Extra link flags of FLAC")
+
+set(FLAC_LINK_DIRECTORIES "${_flac_link_directories}" CACHE PATH "Extra link directories of FLAC")
+
+find_package_handle_standard_args(FLAC
+    REQUIRED_VARS FLAC_LIBRARY FLAC_INCLUDE_PATH
+)
+
+if(FLAC_FOUND)
+    if(NOT TARGET FLAC::FLAC)
+        add_library(FLAC::FLAC UNKNOWN IMPORTED)
+        set_target_properties(FLAC::FLAC PROPERTIES
+            IMPORTED_LOCATION "${FLAC_LIBRARY}"
+            INTERFACE_INCLUDE_DIRECTORIES "${FLAC_INCLUDE_PATH}"
+            INTERFACE_COMPILE_OPTIONS "${FLAC_COMPILE_OPTIONS}"
+            INTERFACE_LINK_LIBRARIES "${FLAC_LINK_LIBRARIES}"
+            INTERFACE_LINK_OPTIONS "${FLAC_LINK_OPTIONS}"
+            INTERFACE_LINK_DIRECTORIES "${FLAC_LINK_DIRECTORIES}"
+        )
+    endif()
+endif()

libs/SDL2_mixer/i686-w64-mingw32/lib/cmake/SDL2_mixer/FindFluidSynth.cmake

@@ -0,0 +1,44 @@
+include(FindPackageHandleStandardArgs)
+
+find_package(PkgConfig QUIET)
+pkg_check_modules(PC_FLUIDSYNTH QUIET fluidsynth)
+
+find_library(FluidSynth_LIBRARY
+    NAMES fluidsynth libfluidsynth
+    HINTS ${PC_FLUIDSYNTH_LIBDIR}
+)
+
+find_path(FluidSynth_INCLUDE_PATH
+    NAMES fluidsynth.h
+    HINTS ${PC_FLUIDSYNTH_INCLUDEDIR}
+)
+
+if(PC_FLUIDSYNTH_FOUND)
+    get_flags_from_pkg_config("${FluidSynth_LIBRARY}" "PC_FLUIDSYNTH" "_fluidsynth")
+endif()
+
+set(FluidSynth_COMPILE_OPTIONS "${_fluidsynth_compile_options}" CACHE STRING "Extra compile options of FluidSynth")
+
+set(FluidSynth_LINK_LIBRARIES "${_fluidsynth_link_libraries}" CACHE STRING "Extra link libraries of FluidSynth")
+
+set(FluidSynth_LINK_OPTIONS "${_fluidsynth_link_options}" CACHE STRING "Extra link flags of FluidSynth")
+
+set(FluidSynth_LINK_DIRECTORIES "${_fluidsynth_link_directories}" CACHE PATH "Extra link directories of FluidSynth")
+
+find_package_handle_standard_args(FluidSynth
+    REQUIRED_VARS FluidSynth_LIBRARY FluidSynth_INCLUDE_PATH
+)
+
+if(FluidSynth_FOUND)
+    if(NOT TARGET FluidSynth::libfluidsynth)
+        add_library(FluidSynth::libfluidsynth UNKNOWN IMPORTED)
+        set_target_properties(FluidSynth::libfluidsynth PROPERTIES
+            IMPORTED_LOCATION "${FluidSynth_LIBRARY}"
+            INTERFACE_INCLUDE_DIRECTORIES "${FluidSynth_INCLUDE_PATH}"
+            INTERFACE_COMPILE_OPTIONS "${FluidSynth_COMPILE_OPTIONS}"
+            INTERFACE_LINK_LIBRARIES "${FluidSynth_LINK_LIBRARIES}"
+            INTERFACE_LINK_OPTIONS "${FluidSynth_LINK_OPTIONS}"
+            INTERFACE_LINK_DIRECTORIES "${FluidSynth_LINK_DIRECTORIES}"
+        )
+    endif()
+endif()

libs/SDL2_mixer/i686-w64-mingw32/lib/cmake/SDL2_mixer/FindOpusFile.cmake

@@ -0,0 +1,49 @@
+include(FindPackageHandleStandardArgs)
+
+find_package(PkgConfig QUIET)
+pkg_check_modules(PC_OPUSFILE QUIET opusfile)
+
+find_library(OpusFile_LIBRARY
+    NAMES opusfile
+    HINTS ${PC_OPUSFILE_LIBDIR}
+)
+
+find_path(OpusFile_INCLUDE_PATH
+    NAMES opusfile.h
+    PATH_SUFFIXES opus
+    HINTS ${PC_OPUSFILE_INCLUDEDIR}
+)
+
+if(PC_OPUSFILE_FOUND)
+    get_flags_from_pkg_config("${OpusFile_LIBRARY}" "PC_OPUSFILE" "_opusfile")
+endif()
+
+set(OpusFile_COMPILE_OPTIONS "${_opusfile_compile_options}" CACHE STRING "Extra compile options of opusfile")
+
+set(OpusFile_LINK_LIBRARIES "${_opusfile_link_libraries}" CACHE STRING "Extra link libraries of opusfile")
+
+set(OpusFile_LINK_OPTIONS "${_opusfile_link_options}" CACHE STRING "Extra link flags of opusfile")
+
+set(OpusFile_LINK_DIRECTORIES "${_opusfile_link_directories}" CACHE PATH "Extra link directories of opusfile")
+
+find_package_handle_standard_args(OpusFile
+    REQUIRED_VARS OpusFile_LIBRARY OpusFile_INCLUDE_PATH
+)
+
+if (OpusFile_FOUND)
+    set(OpusFile_dirs ${OpusFile_INCLUDE_PATH})
+    if(EXISTS "${OpusFile_INCLUDE_PATH}/opus")
+        list(APPEND OpusFile_dirs "${OpusFile_INCLUDE_PATH}/opus")
+    endif()
+    if (NOT TARGET OpusFile::opusfile)
+        add_library(OpusFile::opusfile UNKNOWN IMPORTED)
+        set_target_properties(OpusFile::opusfile PROPERTIES
+            IMPORTED_LOCATION "${OpusFile_LIBRARY}"
+            INTERFACE_INCLUDE_DIRECTORIES "${OpusFile_dirs}"
+            INTERFACE_COMPILE_OPTIONS "${OpusFile_COMPILE_OPTIONS}"
+            INTERFACE_LINK_LIBRARIES "${OpusFile_LINK_LIBRARIES}"
+            INTERFACE_LINK_OPTIONS "${OpusFile_LINK_OPTIONS}"
+            INTERFACE_LINK_DIRECTORIES "${OpusFile_LINK_DIRECTORIES}"
+        )
+    endif()
+endif()

libs/SDL2_mixer/i686-w64-mingw32/lib/cmake/SDL2_mixer/FindVorbis.cmake

@@ -0,0 +1,44 @@
+include(FindPackageHandleStandardArgs)
+
+find_package(PkgConfig QUIET)
+pkg_check_modules(PC_VORBIS QUIET vorbisfile)
+
+find_library(Vorbis_vorbisfile_LIBRARY
+    NAMES vorbisfile
+    HINTS ${PC_VORBIS_LIBDIR}
+)
+
+find_path(Vorbis_vorbisfile_INCLUDE_PATH
+    NAMES vorbis/vorbisfile.h
+    HINTS ${PC_VORBIS_INCLUDEDIR}
+)
+
+if(PC_VORBIS_FOUND)
+    get_flags_from_pkg_config("${Vorbis_vorbisfile_LIBRARY}" "PC_VORBIS" "_vorbisfile")
+endif()
+
+set(Vorbis_vorbisfile_COMPILE_OPTIONS "${_vorbisfile_compile_options}" CACHE STRING "Extra compile options of vorbisfile")
+
+set(Vorbis_vorbisfile_LINK_LIBRARIES "${_vorbisfile_link_libraries}" CACHE STRING "Extra link libraries of vorbisfile")
+
+set(Vorbis_vorbisfile_LINK_OPTIONS "${_vorbisfile_link_options}" CACHE STRING "Extra link flags of vorbisfile")
+
+set(Vorbis_vorbisfile_LINK_DIRECTORIES "${_vorbisfile_link_directories}" CACHE PATH "Extra link directories of vorbisfile")
+
+find_package_handle_standard_args(Vorbis
+    REQUIRED_VARS Vorbis_vorbisfile_LIBRARY Vorbis_vorbisfile_INCLUDE_PATH
+)
+
+if (Vorbis_FOUND)
+    if (NOT TARGET Vorbis::vorbisfile)
+        add_library(Vorbis::vorbisfile UNKNOWN IMPORTED)
+        set_target_properties(Vorbis::vorbisfile PROPERTIES
+            IMPORTED_LOCATION "${Vorbis_vorbisfile_LIBRARY}"
+            INTERFACE_INCLUDE_DIRECTORIES "${Vorbis_vorbisfile_INCLUDE_PATH}"
+            INTERFACE_COMPILE_OPTIONS "${Vorbis_vorbisfile_COMPILE_OPTIONS}"
+            INTERFACE_LINK_LIBRARIES "${Vorbis_vorbisfile_LINK_LIBRARIES}"
+            INTERFACE_LINK_OPTIONS "${Vorbis_vorbisfile_LINK_OPTIONS}"
+            INTERFACE_LINK_DIRECTORIES "${Vorbis_vorbisfile_LINK_DIRECTORIES}"
+        )
+    endif()
+endif()

libs/SDL2_mixer/i686-w64-mingw32/lib/cmake/SDL2_mixer/Findgme.cmake

@@ -0,0 +1,48 @@
+include(FindPackageHandleStandardArgs)
+
+find_package(PkgConfig QUIET)
+pkg_check_modules(PC_GME QUIET libgme)
+
+find_library(gme_LIBRARY
+    NAMES gme
+    HINTS ${PC_GME_LIBDIR}
+)
+
+find_path(gme_INCLUDE_PATH
+    NAMES gme/gme.h
+    HINTS ${PC_GME_INCLUDEDIR}
+)
+
+if(PC_GME_FOUND)
+    get_flags_from_pkg_config("${gme_LIBRARY}" "PC_GME" "_gme")
+endif()
+
+set(gme_COMPILE_OPTIONS "${_gme_compile_options}" CACHE STRING "Extra compile options of gme")
+
+set(gme_LINK_LIBRARIES "${_gme_link_libraries}" CACHE STRING "Extra link libraries of gme")
+
+set(gme_LINK_OPTIONS "${_gme_link_options}" CACHE STRING "Extra link flags of gme")
+
+set(gme_LINK_DIRECTORIES "${_gme_link_directories}" CACHE PATH "Extra link directories of gme")
+
+find_package_handle_standard_args(gme
+    REQUIRED_VARS gme_LIBRARY gme_INCLUDE_PATH
+)
+
+if(gme_FOUND)
+    set(gme_dirs ${gme_INCLUDE_PATH})
+    if(EXISTS "${gme_INCLUDE_PATH}/gme")
+        list(APPEND gme_dirs "${gme_INCLUDE_PATH}/gme")
+    endif()
+    if(NOT TARGET gme::gme)
+        add_library(gme::gme UNKNOWN IMPORTED)
+        set_target_properties(gme::gme PROPERTIES
+            IMPORTED_LOCATION "${gme_LIBRARY}"
+            INTERFACE_INCLUDE_DIRECTORIES "${gme_dirs}"
+            INTERFACE_COMPILE_OPTIONS "${gme_COMPILE_OPTIONS}"
+            INTERFACE_LINK_LIBRARIES "${gme_LINK_LIBRARIES}"
+            INTERFACE_LINK_OPTIONS "${gme_LINK_OPTIONS}"
+            INTERFACE_LINK_DIRECTORIES "${gme_LINK_DIRECTORIES}"
+        )
+    endif()
+endif()

libs/SDL2_mixer/i686-w64-mingw32/lib/cmake/SDL2_mixer/Findlibxmp-lite.cmake

@@ -0,0 +1,45 @@
+include(FindPackageHandleStandardArgs)
+
+find_package(PkgConfig QUIET)
+pkg_check_modules(PC_XMPLITE QUIET libxmp-lite)
+
+find_library(libxmp_lite_LIBRARY
+    NAMES xmp-lite libxmp-lite
+    HINTS ${PC_XMPLITE_LIBDIR}
+)
+
+find_path(libxmp_lite_INCLUDE_PATH
+    NAMES xmp.h
+    PATH_SUFFIXES libxmp-lite
+    HINTS ${PC_XMPLITE_INCLUDEDIR}
+)
+
+if(PC_XMPLITE_FOUND)
+    get_flags_from_pkg_config("${libxmp_lite_LIBRARY}" "PC_XMPLITE" "_libxmp_lite")
+endif()
+
+set(libxmp_lite_COMPILE_OPTIONS "${_libxmp_lite_compile_options}" CACHE STRING "Extra compile options of libxmp_lite")
+
+set(libxmp_lite_LINK_LIBRARIES "${_libxmp_lite_link_libraries}" CACHE STRING "Extra link libraries of libxmp_lite")
+
+set(libxmp_lite_LINK_OPTIONS "${_libxmp_lite_link_options}" CACHE STRING "Extra link flags of libxmp_lite")
+
+set(libxmp_lite_LINK_DIRECTORIES "${_libxmp_lite_link_directories}" CACHE PATH "Extra link directories of libxmp_lite")
+
+find_package_handle_standard_args(libxmp-lite
+    REQUIRED_VARS libxmp_lite_LIBRARY libxmp_lite_INCLUDE_PATH
+)
+
+if(libxmp-lite_FOUND)
+    if(NOT TARGET libxmp-lite::libxmp-lite)
+        add_library(libxmp-lite::libxmp-lite UNKNOWN IMPORTED)
+        set_target_properties(libxmp-lite::libxmp-lite PROPERTIES
+            IMPORTED_LOCATION "${libxmp_lite_LIBRARY}"
+            INTERFACE_INCLUDE_DIRECTORIES "${libxmp_lite_INCLUDE_PATH}"
+            INTERFACE_COMPILE_OPTIONS "${libxmp_lite_COMPILE_OPTIONS}"
+            INTERFACE_LINK_LIBRARIES "${libxmp_lite_LINK_LIBRARIES}"
+            INTERFACE_LINK_OPTIONS "${libxmp_lite_LINK_OPTIONS}"
+            INTERFACE_LINK_DIRECTORIES "${libxmp_lite_LINK_DIRECTORIES}"
+        )
+    endif()
+endif()

libs/SDL2_mixer/i686-w64-mingw32/lib/cmake/SDL2_mixer/Findlibxmp.cmake

@@ -0,0 +1,44 @@
+include(FindPackageHandleStandardArgs)
+
+find_package(PkgConfig QUIET)
+pkg_check_modules(PC_XMP QUIET libxmp)
+
+find_library(libxmp_LIBRARY
+    NAMES xmp
+    HINTS ${PC_XMP_LIBDIR}
+)
+
+find_path(libxmp_INCLUDE_PATH
+    NAMES xmp.h
+    HINTS ${PC_XMP_INCLUDEDIR}
+)
+
+if(PC_XMP_FOUND)
+    get_flags_from_pkg_config("${libxmp_LIBRARY}" "PC_XMP" "_libxmp")
+endif()
+
+set(libxmp_COMPILE_OPTIONS "${_libxmp_compile_options}" CACHE STRING "Extra compile options of libxmp")
+
+set(libxmp_LINK_LIBRARIES "${_libxmp_link_libraries}" CACHE STRING "Extra link libraries of libxmp")
+
+set(libxmp_LINK_OPTIONS "${_libxmp_link_options}" CACHE STRING "Extra link flags of libxmp")
+
+set(libxmp_LINK_DIRECTORIES "${_libxmp_link_directories}" CACHE PATH "Extra link flags of libxmp")
+
+find_package_handle_standard_args(libxmp
+    REQUIRED_VARS libxmp_LIBRARY libxmp_INCLUDE_PATH
+)
+
+if(libxmp_FOUND)
+    if(NOT TARGET libxmp::libxmp)
+        add_library(libxmp::libxmp UNKNOWN IMPORTED)
+        set_target_properties(libxmp::libxmp PROPERTIES
+            IMPORTED_LOCATION "${libxmp_LIBRARY}"
+            INTERFACE_INCLUDE_DIRECTORIES "${libxmp_INCLUDE_PATH}"
+            INTERFACE_COMPILE_OPTIONS "${libxmp_COMPILE_OPTIONS}"
+            INTERFACE_LINK_LIBRARIES "${libxmp_LINK_LIBRARIES}"
+            INTERFACE_LINK_OPTIONS "${libxmp_LINK_OPTIONS}"
+            INTERFACE_LINK_DIRECTORIES "${libxmp_LINK_DIRECTORIES}"
+        )
+    endif()
+endif()

libs/SDL2_mixer/i686-w64-mingw32/lib/cmake/SDL2_mixer/Findmodplug.cmake

@@ -0,0 +1,43 @@
+include(FindPackageHandleStandardArgs)
+
+find_package(PkgConfig QUIET)
+pkg_check_modules(PC_MODPLUG QUIET libmodplug)
+
+find_library(modplug_LIBRARY
+    NAMES modplug
+)
+
+find_path(modplug_INCLUDE_PATH
+    NAMES libmodplug/modplug.h
+)
+
+if(PC_MODPLUG_FOUND)
+    get_flags_from_pkg_config("${modplug_LIBRARY}" "PC_MODPLUG" "_modplug")
+endif()
+
+set(modplug_COMPILE_OPTIONS "${_modplug_compile_options}" CACHE STRING "Extra compile options of modplug")
+
+set(modplug_LINK_LIBRARIES "${_modplug_link_libraries}" CACHE STRING "Extra link libraries of modplug")
+
+set(modplug_LINK_OPTIONS "${_modplug_link_options}" CACHE STRING "Extra link flags of modplug")
+
+set(modplug_LINK_DIRECTORIES "${_modplug_link_directories}" CACHE PATH "Extra link directories of modplug")
+
+find_package_handle_standard_args(modplug
+    REQUIRED_VARS modplug_LIBRARY modplug_INCLUDE_PATH
+)
+
+if (modplug_FOUND)
+    if (NOT TARGET modplug::modplug)
+        add_library(modplug::modplug UNKNOWN IMPORTED)
+        set_target_properties(modplug::modplug PROPERTIES
+            IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
+            IMPORTED_LOCATION "${modplug_LIBRARY}"
+            INTERFACE_INCLUDE_DIRECTORIES "${modplug_INCLUDE_PATH}"
+            INTERFACE_COMPILE_OPTIONS "${modplug_COMPILE_OPTIONS}"
+            INTERFACE_LINK_LIBRARIES "${modplug_LINK_LIBRARIES}"
+            INTERFACE_LINK_OPTIONS "${modplug_LINK_OPTIONS}"
+            INTERFACE_LINK_DIRECTORIES "${modplug_LINK_DIRECTORIES}"
+        )
+    endif()
+endif()

libs/SDL2_mixer/i686-w64-mingw32/lib/cmake/SDL2_mixer/Findmpg123.cmake

@@ -0,0 +1,44 @@
+include(FindPackageHandleStandardArgs)
+
+find_package(PkgConfig QUIET)
+pkg_check_modules(PC_MPG123 QUIET libmpg123)
+
+find_library(mpg123_LIBRARY
+    NAMES mpg123
+    HINTS ${PC_MPG123_LIBDIR}
+)
+
+find_path(mpg123_INCLUDE_PATH
+    NAMES mpg123.h
+    HINTS ${PC_MPG123_INCLUDEDIR}
+)
+
+if(PC_MPG123_FOUND)
+    get_flags_from_pkg_config("${mpg123_LIBRARY}" "PC_MPG123" "_mpg123")
+endif()
+
+set(mpg123_COMPILE_OPTIONS "${_mpg123_compile_options}" CACHE STRING "Extra compile options of mpg123")
+
+set(mpg123_LINK_LIBRARIES "${_mpg123_link_libraries}" CACHE STRING "Extra link libraries of mpg123")
+
+set(mpg123_LINK_OPTIONS "${_mpg123_link_options}" CACHE STRING "Extra link flags of mpg123")
+
+set(mpg123_LINK_DIRECTORIES "${_mpg123_link_directories}" CACHE PATH "Extra link directories of mpg123")
+
+find_package_handle_standard_args(mpg123
+    REQUIRED_VARS mpg123_LIBRARY mpg123_INCLUDE_PATH
+)
+
+if(mpg123_FOUND)
+    if(NOT TARGET MPG123::libmpg123)
+        add_library(MPG123::libmpg123 UNKNOWN IMPORTED)
+        set_target_properties(MPG123::libmpg123 PROPERTIES
+            IMPORTED_LOCATION "${mpg123_LIBRARY}"
+            INTERFACE_INCLUDE_DIRECTORIES "${mpg123_INCLUDE_PATH}"
+            INTERFACE_COMPILE_OPTIONS "${mpg123_COMPILE_OPTIONS}"
+            INTERFACE_LINK_LIBRARIES "${mpg123_LINK_LIBRARIES}"
+            INTERFACE_LINK_OPTIONS "${mpg123_LINK_OPTIONS}"
+            INTERFACE_LINK_DIRECTORIES "${mpg123_LINK_DIRECTORIES}"
+        )
+    endif()
+endif()

libs/SDL2_mixer/i686-w64-mingw32/lib/cmake/SDL2_mixer/Findtremor.cmake

@@ -0,0 +1,44 @@
+include(FindPackageHandleStandardArgs)
+
+find_package(PkgConfig QUIET)
+pkg_check_modules(PC_TREMOR QUIET vorbisidec)
+
+find_library(tremor_LIBRARY
+    NAMES vorbisidec libvorbisidec
+    HINTS ${PC_TREMOR_LIBDIR}
+)
+
+find_path(tremor_INCLUDE_PATH
+    NAMES tremor/ivorbisfile.h
+    HINTS ${PC_TREMOR_INCLUDEDIR}
+)
+
+if(PC_TREMOR_FOUND)
+    get_flags_from_pkg_config("${tremor_LIBRARY}" "PC_TREMOR" "_tremor")
+endif()
+
+set(tremor_COMPILE_OPTIONS "${_tremor_compile_options}" CACHE STRING "Extra compile options of vorbis")
+
+set(tremor_LINK_LIBRARIES "${_tremor_link_libraries}" CACHE STRING "Extra link libraries of vorbis")
+
+set(tremor_LINK_OPTIONS "${_tremor_link_options}" CACHE STRING "Extra link flags of vorbis")
+
+set(tremor_LINK_DIRECTORIES "${_tremor_link_directories}" CACHE PATH "Extra link directories of vorbis")
+
+find_package_handle_standard_args(tremor
+    REQUIRED_VARS tremor_LIBRARY tremor_INCLUDE_PATH
+)
+
+if (tremor_FOUND)
+    if (NOT TARGET tremor::tremor)
+        add_library(tremor::tremor UNKNOWN IMPORTED)
+        set_target_properties(tremor::tremor PROPERTIES
+            IMPORTED_LOCATION "${tremor_LIBRARY}"
+            INTERFACE_INCLUDE_DIRECTORIES "${tremor_INCLUDE_PATH}"
+            INTERFACE_COMPILE_OPTIONS "${tremor_COMPILE_OPTIONS}"
+            INTERFACE_LINK_LIBRARIES "${tremor_LINK_LIBRARIES}"
+            INTERFACE_LINK_OPTIONS "${tremor_LINK_OPTIONS}"
+            INTERFACE_LINK_DIRECTORIES "${tremor_LINK_DIRECTORIES}"
+        )
+    endif()
+endif()

libs/SDL2_mixer/i686-w64-mingw32/lib/cmake/SDL2_mixer/Findwavpack.cmake

@@ -0,0 +1,37 @@
+include(FindPackageHandleStandardArgs)
+
+if(WIN32)
+    set(wavpack_find_names wavpack libwavpack wavpackdll)
+else()
+    set(wavpack_find_names wavpack)
+endif()
+find_library(wavpack_LIBRARY
+    NAMES ${wavpack_find_names}
+)
+
+find_path(wavpack_INCLUDE_PATH
+    NAMES wavpack/wavpack.h
+)
+
+set(wavpack_COMPILE_OPTIONS "" CACHE STRING "Extra compile options of wavpack")
+
+set(wavpack_LINK_LIBRARIES "" CACHE STRING "Extra link libraries of wavpack")
+
+set(wavpack_LINK_OPTIONS "" CACHE STRING "Extra link flags of wavpack")
+
+find_package_handle_standard_args(wavpack
+    REQUIRED_VARS wavpack_LIBRARY wavpack_INCLUDE_PATH
+)
+
+if (wavpack_FOUND)
+    if (NOT TARGET WavPack::WavPack)
+        add_library(WavPack::WavPack UNKNOWN IMPORTED)
+        set_target_properties(WavPack::WavPack PROPERTIES
+            IMPORTED_LOCATION "${wavpack_LIBRARY}"
+            INTERFACE_INCLUDE_DIRECTORIES "${wavpack_INCLUDE_PATH}"
+            INTERFACE_COMPILE_OPTIONS "${wavpack_COMPILE_OPTIONS}"
+            INTERFACE_LINK_LIBRARIES "${wavpack_LINK_LIBRARIES}"
+            INTERFACE_LINK_OPTIONS "${wavpack_LINK_OPTIONS}"
+        )
+    endif()
+endif()

libs/SDL2_mixer/i686-w64-mingw32/lib/cmake/SDL2_mixer/PkgConfigHelper.cmake

@@ -0,0 +1,34 @@
+# Helper for Find modules
+
+function(get_flags_from_pkg_config _library _pc_prefix _out_prefix)
+  if("${_library}" MATCHES "${CMAKE_STATIC_LIBRARY_SUFFIX}$")
+    set(_cflags ${_pc_prefix}_STATIC_CFLAGS_OTHER)
+    set(_link_libraries ${_pc_prefix}_STATIC_LIBRARIES)
+    set(_link_options ${_pc_prefix}_STATIC_LDFLAGS_OTHER)
+    set(_library_dirs ${_pc_prefix}_STATIC_LIBRARY_DIRS)
+  else()
+    set(_cflags ${_pc_prefix}_CFLAGS_OTHER)
+    set(_link_libraries ${_pc_prefix}_LIBRARIES)
+    set(_link_options ${_pc_prefix}_LDFLAGS_OTHER)
+    set(_library_dirs ${_pc_prefix}_LIBRARY_DIRS)
+  endif()
+
+  # The *_LIBRARIES lists always start with the library itself
+  list(POP_FRONT "${_link_libraries}")
+
+  # Work around CMake's flag deduplication when pc files use `-framework A` instead of `-Wl,-framework,A`
+  string(REPLACE "-framework;" "-Wl,-framework," "_filtered_link_options" "${${_link_options}}")
+
+  set(${_out_prefix}_compile_options
+      "${${_cflags}}"
+      PARENT_SCOPE)
+  set(${_out_prefix}_link_libraries
+      "${${_link_libraries}}"
+      PARENT_SCOPE)
+  set(${_out_prefix}_link_options
+      "${_filtered_link_options}"
+      PARENT_SCOPE)
+  set(${_out_prefix}_link_directories
+      "${${_library_dirs}}"
+      PARENT_SCOPE)
+endfunction()

libs/SDL2_mixer/i686-w64-mingw32/lib/cmake/SDL2_mixer/sdl2_mixer-config-version.cmake

@@ -0,0 +1,12 @@
+# sdl2_mixer cmake project-config-version input for ./configure scripts
+
+set(PACKAGE_VERSION "2.8.1")
+
+if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
+  set(PACKAGE_VERSION_COMPATIBLE FALSE)
+else()
+  set(PACKAGE_VERSION_COMPATIBLE TRUE)
+  if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION)
+    set(PACKAGE_VERSION_EXACT TRUE)
+  endif()
+endif()

libs/SDL2_mixer/i686-w64-mingw32/lib/cmake/SDL2_mixer/sdl2_mixer-config.cmake

@@ -0,0 +1,195 @@
+# sdl2_mixer cmake project-config input for ./configure scripts
+
+include(FeatureSummary)
+set_package_properties(SDL2_mixer PROPERTIES
+    URL "https://www.libsdl.org/projects/SDL_mixer/"
+    DESCRIPTION "SDL_mixer is a sample multi-channel audio mixer library"
+)
+
+set(SDL2_mixer_FOUND                TRUE)
+
+set(SDL2MIXER_VENDORED              0)
+
+set(SDL2MIXER_CMD                   0)
+
+set(SDL2MIXER_FLAC_LIBFLAC          0)
+set(SDL2MIXER_FLAC_DRFLAC           1)
+if(SDL2MIXER_FLAC_LIBFLAC OR SDL2MIXER_FLAC_DRFLAC)
+    set(SDL2MIXER_FLAC              1)
+else()
+    set(SDL2MIXER_FLAC              0)
+endif()
+
+set(SDL2MIXER_GME                   1)
+
+set(SDL2MIXER_MOD_MODPLUG           0)
+set(SDL2MIXER_MOD_XMP               1)
+set(SDL2MIXER_MOD_XMP_LITE          0)
+if(SDL2MIXER_MOD_MODPLUG OR SDL2MIXER_MOD_XMP OR SDL2MIXER_MOD_XMP_LITE)
+    set(SDL2MIXER_MOD               1)
+else()
+    set(SDL2MIXER_MOD               0)
+endif()
+
+set(SDL2MIXER_MP3_MINIMP3           1)
+set(SDL2MIXER_MP3_MPG123            0)
+if(SDL2MIXER_MP3_MINIMP3 OR SDL2MIXER_MP3_MPG123)
+    set(SDL2MIXER_MP3               1)
+else()
+    set(SDL2MIXER_MP3               0)
+endif()
+
+set(SDL2MIXER_MIDI_FLUIDSYNTH       0)
+set(SDL2MIXER_MIDI_NATIVE           1)
+set(SDL2MIXER_MIDI_TIMIDITY         1)
+if(SDL2MIXER_MIDI_FLUIDSYNTH OR SDL2MIXER_MIDI_NATIVE OR SDL2MIXER_MIDI_TIMIDITY)
+    set(SDL2MIXER_MIDI              1)
+else()
+    set(SDL2MIXER_MIDI              0)
+endif()
+
+set(SDL2MIXER_OPUS                  1)
+
+set(SDL2MIXER_VORBIS)
+set(SDL2MIXER_VORBIS_STB            1)
+set(SDL2MIXER_VORBIS_VORBISFILE     0)
+set(SDL2MIXER_VORBIS_TREMOR         0)
+if(SDL2MIXER_VORBIS_STB)
+    set(SDL2MIXER_VORBIS            STB)
+endif()
+if(SDL2MIXER_VORBIS_VORBISFILE)
+    set(SDL2MIXER_VORBIS            VORBISFILE)
+endif()
+if(SDL2MIXER_VORBIS_TREMOR)
+    set(SDL2MIXER_VORBIS            TREMOR)
+endif()
+
+set(SDL2MIXER_WAVE                  1)
+
+set(SDL2MIXER_WAVPACK               1)
+
+set(SDL2MIXER_SDL2_REQUIRED_VERSION 2.0.9)
+
+get_filename_component(CMAKE_CURRENT_LIST_DIR ${CMAKE_CURRENT_LIST_DIR} REALPATH)
+get_filename_component(prefix "${CMAKE_CURRENT_LIST_DIR}/../../.." ABSOLUTE)
+set(exec_prefix "${prefix}")
+set(bindir "${prefix}/bin")
+set(includedir "${prefix}/include")
+set(libdir "${prefix}/lib")
+set(_sdl2mixer_extra_static_libraries ";winmm")
+string(REGEX REPLACE "(^[;]+|[;]+$)" "" _sdl2mixer_extra_static_libraries "${_sdl2mixer_extra_static_libraries}")
+
+set(_sdl2mixer_bindir   "${bindir}")
+set(_sdl2mixer_libdir   "${libdir}")
+set(_sdl2mixer_incdir   "${includedir}/SDL2")
+
+include(CMakeFindDependencyMacro)
+
+set(_original_cmake_module_path "${CMAKE_MODULE_PATH}")
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
+
+include("${CMAKE_CURRENT_LIST_DIR}/PkgConfigHelper.cmake")
+
+if("modplug::modplug" IN_LIST _sdl2mixer_extra_static_libraries)
+    find_dependency(modplug)
+endif()
+
+if("libxmp::libxmp" IN_LIST _sdl2mixer_extra_static_libraries)
+    find_dependency(libxmp)
+endif()
+
+if("libxmp-lite::libxmp-lite" IN_LIST _sdl2mixer_extra_static_libraries)
+    find_dependency(libxmp-lite)
+endif()
+
+if("FluidSynth::libfluidsynth" IN_LIST _sdl2mixer_extra_static_libraries)
+    find_dependency(FluidSynth)
+endif()
+
+if("Vorbis::vorbisfile" IN_LIST _sdl2mixer_extra_static_libraries)
+    find_dependency(Vorbis)
+endif()
+
+if("tremor::tremor" IN_LIST _sdl2mixer_extra_static_libraries)
+    find_dependency(tremor)
+endif()
+
+if("FLAC::FLAC" IN_LIST _sdl2mixer_extra_static_libraries)
+    find_dependency(FLAC)
+endif()
+
+if("MPG123::libmpg123" IN_LIST _sdl2mixer_extra_static_libraries)
+    find_dependency(mpg123)
+endif()
+
+if("OpusFile::opusfile" IN_LIST _sdl2mixer_extra_static_libraries)
+    find_dependency(OpusFile)
+endif()
+
+if("WavPack::WavPack" IN_LIST _sdl2mixer_extra_static_libraries)
+    find_dependency(wavpack)
+endif()
+
+set(CMAKE_MODULE_PATH "${_original_cmake_module_path}")
+unset(_original_cmake_module_path)
+
+unset(prefix)
+unset(exec_prefix)
+unset(bindir)
+unset(includedir)
+unset(libdir)
+
+include(CMakeFindDependencyMacro)
+
+if(NOT TARGET SDL2_mixer::SDL2_mixer)
+    if(WIN32)
+        set(_sdl2mixer_dll "${_sdl2mixer_bindir}/SDL2_mixer.dll")
+        set(_sdl2mixer_imp "${_sdl2mixer_libdir}/${CMAKE_STATIC_LIBRARY_PREFIX}SDL2_mixer.dll${CMAKE_STATIC_LIBRARY_SUFFIX}")
+        if(EXISTS "${_sdl2mixer_dll}" AND EXISTS "${_sdl2mixer_imp}")
+            add_library(SDL2_mixer::SDL2_mixer SHARED IMPORTED)
+            set_target_properties(SDL2_mixer::SDL2_mixer
+                PROPERTIES
+                    IMPORTED_LOCATION "${_sdl2mixer_dll}"
+                    IMPORTED_IMPLIB "${_sdl2mixer_imp}"
+            )
+        endif()
+        unset(_sdl2mixer_dll)
+        unset(_sdl2mixer_imp)
+    else()
+        set(_sdl2mixer_shl "${_sdl2mixer_libdir}/${CMAKE_SHARED_LIBRARY_PREFIX}SDL2_mixer${CMAKE_SHARED_LIBRARY_SUFFIX}")
+        if(EXISTS "${_sdl2mixer_shl}")
+            add_library(SDL2_mixer::SDL2_mixer SHARED IMPORTED)
+            set_target_properties(SDL2_mixer::SDL2_mixer
+                PROPERTIES
+                    IMPORTED_LOCATION "${_sdl2mixer_shl}"
+            )
+        endif()
+    endif()
+    if(TARGET SDL2_mixer::SDL2_mixer)
+        set_target_properties(SDL2_mixer::SDL2_mixer
+            PROPERTIES
+                INTERFACE_INCLUDE_DIRECTORIES "${_sdl2mixer_incdir}"
+                COMPATIBLE_INTERFACE_BOOL "SDL2_SHARED"
+                INTERFACE_SDL2_SHARED "ON"
+        )
+    endif()
+endif()
+
+if(NOT TARGET SDL2_mixer::SDL2_mixer-static)
+    set(_sdl2mixer_stl "${_sdl2mixer_libdir}/${CMAKE_STATIC_LIBRARY_PREFIX}SDL2_mixer${CMAKE_STATIC_LIBRARY_SUFFIX}")
+    if(EXISTS "${_sdl2mixer_stl}")
+        add_library(SDL2_mixer::SDL2_mixer-static STATIC IMPORTED)
+        set_target_properties(SDL2_mixer::SDL2_mixer-static
+            PROPERTIES
+                INTERFACE_INCLUDE_DIRECTORIES "${_sdl2mixer_incdir}"
+                IMPORTED_LOCATION "${_sdl2mixer_stl}"
+                INTERFACE_LINK_LIBRARIES "${_sdl2mixer_extra_static_libraries}"
+        )
+    endif()
+    unset(_sdl2mixer_stl)
+endif()
+
+unset(_sdl2mixer_extra_static_libraries)
+unset(_sdl2mixer_bindir)
+unset(_sdl2mixer_libdir)
+unset(_sdl2mixer_incdir)

libs/SDL2_mixer/i686-w64-mingw32/lib/libSDL2_mixer.la

@@ -17,15 +17,15 @@ old_library='libSDL2_mixer.a'
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/opt/local/i686-w64-mingw32/lib -lmingw32 /opt/local/i686-w64-mingw32/lib/libSDL2.la -ldinput8 -ldxguid -ldxerr8 -luser32 -lgdi32 -limm32 -lole32 -loleaut32 -lshell32 -lsetupapi -lversion -luuid -lwinmm'
+dependency_libs=' -L/tmp/tardir/SDL2_mixer-2.8.1/VisualC/external/optional/x86 -L/home/runner/work/SDL_mixer/SDL_mixer/deps/mingw-deps/i686-w64-mingw32/lib -lmingw32 /home/runner/work/SDL_mixer/SDL_mixer/deps/mingw-deps/i686-w64-mingw32/lib/libSDL2.la -ldinput8 -ldxguid -ldxerr8 -luser32 -lgdi32 -limm32 -lole32 -loleaut32 -lshell32 -lsetupapi -lversion -luuid -lwinmm'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
 
 # Version information for libSDL2_mixer.
-current=2
-age=2
-revision=2
+current=800
+age=800
+revision=1
 
 # Is this an already installed library?
 installed=yes
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/Users/valve/release/SDL_mixer/SDL2_mixer-2.0.4/i686-w64-mingw32/lib'
+libdir='/tmp/tardir/SDL2_mixer-2.8.1/build-mingw/install-i686-w64-mingw32/lib'

libs/SDL2_mixer/i686-w64-mingw32/lib/pkgconfig/SDL2_mixer.pc

@@ -1,12 +1,13 @@
-prefix=/opt/local/i686-w64-mingw32
+prefix=/tmp/tardir/SDL2_mixer-2.8.1/build-mingw/install-i686-w64-mingw32
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=${prefix}/lib
 includedir=${prefix}/include
 
 Name: SDL2_mixer
 Description: mixer library for Simple DirectMedia Layer
-Version: 2.0.4
-Requires: sdl2 >= 2.0.7
+Version: 2.8.1
+Requires: sdl2 >= 2.0.9
 Libs: -L${libdir} -lSDL2_mixer
 Cflags: -I${includedir}/SDL2
-
+Requires.private: 
+Libs.private:  -lwinmm

libs/SDL2_mixer/x86_64-w64-mingw32/lib/cmake/SDL2_mixer/FindFLAC.cmake

@@ -0,0 +1,44 @@
+include(FindPackageHandleStandardArgs)
+
+find_package(PkgConfig QUIET)
+pkg_check_modules(PC_FLAC QUIET flac)
+
+find_library(FLAC_LIBRARY
+    NAMES FLAC
+    HINTS ${PC_FLAC_LIBDIR}
+)
+
+find_path(FLAC_INCLUDE_PATH
+    NAMES FLAC/all.h
+    HINTS ${PC_FLAC_INCLUDEDIR}
+)
+
+if(PC_FLAC_FOUND)
+    get_flags_from_pkg_config("${FLAC_LIBRARY}" "PC_FLAC" "_flac")
+endif()
+
+set(FLAC_COMPILE_OPTIONS "${_flac_compile_options}" CACHE STRING "Extra compile options of FLAC")
+
+set(FLAC_LINK_LIBRARIES "${_flac_link_libraries}" CACHE STRING "Extra link libraries of FLAC")
+
+set(FLAC_LINK_OPTIONS "${_flac_link_options}" CACHE STRING "Extra link flags of FLAC")
+
+set(FLAC_LINK_DIRECTORIES "${_flac_link_directories}" CACHE PATH "Extra link directories of FLAC")
+
+find_package_handle_standard_args(FLAC
+    REQUIRED_VARS FLAC_LIBRARY FLAC_INCLUDE_PATH
+)
+
+if(FLAC_FOUND)
+    if(NOT TARGET FLAC::FLAC)
+        add_library(FLAC::FLAC UNKNOWN IMPORTED)
+        set_target_properties(FLAC::FLAC PROPERTIES
+            IMPORTED_LOCATION "${FLAC_LIBRARY}"
+            INTERFACE_INCLUDE_DIRECTORIES "${FLAC_INCLUDE_PATH}"
+            INTERFACE_COMPILE_OPTIONS "${FLAC_COMPILE_OPTIONS}"
+            INTERFACE_LINK_LIBRARIES "${FLAC_LINK_LIBRARIES}"
+            INTERFACE_LINK_OPTIONS "${FLAC_LINK_OPTIONS}"
+            INTERFACE_LINK_DIRECTORIES "${FLAC_LINK_DIRECTORIES}"
+        )
+    endif()
+endif()

libs/SDL2_mixer/x86_64-w64-mingw32/lib/cmake/SDL2_mixer/FindFluidSynth.cmake

@@ -0,0 +1,44 @@
+include(FindPackageHandleStandardArgs)
+
+find_package(PkgConfig QUIET)
+pkg_check_modules(PC_FLUIDSYNTH QUIET fluidsynth)
+
+find_library(FluidSynth_LIBRARY
+    NAMES fluidsynth libfluidsynth
+    HINTS ${PC_FLUIDSYNTH_LIBDIR}
+)
+
+find_path(FluidSynth_INCLUDE_PATH
+    NAMES fluidsynth.h
+    HINTS ${PC_FLUIDSYNTH_INCLUDEDIR}
+)
+
+if(PC_FLUIDSYNTH_FOUND)
+    get_flags_from_pkg_config("${FluidSynth_LIBRARY}" "PC_FLUIDSYNTH" "_fluidsynth")
+endif()
+
+set(FluidSynth_COMPILE_OPTIONS "${_fluidsynth_compile_options}" CACHE STRING "Extra compile options of FluidSynth")
+
+set(FluidSynth_LINK_LIBRARIES "${_fluidsynth_link_libraries}" CACHE STRING "Extra link libraries of FluidSynth")
+
+set(FluidSynth_LINK_OPTIONS "${_fluidsynth_link_options}" CACHE STRING "Extra link flags of FluidSynth")
+
+set(FluidSynth_LINK_DIRECTORIES "${_fluidsynth_link_directories}" CACHE PATH "Extra link directories of FluidSynth")
+
+find_package_handle_standard_args(FluidSynth
+    REQUIRED_VARS FluidSynth_LIBRARY FluidSynth_INCLUDE_PATH
+)
+
+if(FluidSynth_FOUND)
+    if(NOT TARGET FluidSynth::libfluidsynth)
+        add_library(FluidSynth::libfluidsynth UNKNOWN IMPORTED)
+        set_target_properties(FluidSynth::libfluidsynth PROPERTIES
+            IMPORTED_LOCATION "${FluidSynth_LIBRARY}"
+            INTERFACE_INCLUDE_DIRECTORIES "${FluidSynth_INCLUDE_PATH}"
+            INTERFACE_COMPILE_OPTIONS "${FluidSynth_COMPILE_OPTIONS}"
+            INTERFACE_LINK_LIBRARIES "${FluidSynth_LINK_LIBRARIES}"
+            INTERFACE_LINK_OPTIONS "${FluidSynth_LINK_OPTIONS}"
+            INTERFACE_LINK_DIRECTORIES "${FluidSynth_LINK_DIRECTORIES}"
+        )
+    endif()
+endif()

libs/SDL2_mixer/x86_64-w64-mingw32/lib/cmake/SDL2_mixer/FindOpusFile.cmake

@@ -0,0 +1,49 @@
+include(FindPackageHandleStandardArgs)
+
+find_package(PkgConfig QUIET)
+pkg_check_modules(PC_OPUSFILE QUIET opusfile)
+
+find_library(OpusFile_LIBRARY
+    NAMES opusfile
+    HINTS ${PC_OPUSFILE_LIBDIR}
+)
+
+find_path(OpusFile_INCLUDE_PATH
+    NAMES opusfile.h
+    PATH_SUFFIXES opus
+    HINTS ${PC_OPUSFILE_INCLUDEDIR}
+)
+
+if(PC_OPUSFILE_FOUND)
+    get_flags_from_pkg_config("${OpusFile_LIBRARY}" "PC_OPUSFILE" "_opusfile")
+endif()
+
+set(OpusFile_COMPILE_OPTIONS "${_opusfile_compile_options}" CACHE STRING "Extra compile options of opusfile")
+
+set(OpusFile_LINK_LIBRARIES "${_opusfile_link_libraries}" CACHE STRING "Extra link libraries of opusfile")
+
+set(OpusFile_LINK_OPTIONS "${_opusfile_link_options}" CACHE STRING "Extra link flags of opusfile")
+
+set(OpusFile_LINK_DIRECTORIES "${_opusfile_link_directories}" CACHE PATH "Extra link directories of opusfile")
+
+find_package_handle_standard_args(OpusFile
+    REQUIRED_VARS OpusFile_LIBRARY OpusFile_INCLUDE_PATH
+)
+
+if (OpusFile_FOUND)
+    set(OpusFile_dirs ${OpusFile_INCLUDE_PATH})
+    if(EXISTS "${OpusFile_INCLUDE_PATH}/opus")
+        list(APPEND OpusFile_dirs "${OpusFile_INCLUDE_PATH}/opus")
+    endif()
+    if (NOT TARGET OpusFile::opusfile)
+        add_library(OpusFile::opusfile UNKNOWN IMPORTED)
+        set_target_properties(OpusFile::opusfile PROPERTIES
+            IMPORTED_LOCATION "${OpusFile_LIBRARY}"
+            INTERFACE_INCLUDE_DIRECTORIES "${OpusFile_dirs}"
+            INTERFACE_COMPILE_OPTIONS "${OpusFile_COMPILE_OPTIONS}"
+            INTERFACE_LINK_LIBRARIES "${OpusFile_LINK_LIBRARIES}"
+            INTERFACE_LINK_OPTIONS "${OpusFile_LINK_OPTIONS}"
+            INTERFACE_LINK_DIRECTORIES "${OpusFile_LINK_DIRECTORIES}"
+        )
+    endif()
+endif()

libs/SDL2_mixer/x86_64-w64-mingw32/lib/cmake/SDL2_mixer/FindVorbis.cmake

@@ -0,0 +1,44 @@
+include(FindPackageHandleStandardArgs)
+
+find_package(PkgConfig QUIET)
+pkg_check_modules(PC_VORBIS QUIET vorbisfile)
+
+find_library(Vorbis_vorbisfile_LIBRARY
+    NAMES vorbisfile
+    HINTS ${PC_VORBIS_LIBDIR}
+)
+
+find_path(Vorbis_vorbisfile_INCLUDE_PATH
+    NAMES vorbis/vorbisfile.h
+    HINTS ${PC_VORBIS_INCLUDEDIR}
+)
+
+if(PC_VORBIS_FOUND)
+    get_flags_from_pkg_config("${Vorbis_vorbisfile_LIBRARY}" "PC_VORBIS" "_vorbisfile")
+endif()
+
+set(Vorbis_vorbisfile_COMPILE_OPTIONS "${_vorbisfile_compile_options}" CACHE STRING "Extra compile options of vorbisfile")
+
+set(Vorbis_vorbisfile_LINK_LIBRARIES "${_vorbisfile_link_libraries}" CACHE STRING "Extra link libraries of vorbisfile")
+
+set(Vorbis_vorbisfile_LINK_OPTIONS "${_vorbisfile_link_options}" CACHE STRING "Extra link flags of vorbisfile")
+
+set(Vorbis_vorbisfile_LINK_DIRECTORIES "${_vorbisfile_link_directories}" CACHE PATH "Extra link directories of vorbisfile")
+
+find_package_handle_standard_args(Vorbis
+    REQUIRED_VARS Vorbis_vorbisfile_LIBRARY Vorbis_vorbisfile_INCLUDE_PATH
+)
+
+if (Vorbis_FOUND)
+    if (NOT TARGET Vorbis::vorbisfile)
+        add_library(Vorbis::vorbisfile UNKNOWN IMPORTED)
+        set_target_properties(Vorbis::vorbisfile PROPERTIES
+            IMPORTED_LOCATION "${Vorbis_vorbisfile_LIBRARY}"
+            INTERFACE_INCLUDE_DIRECTORIES "${Vorbis_vorbisfile_INCLUDE_PATH}"
+            INTERFACE_COMPILE_OPTIONS "${Vorbis_vorbisfile_COMPILE_OPTIONS}"
+            INTERFACE_LINK_LIBRARIES "${Vorbis_vorbisfile_LINK_LIBRARIES}"
+            INTERFACE_LINK_OPTIONS "${Vorbis_vorbisfile_LINK_OPTIONS}"
+            INTERFACE_LINK_DIRECTORIES "${Vorbis_vorbisfile_LINK_DIRECTORIES}"
+        )
+    endif()
+endif()

libs/SDL2_mixer/x86_64-w64-mingw32/lib/cmake/SDL2_mixer/Findgme.cmake

@@ -0,0 +1,48 @@
+include(FindPackageHandleStandardArgs)
+
+find_package(PkgConfig QUIET)
+pkg_check_modules(PC_GME QUIET libgme)
+
+find_library(gme_LIBRARY
+    NAMES gme
+    HINTS ${PC_GME_LIBDIR}
+)
+
+find_path(gme_INCLUDE_PATH
+    NAMES gme/gme.h
+    HINTS ${PC_GME_INCLUDEDIR}
+)
+
+if(PC_GME_FOUND)
+    get_flags_from_pkg_config("${gme_LIBRARY}" "PC_GME" "_gme")
+endif()
+
+set(gme_COMPILE_OPTIONS "${_gme_compile_options}" CACHE STRING "Extra compile options of gme")
+
+set(gme_LINK_LIBRARIES "${_gme_link_libraries}" CACHE STRING "Extra link libraries of gme")
+
+set(gme_LINK_OPTIONS "${_gme_link_options}" CACHE STRING "Extra link flags of gme")
+
+set(gme_LINK_DIRECTORIES "${_gme_link_directories}" CACHE PATH "Extra link directories of gme")
+
+find_package_handle_standard_args(gme
+    REQUIRED_VARS gme_LIBRARY gme_INCLUDE_PATH
+)
+
+if(gme_FOUND)
+    set(gme_dirs ${gme_INCLUDE_PATH})
+    if(EXISTS "${gme_INCLUDE_PATH}/gme")
+        list(APPEND gme_dirs "${gme_INCLUDE_PATH}/gme")
+    endif()
+    if(NOT TARGET gme::gme)
+        add_library(gme::gme UNKNOWN IMPORTED)
+        set_target_properties(gme::gme PROPERTIES
+            IMPORTED_LOCATION "${gme_LIBRARY}"
+            INTERFACE_INCLUDE_DIRECTORIES "${gme_dirs}"
+            INTERFACE_COMPILE_OPTIONS "${gme_COMPILE_OPTIONS}"
+            INTERFACE_LINK_LIBRARIES "${gme_LINK_LIBRARIES}"
+            INTERFACE_LINK_OPTIONS "${gme_LINK_OPTIONS}"
+            INTERFACE_LINK_DIRECTORIES "${gme_LINK_DIRECTORIES}"
+        )
+    endif()
+endif()

libs/SDL2_mixer/x86_64-w64-mingw32/lib/cmake/SDL2_mixer/Findlibxmp-lite.cmake

@@ -0,0 +1,45 @@
+include(FindPackageHandleStandardArgs)
+
+find_package(PkgConfig QUIET)
+pkg_check_modules(PC_XMPLITE QUIET libxmp-lite)
+
+find_library(libxmp_lite_LIBRARY
+    NAMES xmp-lite libxmp-lite
+    HINTS ${PC_XMPLITE_LIBDIR}
+)
+
+find_path(libxmp_lite_INCLUDE_PATH
+    NAMES xmp.h
+    PATH_SUFFIXES libxmp-lite
+    HINTS ${PC_XMPLITE_INCLUDEDIR}
+)
+
+if(PC_XMPLITE_FOUND)
+    get_flags_from_pkg_config("${libxmp_lite_LIBRARY}" "PC_XMPLITE" "_libxmp_lite")
+endif()
+
+set(libxmp_lite_COMPILE_OPTIONS "${_libxmp_lite_compile_options}" CACHE STRING "Extra compile options of libxmp_lite")
+
+set(libxmp_lite_LINK_LIBRARIES "${_libxmp_lite_link_libraries}" CACHE STRING "Extra link libraries of libxmp_lite")
+
+set(libxmp_lite_LINK_OPTIONS "${_libxmp_lite_link_options}" CACHE STRING "Extra link flags of libxmp_lite")
+
+set(libxmp_lite_LINK_DIRECTORIES "${_libxmp_lite_link_directories}" CACHE PATH "Extra link directories of libxmp_lite")
+
+find_package_handle_standard_args(libxmp-lite
+    REQUIRED_VARS libxmp_lite_LIBRARY libxmp_lite_INCLUDE_PATH
+)
+
+if(libxmp-lite_FOUND)
+    if(NOT TARGET libxmp-lite::libxmp-lite)
+        add_library(libxmp-lite::libxmp-lite UNKNOWN IMPORTED)
+        set_target_properties(libxmp-lite::libxmp-lite PROPERTIES
+            IMPORTED_LOCATION "${libxmp_lite_LIBRARY}"
+            INTERFACE_INCLUDE_DIRECTORIES "${libxmp_lite_INCLUDE_PATH}"
+            INTERFACE_COMPILE_OPTIONS "${libxmp_lite_COMPILE_OPTIONS}"
+            INTERFACE_LINK_LIBRARIES "${libxmp_lite_LINK_LIBRARIES}"
+            INTERFACE_LINK_OPTIONS "${libxmp_lite_LINK_OPTIONS}"
+            INTERFACE_LINK_DIRECTORIES "${libxmp_lite_LINK_DIRECTORIES}"
+        )
+    endif()
+endif()

libs/SDL2_mixer/x86_64-w64-mingw32/lib/cmake/SDL2_mixer/Findlibxmp.cmake

@@ -0,0 +1,44 @@
+include(FindPackageHandleStandardArgs)
+
+find_package(PkgConfig QUIET)
+pkg_check_modules(PC_XMP QUIET libxmp)
+
+find_library(libxmp_LIBRARY
+    NAMES xmp
+    HINTS ${PC_XMP_LIBDIR}
+)
+
+find_path(libxmp_INCLUDE_PATH
+    NAMES xmp.h
+    HINTS ${PC_XMP_INCLUDEDIR}
+)
+
+if(PC_XMP_FOUND)
+    get_flags_from_pkg_config("${libxmp_LIBRARY}" "PC_XMP" "_libxmp")
+endif()
+
+set(libxmp_COMPILE_OPTIONS "${_libxmp_compile_options}" CACHE STRING "Extra compile options of libxmp")
+
+set(libxmp_LINK_LIBRARIES "${_libxmp_link_libraries}" CACHE STRING "Extra link libraries of libxmp")
+
+set(libxmp_LINK_OPTIONS "${_libxmp_link_options}" CACHE STRING "Extra link flags of libxmp")
+
+set(libxmp_LINK_DIRECTORIES "${_libxmp_link_directories}" CACHE PATH "Extra link flags of libxmp")
+
+find_package_handle_standard_args(libxmp
+    REQUIRED_VARS libxmp_LIBRARY libxmp_INCLUDE_PATH
+)
+
+if(libxmp_FOUND)
+    if(NOT TARGET libxmp::libxmp)
+        add_library(libxmp::libxmp UNKNOWN IMPORTED)
+        set_target_properties(libxmp::libxmp PROPERTIES
+            IMPORTED_LOCATION "${libxmp_LIBRARY}"
+            INTERFACE_INCLUDE_DIRECTORIES "${libxmp_INCLUDE_PATH}"
+            INTERFACE_COMPILE_OPTIONS "${libxmp_COMPILE_OPTIONS}"
+            INTERFACE_LINK_LIBRARIES "${libxmp_LINK_LIBRARIES}"
+            INTERFACE_LINK_OPTIONS "${libxmp_LINK_OPTIONS}"
+            INTERFACE_LINK_DIRECTORIES "${libxmp_LINK_DIRECTORIES}"
+        )
+    endif()
+endif()

libs/SDL2_mixer/x86_64-w64-mingw32/lib/cmake/SDL2_mixer/Findmodplug.cmake

@@ -0,0 +1,43 @@
+include(FindPackageHandleStandardArgs)
+
+find_package(PkgConfig QUIET)
+pkg_check_modules(PC_MODPLUG QUIET libmodplug)
+
+find_library(modplug_LIBRARY
+    NAMES modplug
+)
+
+find_path(modplug_INCLUDE_PATH
+    NAMES libmodplug/modplug.h
+)
+
+if(PC_MODPLUG_FOUND)
+    get_flags_from_pkg_config("${modplug_LIBRARY}" "PC_MODPLUG" "_modplug")
+endif()
+
+set(modplug_COMPILE_OPTIONS "${_modplug_compile_options}" CACHE STRING "Extra compile options of modplug")
+
+set(modplug_LINK_LIBRARIES "${_modplug_link_libraries}" CACHE STRING "Extra link libraries of modplug")
+
+set(modplug_LINK_OPTIONS "${_modplug_link_options}" CACHE STRING "Extra link flags of modplug")
+
+set(modplug_LINK_DIRECTORIES "${_modplug_link_directories}" CACHE PATH "Extra link directories of modplug")
+
+find_package_handle_standard_args(modplug
+    REQUIRED_VARS modplug_LIBRARY modplug_INCLUDE_PATH
+)
+
+if (modplug_FOUND)
+    if (NOT TARGET modplug::modplug)
+        add_library(modplug::modplug UNKNOWN IMPORTED)
+        set_target_properties(modplug::modplug PROPERTIES
+            IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
+            IMPORTED_LOCATION "${modplug_LIBRARY}"
+            INTERFACE_INCLUDE_DIRECTORIES "${modplug_INCLUDE_PATH}"
+            INTERFACE_COMPILE_OPTIONS "${modplug_COMPILE_OPTIONS}"
+            INTERFACE_LINK_LIBRARIES "${modplug_LINK_LIBRARIES}"
+            INTERFACE_LINK_OPTIONS "${modplug_LINK_OPTIONS}"
+            INTERFACE_LINK_DIRECTORIES "${modplug_LINK_DIRECTORIES}"
+        )
+    endif()
+endif()

libs/SDL2_mixer/x86_64-w64-mingw32/lib/cmake/SDL2_mixer/Findmpg123.cmake

@@ -0,0 +1,44 @@
+include(FindPackageHandleStandardArgs)
+
+find_package(PkgConfig QUIET)
+pkg_check_modules(PC_MPG123 QUIET libmpg123)
+
+find_library(mpg123_LIBRARY
+    NAMES mpg123
+    HINTS ${PC_MPG123_LIBDIR}
+)
+
+find_path(mpg123_INCLUDE_PATH
+    NAMES mpg123.h
+    HINTS ${PC_MPG123_INCLUDEDIR}
+)
+
+if(PC_MPG123_FOUND)
+    get_flags_from_pkg_config("${mpg123_LIBRARY}" "PC_MPG123" "_mpg123")
+endif()
+
+set(mpg123_COMPILE_OPTIONS "${_mpg123_compile_options}" CACHE STRING "Extra compile options of mpg123")
+
+set(mpg123_LINK_LIBRARIES "${_mpg123_link_libraries}" CACHE STRING "Extra link libraries of mpg123")
+
+set(mpg123_LINK_OPTIONS "${_mpg123_link_options}" CACHE STRING "Extra link flags of mpg123")
+
+set(mpg123_LINK_DIRECTORIES "${_mpg123_link_directories}" CACHE PATH "Extra link directories of mpg123")
+
+find_package_handle_standard_args(mpg123
+    REQUIRED_VARS mpg123_LIBRARY mpg123_INCLUDE_PATH
+)
+
+if(mpg123_FOUND)
+    if(NOT TARGET MPG123::libmpg123)
+        add_library(MPG123::libmpg123 UNKNOWN IMPORTED)
+        set_target_properties(MPG123::libmpg123 PROPERTIES
+            IMPORTED_LOCATION "${mpg123_LIBRARY}"
+            INTERFACE_INCLUDE_DIRECTORIES "${mpg123_INCLUDE_PATH}"
+            INTERFACE_COMPILE_OPTIONS "${mpg123_COMPILE_OPTIONS}"
+            INTERFACE_LINK_LIBRARIES "${mpg123_LINK_LIBRARIES}"
+            INTERFACE_LINK_OPTIONS "${mpg123_LINK_OPTIONS}"
+            INTERFACE_LINK_DIRECTORIES "${mpg123_LINK_DIRECTORIES}"
+        )
+    endif()
+endif()

libs/SDL2_mixer/x86_64-w64-mingw32/lib/cmake/SDL2_mixer/Findtremor.cmake

@@ -0,0 +1,44 @@
+include(FindPackageHandleStandardArgs)
+
+find_package(PkgConfig QUIET)
+pkg_check_modules(PC_TREMOR QUIET vorbisidec)
+
+find_library(tremor_LIBRARY
+    NAMES vorbisidec libvorbisidec
+    HINTS ${PC_TREMOR_LIBDIR}
+)
+
+find_path(tremor_INCLUDE_PATH
+    NAMES tremor/ivorbisfile.h
+    HINTS ${PC_TREMOR_INCLUDEDIR}
+)
+
+if(PC_TREMOR_FOUND)
+    get_flags_from_pkg_config("${tremor_LIBRARY}" "PC_TREMOR" "_tremor")
+endif()
+
+set(tremor_COMPILE_OPTIONS "${_tremor_compile_options}" CACHE STRING "Extra compile options of vorbis")
+
+set(tremor_LINK_LIBRARIES "${_tremor_link_libraries}" CACHE STRING "Extra link libraries of vorbis")
+
+set(tremor_LINK_OPTIONS "${_tremor_link_options}" CACHE STRING "Extra link flags of vorbis")
+
+set(tremor_LINK_DIRECTORIES "${_tremor_link_directories}" CACHE PATH "Extra link directories of vorbis")
+
+find_package_handle_standard_args(tremor
+    REQUIRED_VARS tremor_LIBRARY tremor_INCLUDE_PATH
+)
+
+if (tremor_FOUND)
+    if (NOT TARGET tremor::tremor)
+        add_library(tremor::tremor UNKNOWN IMPORTED)
+        set_target_properties(tremor::tremor PROPERTIES
+            IMPORTED_LOCATION "${tremor_LIBRARY}"
+            INTERFACE_INCLUDE_DIRECTORIES "${tremor_INCLUDE_PATH}"
+            INTERFACE_COMPILE_OPTIONS "${tremor_COMPILE_OPTIONS}"
+            INTERFACE_LINK_LIBRARIES "${tremor_LINK_LIBRARIES}"
+            INTERFACE_LINK_OPTIONS "${tremor_LINK_OPTIONS}"
+            INTERFACE_LINK_DIRECTORIES "${tremor_LINK_DIRECTORIES}"
+        )
+    endif()
+endif()

libs/SDL2_mixer/x86_64-w64-mingw32/lib/cmake/SDL2_mixer/Findwavpack.cmake

@@ -0,0 +1,37 @@
+include(FindPackageHandleStandardArgs)
+
+if(WIN32)
+    set(wavpack_find_names wavpack libwavpack wavpackdll)
+else()
+    set(wavpack_find_names wavpack)
+endif()
+find_library(wavpack_LIBRARY
+    NAMES ${wavpack_find_names}
+)
+
+find_path(wavpack_INCLUDE_PATH
+    NAMES wavpack/wavpack.h
+)
+
+set(wavpack_COMPILE_OPTIONS "" CACHE STRING "Extra compile options of wavpack")
+
+set(wavpack_LINK_LIBRARIES "" CACHE STRING "Extra link libraries of wavpack")
+
+set(wavpack_LINK_OPTIONS "" CACHE STRING "Extra link flags of wavpack")
+
+find_package_handle_standard_args(wavpack
+    REQUIRED_VARS wavpack_LIBRARY wavpack_INCLUDE_PATH
+)
+
+if (wavpack_FOUND)
+    if (NOT TARGET WavPack::WavPack)
+        add_library(WavPack::WavPack UNKNOWN IMPORTED)
+        set_target_properties(WavPack::WavPack PROPERTIES
+            IMPORTED_LOCATION "${wavpack_LIBRARY}"
+            INTERFACE_INCLUDE_DIRECTORIES "${wavpack_INCLUDE_PATH}"
+            INTERFACE_COMPILE_OPTIONS "${wavpack_COMPILE_OPTIONS}"
+            INTERFACE_LINK_LIBRARIES "${wavpack_LINK_LIBRARIES}"
+            INTERFACE_LINK_OPTIONS "${wavpack_LINK_OPTIONS}"
+        )
+    endif()
+endif()

libs/SDL2_mixer/x86_64-w64-mingw32/lib/cmake/SDL2_mixer/PkgConfigHelper.cmake

@@ -0,0 +1,34 @@
+# Helper for Find modules
+
+function(get_flags_from_pkg_config _library _pc_prefix _out_prefix)
+  if("${_library}" MATCHES "${CMAKE_STATIC_LIBRARY_SUFFIX}$")
+    set(_cflags ${_pc_prefix}_STATIC_CFLAGS_OTHER)
+    set(_link_libraries ${_pc_prefix}_STATIC_LIBRARIES)
+    set(_link_options ${_pc_prefix}_STATIC_LDFLAGS_OTHER)
+    set(_library_dirs ${_pc_prefix}_STATIC_LIBRARY_DIRS)
+  else()
+    set(_cflags ${_pc_prefix}_CFLAGS_OTHER)
+    set(_link_libraries ${_pc_prefix}_LIBRARIES)
+    set(_link_options ${_pc_prefix}_LDFLAGS_OTHER)
+    set(_library_dirs ${_pc_prefix}_LIBRARY_DIRS)
+  endif()
+
+  # The *_LIBRARIES lists always start with the library itself
+  list(POP_FRONT "${_link_libraries}")
+
+  # Work around CMake's flag deduplication when pc files use `-framework A` instead of `-Wl,-framework,A`
+  string(REPLACE "-framework;" "-Wl,-framework," "_filtered_link_options" "${${_link_options}}")
+
+  set(${_out_prefix}_compile_options
+      "${${_cflags}}"
+      PARENT_SCOPE)
+  set(${_out_prefix}_link_libraries
+      "${${_link_libraries}}"
+      PARENT_SCOPE)
+  set(${_out_prefix}_link_options
+      "${_filtered_link_options}"
+      PARENT_SCOPE)
+  set(${_out_prefix}_link_directories
+      "${${_library_dirs}}"
+      PARENT_SCOPE)
+endfunction()

libs/SDL2_mixer/x86_64-w64-mingw32/lib/cmake/SDL2_mixer/sdl2_mixer-config-version.cmake

@@ -0,0 +1,12 @@
+# sdl2_mixer cmake project-config-version input for ./configure scripts
+
+set(PACKAGE_VERSION "2.8.1")
+
+if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
+  set(PACKAGE_VERSION_COMPATIBLE FALSE)
+else()
+  set(PACKAGE_VERSION_COMPATIBLE TRUE)
+  if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION)
+    set(PACKAGE_VERSION_EXACT TRUE)
+  endif()
+endif()

libs/SDL2_mixer/x86_64-w64-mingw32/lib/cmake/SDL2_mixer/sdl2_mixer-config.cmake

@@ -0,0 +1,195 @@
+# sdl2_mixer cmake project-config input for ./configure scripts
+
+include(FeatureSummary)
+set_package_properties(SDL2_mixer PROPERTIES
+    URL "https://www.libsdl.org/projects/SDL_mixer/"
+    DESCRIPTION "SDL_mixer is a sample multi-channel audio mixer library"
+)
+
+set(SDL2_mixer_FOUND                TRUE)
+
+set(SDL2MIXER_VENDORED              0)
+
+set(SDL2MIXER_CMD                   0)
+
+set(SDL2MIXER_FLAC_LIBFLAC          0)
+set(SDL2MIXER_FLAC_DRFLAC           1)
+if(SDL2MIXER_FLAC_LIBFLAC OR SDL2MIXER_FLAC_DRFLAC)
+    set(SDL2MIXER_FLAC              1)
+else()
+    set(SDL2MIXER_FLAC              0)
+endif()
+
+set(SDL2MIXER_GME                   1)
+
+set(SDL2MIXER_MOD_MODPLUG           0)
+set(SDL2MIXER_MOD_XMP               1)
+set(SDL2MIXER_MOD_XMP_LITE          0)
+if(SDL2MIXER_MOD_MODPLUG OR SDL2MIXER_MOD_XMP OR SDL2MIXER_MOD_XMP_LITE)
+    set(SDL2MIXER_MOD               1)
+else()
+    set(SDL2MIXER_MOD               0)
+endif()
+
+set(SDL2MIXER_MP3_MINIMP3           1)
+set(SDL2MIXER_MP3_MPG123            0)
+if(SDL2MIXER_MP3_MINIMP3 OR SDL2MIXER_MP3_MPG123)
+    set(SDL2MIXER_MP3               1)
+else()
+    set(SDL2MIXER_MP3               0)
+endif()
+
+set(SDL2MIXER_MIDI_FLUIDSYNTH       0)
+set(SDL2MIXER_MIDI_NATIVE           1)
+set(SDL2MIXER_MIDI_TIMIDITY         1)
+if(SDL2MIXER_MIDI_FLUIDSYNTH OR SDL2MIXER_MIDI_NATIVE OR SDL2MIXER_MIDI_TIMIDITY)
+    set(SDL2MIXER_MIDI              1)
+else()
+    set(SDL2MIXER_MIDI              0)
+endif()
+
+set(SDL2MIXER_OPUS                  1)
+
+set(SDL2MIXER_VORBIS)
+set(SDL2MIXER_VORBIS_STB            1)
+set(SDL2MIXER_VORBIS_VORBISFILE     0)
+set(SDL2MIXER_VORBIS_TREMOR         0)
+if(SDL2MIXER_VORBIS_STB)
+    set(SDL2MIXER_VORBIS            STB)
+endif()
+if(SDL2MIXER_VORBIS_VORBISFILE)
+    set(SDL2MIXER_VORBIS            VORBISFILE)
+endif()
+if(SDL2MIXER_VORBIS_TREMOR)
+    set(SDL2MIXER_VORBIS            TREMOR)
+endif()
+
+set(SDL2MIXER_WAVE                  1)
+
+set(SDL2MIXER_WAVPACK               1)
+
+set(SDL2MIXER_SDL2_REQUIRED_VERSION 2.0.9)
+
+get_filename_component(CMAKE_CURRENT_LIST_DIR ${CMAKE_CURRENT_LIST_DIR} REALPATH)
+get_filename_component(prefix "${CMAKE_CURRENT_LIST_DIR}/../../.." ABSOLUTE)
+set(exec_prefix "${prefix}")
+set(bindir "${prefix}/bin")
+set(includedir "${prefix}/include")
+set(libdir "${prefix}/lib")
+set(_sdl2mixer_extra_static_libraries ";winmm")
+string(REGEX REPLACE "(^[;]+|[;]+$)" "" _sdl2mixer_extra_static_libraries "${_sdl2mixer_extra_static_libraries}")
+
+set(_sdl2mixer_bindir   "${bindir}")
+set(_sdl2mixer_libdir   "${libdir}")
+set(_sdl2mixer_incdir   "${includedir}/SDL2")
+
+include(CMakeFindDependencyMacro)
+
+set(_original_cmake_module_path "${CMAKE_MODULE_PATH}")
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
+
+include("${CMAKE_CURRENT_LIST_DIR}/PkgConfigHelper.cmake")
+
+if("modplug::modplug" IN_LIST _sdl2mixer_extra_static_libraries)
+    find_dependency(modplug)
+endif()
+
+if("libxmp::libxmp" IN_LIST _sdl2mixer_extra_static_libraries)
+    find_dependency(libxmp)
+endif()
+
+if("libxmp-lite::libxmp-lite" IN_LIST _sdl2mixer_extra_static_libraries)
+    find_dependency(libxmp-lite)
+endif()
+
+if("FluidSynth::libfluidsynth" IN_LIST _sdl2mixer_extra_static_libraries)
+    find_dependency(FluidSynth)
+endif()
+
+if("Vorbis::vorbisfile" IN_LIST _sdl2mixer_extra_static_libraries)
+    find_dependency(Vorbis)
+endif()
+
+if("tremor::tremor" IN_LIST _sdl2mixer_extra_static_libraries)
+    find_dependency(tremor)
+endif()
+
+if("FLAC::FLAC" IN_LIST _sdl2mixer_extra_static_libraries)
+    find_dependency(FLAC)
+endif()
+
+if("MPG123::libmpg123" IN_LIST _sdl2mixer_extra_static_libraries)
+    find_dependency(mpg123)
+endif()
+
+if("OpusFile::opusfile" IN_LIST _sdl2mixer_extra_static_libraries)
+    find_dependency(OpusFile)
+endif()
+
+if("WavPack::WavPack" IN_LIST _sdl2mixer_extra_static_libraries)
+    find_dependency(wavpack)
+endif()
+
+set(CMAKE_MODULE_PATH "${_original_cmake_module_path}")
+unset(_original_cmake_module_path)
+
+unset(prefix)
+unset(exec_prefix)
+unset(bindir)
+unset(includedir)
+unset(libdir)
+
+include(CMakeFindDependencyMacro)
+
+if(NOT TARGET SDL2_mixer::SDL2_mixer)
+    if(WIN32)
+        set(_sdl2mixer_dll "${_sdl2mixer_bindir}/SDL2_mixer.dll")
+        set(_sdl2mixer_imp "${_sdl2mixer_libdir}/${CMAKE_STATIC_LIBRARY_PREFIX}SDL2_mixer.dll${CMAKE_STATIC_LIBRARY_SUFFIX}")
+        if(EXISTS "${_sdl2mixer_dll}" AND EXISTS "${_sdl2mixer_imp}")
+            add_library(SDL2_mixer::SDL2_mixer SHARED IMPORTED)
+            set_target_properties(SDL2_mixer::SDL2_mixer
+                PROPERTIES
+                    IMPORTED_LOCATION "${_sdl2mixer_dll}"
+                    IMPORTED_IMPLIB "${_sdl2mixer_imp}"
+            )
+        endif()
+        unset(_sdl2mixer_dll)
+        unset(_sdl2mixer_imp)
+    else()
+        set(_sdl2mixer_shl "${_sdl2mixer_libdir}/${CMAKE_SHARED_LIBRARY_PREFIX}SDL2_mixer${CMAKE_SHARED_LIBRARY_SUFFIX}")
+        if(EXISTS "${_sdl2mixer_shl}")
+            add_library(SDL2_mixer::SDL2_mixer SHARED IMPORTED)
+            set_target_properties(SDL2_mixer::SDL2_mixer
+                PROPERTIES
+                    IMPORTED_LOCATION "${_sdl2mixer_shl}"
+            )
+        endif()
+    endif()
+    if(TARGET SDL2_mixer::SDL2_mixer)
+        set_target_properties(SDL2_mixer::SDL2_mixer
+            PROPERTIES
+                INTERFACE_INCLUDE_DIRECTORIES "${_sdl2mixer_incdir}"
+                COMPATIBLE_INTERFACE_BOOL "SDL2_SHARED"
+                INTERFACE_SDL2_SHARED "ON"
+        )
+    endif()
+endif()
+
+if(NOT TARGET SDL2_mixer::SDL2_mixer-static)
+    set(_sdl2mixer_stl "${_sdl2mixer_libdir}/${CMAKE_STATIC_LIBRARY_PREFIX}SDL2_mixer${CMAKE_STATIC_LIBRARY_SUFFIX}")
+    if(EXISTS "${_sdl2mixer_stl}")
+        add_library(SDL2_mixer::SDL2_mixer-static STATIC IMPORTED)
+        set_target_properties(SDL2_mixer::SDL2_mixer-static
+            PROPERTIES
+                INTERFACE_INCLUDE_DIRECTORIES "${_sdl2mixer_incdir}"
+                IMPORTED_LOCATION "${_sdl2mixer_stl}"
+                INTERFACE_LINK_LIBRARIES "${_sdl2mixer_extra_static_libraries}"
+        )
+    endif()
+    unset(_sdl2mixer_stl)
+endif()
+
+unset(_sdl2mixer_extra_static_libraries)
+unset(_sdl2mixer_bindir)
+unset(_sdl2mixer_libdir)
+unset(_sdl2mixer_incdir)

libs/SDL2_mixer/x86_64-w64-mingw32/lib/libSDL2_mixer.la

@@ -17,15 +17,15 @@ old_library='libSDL2_mixer.a'
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/opt/local/x86_64-w64-mingw32/lib -lmingw32 /opt/local/x86_64-w64-mingw32/lib/libSDL2.la -ldinput8 -ldxguid -ldxerr8 -luser32 -lgdi32 -limm32 -lole32 -loleaut32 -lshell32 -lsetupapi -lversion -luuid -lwinmm'
+dependency_libs=' -L/tmp/tardir/SDL2_mixer-2.8.1/VisualC/external/optional/x64 -L/home/runner/work/SDL_mixer/SDL_mixer/deps/mingw-deps/x86_64-w64-mingw32/lib -lmingw32 /home/runner/work/SDL_mixer/SDL_mixer/deps/mingw-deps/x86_64-w64-mingw32/lib/libSDL2.la -ldinput8 -ldxguid -ldxerr8 -luser32 -lgdi32 -limm32 -lole32 -loleaut32 -lshell32 -lsetupapi -lversion -luuid -lwinmm'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
 
 # Version information for libSDL2_mixer.
-current=2
-age=2
-revision=2
+current=800
+age=800
+revision=1
 
 # Is this an already installed library?
 installed=yes
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/Users/valve/release/SDL_mixer/SDL2_mixer-2.0.4/x86_64-w64-mingw32/lib'
+libdir='/tmp/tardir/SDL2_mixer-2.8.1/build-mingw/install-x86_64-w64-mingw32/lib'

libs/SDL2_mixer/x86_64-w64-mingw32/lib/pkgconfig/SDL2_mixer.pc

@@ -1,12 +1,13 @@
-prefix=/opt/local/x86_64-w64-mingw32
+prefix=/tmp/tardir/SDL2_mixer-2.8.1/build-mingw/install-x86_64-w64-mingw32
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=${prefix}/lib
 includedir=${prefix}/include
 
 Name: SDL2_mixer
 Description: mixer library for Simple DirectMedia Layer
-Version: 2.0.4
-Requires: sdl2 >= 2.0.7
+Version: 2.8.1
+Requires: sdl2 >= 2.0.9
 Libs: -L${libdir} -lSDL2_mixer
 Cflags: -I${includedir}/SDL2
-
+Requires.private: 
+Libs.private:  -lwinmm

src/Sourcefile

@@ -48,13 +48,13 @@ v_video.c
 w_wad.c
 y_inter.c
 z_zone.cpp
-r_bsp.c
+r_bsp.cpp
 r_data.c
-r_draw.c
+r_draw.cpp
 r_fps.cpp
 r_main.cpp
 r_patch.cpp
-r_patchrotation.c
+r_patchrotation.cpp
 r_plane.cpp
 r_segs.cpp
 r_skins.c

src/d_clisrv.c

@@ -143,6 +143,11 @@ static CV_PossibleValue_t mindelay_cons_t[] = {{0, "MIN"}, {30, "MAX"}, {0, NULL
 consvar_t cv_mindelay = {"mindelay", "0", CV_SAVE, mindelay_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_gentlemens = {"gentlemensdelay", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, Lagless_OnChange, 0, NULL, NULL, 0, 0, NULL}; // this should be a netvar Zzz...
 
+// allows a fake player to appear on the ms and serverlist when your dedi server is empty
+static void FakeSeed_OnChange(void);
+consvar_t cv_usefakeseed = {"fakeseed", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, FakeSeed_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_fakeseedname = {"fakeseedname", "Player 1", CV_SAVE|CV_CALL|CV_NOINIT, NULL, FakeSeed_OnChange, 0, NULL, NULL, 0, 0, NULL};
+
 SINT8 nodetoplayer[MAXNETNODES]  = {};
 SINT8 nodetoplayer2[MAXNETNODES] = {}; // say the numplayer for this node if any (splitscreen)
 SINT8 nodetoplayer3[MAXNETNODES] = {}; // say the numplayer for this node if any (splitscreen == 2)
@@ -240,6 +245,13 @@ consvar_t cv_httpsource = {"http_source", "", CV_SAVE, NULL, NULL, 0, NULL, NULL
 
 consvar_t cv_kicktime = {"kicktime", "10", CV_SAVE, CV_Unsigned, NULL, 0, NULL, NULL, 0, 0, NULL};
 
+static void FakeSeed_OnChange(void)
+{
+#ifdef MASTERSERVER
+	Update_MS();
+#endif
+}
+
 static boolean UseLocalDelay(void)
 {
 	if (dedicated || (server && server_lagless && !cv_mindelay.value) || modeattacking == ATTACKING_RECORD)
@@ -1544,6 +1556,12 @@ static boolean CL_SendJoin(void)
 	return HSendPacket(servernode, false, 0, sizeof(clientconfig_pak));
 }
 
+static boolean UseFakeSeed(void)
+{
+	// due to complexity this will disable the moment a real player joins
+	return (dedicated && cv_usefakeseed.value && D_NumPlayers() == 0);
+}
+
 static void SV_SendServerInfo(INT32 node, tic_t servertime)
 {
 	UINT8 *p;
@@ -1566,7 +1584,12 @@ static void SV_SendServerInfo(INT32 node, tic_t servertime)
 	netbuffer->u.serverinfo.time = (tic_t)LONG(servertime);
 	netbuffer->u.serverinfo.leveltime = (tic_t)LONG(leveltime);
 
-	netbuffer->u.serverinfo.numberofplayer = (UINT8)D_NumPlayers();
+	// force 1 player
+	if (UseFakeSeed())
+		netbuffer->u.serverinfo.numberofplayer = (UINT8)1;
+	else
+		netbuffer->u.serverinfo.numberofplayer = (UINT8)D_NumPlayers();
+
 	netbuffer->u.serverinfo.maxplayer = (UINT8)(min((dedicated ? MAXPLAYERS-1 : MAXPLAYERS), cv_maxplayers.value));
 
 	// SRB2Kart: Vanilla's gametype constants for MS support
@@ -1645,6 +1668,37 @@ static void SV_SendPlayerInfo(INT32 node)
 
 	netbuffer->packettype = PT_PLAYERINFO;
 
+	// send a fake player to trick ms and serverbrowser
+	if (UseFakeSeed())
+	{
+		//printf("sending fake player lmao\n");
+		netbuffer->u.playerinfo[0].node = 0;
+
+		// fallback to smth, make sure this is always set
+		if (!cv_fakeseedname.string[0])
+			CV_Set(&cv_fakeseedname, "Player 1");
+		strlcpy(netbuffer->u.playerinfo[0].name, cv_fakeseedname.string, MAXPLAYERNAME+1);
+
+		memset(netbuffer->u.playerinfo[0].address, 0, 4);
+
+		// make it appear as spectator
+		netbuffer->u.playerinfo[0].team = 255;
+
+		// doesent really matter what we put here lel
+		netbuffer->u.playerinfo[0].score = LONG(42069);
+		netbuffer->u.playerinfo[0].timeinserver = SHORT(42069);
+		netbuffer->u.playerinfo[0].skin = (UINT8)1; // no clue wtf skin 1 is, tails maybe?
+
+		netbuffer->u.playerinfo[0].data = 0;
+
+		// mark every other slot as empty
+		for (i = 1; i < MSCOMPAT_MAXPLAYERS; i++)
+			netbuffer->u.playerinfo[i].node = 255;
+
+		HSendPacket(node, false, 0, sizeof(plrinfo) * MSCOMPAT_MAXPLAYERS);
+		return;
+	}
+
 	for (i = 0; i < MSCOMPAT_MAXPLAYERS; i++)
 	{
 		if ((i >= MAXPLAYERS) || !playeringame[i])
@@ -5854,12 +5908,14 @@ static void PT_FileFragmentFromPlayer(SINT8 node)
 		Got_Filetxpak();
 }
 
+#ifdef SATURNPAK
 static void PT_ReceivedGamestate(SINT8 node)
 {
 	sendingsavegame[node] = false;
 	resendingsavegame[node] = 0;
 	savegameresendcooldown[node] = I_GetTime() + cv_resynchcooldown.value * TICRATE; // I_GetTime() + 5 * TICRATE;
 }
+#endif
 
 /** Handles a packet received from a node that is in game
   *

src/d_clisrv.h

@@ -582,6 +582,8 @@ extern tic_t simulated_lag;
 extern tic_t lowest_lag;
 extern consvar_t cv_mindelay, cv_gentlemens;
 
+extern consvar_t cv_usefakeseed, cv_fakeseedname;
+
 extern consvar_t
 	cv_netticbuffer, cv_allownewplayer,
 #ifdef SATURNJOIN

src/d_main.c

@@ -166,57 +166,6 @@ UINT8 ctrldown = 0;   // 0x1 left, 0x2 right
 UINT8 altdown = 0;    // 0x1 left, 0x2 right
 boolean capslock = 0; // gee i wonder what this does.
 
-static void D_PadMenuScrollInput(UINT8 input)
-{
-	event_t dpadev;
-	memset(&dpadev, 0, sizeof(event_t));
-	dpadev.type = ev_keydown;
-
-	switch (input)
-	{
-		case DPAD_UP:
-			dpadev.data1 = KEY_UPARROW;
-			break;
-		case DPAD_DOWN:
-			dpadev.data1 = KEY_DOWNARROW;
-			break;
-		case DPAD_LEFT:
-			dpadev.data1 = KEY_LEFTARROW;
-			break;
-		case DPAD_RIGHT:
-			dpadev.data1 = KEY_RIGHTARROW;
-			break;
-	}
-
-	D_PostEvent(&dpadev); // put into eventlist
-}
-
-#define SCROLLDELAY 19
-
-// Check if any dpad button is held
-// and pass it to the eventlist
-static void D_GamePadMenuScrollTicker(void)
-{
-	UINT8 i;
-	static UINT8 menuInputDelayTimer = 0;
-
-	for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
-	{
-		if (dpadscrollstate[i])
-		{
-			if (menuInputDelayTimer < SCROLLDELAY)
-				menuInputDelayTimer++;
-			else if (menuInputDelayTimer == SCROLLDELAY)
-				D_PadMenuScrollInput(i);
-
-			return;
-		}
-	}
-
-	menuInputDelayTimer = 0;
-}
-#undef SCROLLDELAY
-
 static UINT16 curcolor[MAXSPLITSCREENPLAYERS] = {};
 
 static void D_DeviceLEDTick(void)
@@ -726,6 +675,7 @@ void D_SRB2Loop(void)
 	tic_t entertic = 0, oldentertics = 0, realtics = 0, rendertimeout = INFTICS;
 	double deltatics = 0.0;
 	double deltasecs = 0.0;
+	UINT64 precision;
 
 	boolean interp = false;
 	boolean doDisplay = false;
@@ -761,18 +711,23 @@ void D_SRB2Loop(void)
 		V_DrawFixedPatch(0, 0, FRACUNIT/2, 0, W_CachePatchNum(W_GetNumForName("KARTKREW"), PU_PATCH_LOWPRIORITY), NULL);
 	I_FinishUpdate(); // page flip or blit buffer
 
+	precision = I_GetPrecisePrecision();
+
 	for (;;)
 	{
 		// capbudget is the minimum precise_t duration of a single loop iteration
 		precise_t capbudget;
-		precise_t enterprecise = I_GetPreciseTime();
+		precise_t elapsed;
+		precise_t enterprecise, finishprecise;
+
+		enterprecise = I_GetPreciseTime();
 
 		memset(&g_dc, 0, sizeof(g_dc));
 		Z_Frame_Reset();
 
 		// Casting the return value of a function is bad practice (apparently)
-		double budget = ((R_GetFramerateCap() == 0) ? 0.0 : round((1.0 / R_GetFramerateCap()) * I_GetPrecisePrecision()));
-		capbudget = (precise_t)budget;
+		const UINT32 framecap = R_GetFramerateCap();
+		capbudget = (framecap == 0) ? 0 : (precise_t)((double)precision / (double)framecap + 0.5); // + 0.5 instead of round
 
 		boolean ranwipe = false;
 
@@ -844,18 +799,13 @@ void D_SRB2Loop(void)
 
 			if (!dedicated)
 			{
-				if (menuactive)
-				{
-					D_GamePadMenuScrollTicker();
-				}
-
 				D_DeviceLEDTick();
 			}
 		}
 
 		if (interp)
 		{
-			renderdeltatics = FloatToFixed(deltatics);
+			renderdeltatics = DoubleToFixed(deltatics);
 
 			// I looked at the possibility of putting in a float drawer for
 			// perfstats and it's very complicated, so we'll just do this instead...
@@ -904,12 +854,13 @@ void D_SRB2Loop(void)
 		}
 #endif
 		// Fully completed frame made.
-		precise_t finishprecise = I_GetPreciseTime();
+		finishprecise = I_GetPreciseTime();
 
 		// Use the time before sleep for frameskip calculations:
 		// post-sleep time is literally being intentionally wasted
-		deltasecs = (double)((INT64)(finishprecise - enterprecise)) / I_GetPrecisePrecision();
-		deltatics = deltasecs * NEWTICRATE;
+		elapsed = finishprecise - enterprecise;
+		deltasecs = (double)elapsed / (double)precision;
+		deltatics = deltasecs * (double)NEWTICRATE;
 
 		// If time spent this game loop exceeds a single tic,
 		// it's probably because of rendering.
@@ -937,12 +888,10 @@ void D_SRB2Loop(void)
 
 		if (!singletics)
 		{
-			INT64 elapsed = (INT64)(finishprecise - enterprecise);
-
 			// in the case of "match refresh rate" + vsync, don't sleep at all
 			const boolean vsync_with_match_refresh = cv_vidwait.value && cv_fpscap.value == 0;
 
-			if ((elapsed > 0) && ((INT64)capbudget > elapsed) && !vsync_with_match_refresh)
+			if ((elapsed > 0) && (capbudget > elapsed) && !vsync_with_match_refresh)
 			{
 				I_SleepDuration(capbudget - elapsed);
 			}
@@ -950,8 +899,9 @@ void D_SRB2Loop(void)
 
 		// Capture the time once more to get the real delta time.
 		finishprecise = I_GetPreciseTime();
-		deltasecs = (double)((INT64)(finishprecise - enterprecise)) / I_GetPrecisePrecision();
-		deltatics = deltasecs * NEWTICRATE;
+		elapsed = finishprecise - enterprecise;
+		deltasecs = (double)elapsed / (double)precision;
+		deltatics = deltasecs * (double)NEWTICRATE;
 	}
 }
 

src/d_netcmd.c

@@ -760,6 +760,9 @@ void D_RegisterServerCommands(void)
 	CV_RegisterVar(&cv_showping);
 	CV_RegisterVar(&cv_pingmeasurement);
 
+	CV_RegisterVar(&cv_usefakeseed);
+	CV_RegisterVar(&cv_fakeseedname);
+
 #ifdef SEENAMES
 	CV_RegisterVar(&cv_allowseenames);
 #endif

src/dedicated/i_system.c

@@ -808,20 +808,23 @@ static void I_SetupMumble(void)
 void I_UpdateMumble(const mobj_t *mobj, const listener_t listener)
 {
 #ifdef HAVE_MUMBLE
-	double angle;
+	float angle;
 	fixed_t anglef;
 
 	if (!mumble)
 		return;
 
-	if (mumble->uiVersion != 2) {
-		wcsncpy(mumble->name, L"SRB2Kart "VERSIONSTRINGW, 256);
+	if (mumble->uiVersion != 2)
+	{
+		wcsncpy(mumble->name, L"SRB2Kart " VERSIONSTRINGW, 256);
 		wcsncpy(mumble->description, L"Sonic Robo Blast 2 Kart with integrated Mumble Link support.", 2048);
 		mumble->uiVersion = 2;
 	}
 	mumble->uiTick++;
 
-	if (!netgame || gamestate != GS_LEVEL) { // Zero out, but never delink.
+	// Zero out, but never delink.
+	if (!netgame || gamestate != GS_LEVEL)
+	{
 		mumble->fAvatarPosition[0] = mumble->fAvatarPosition[1] = mumble->fAvatarPosition[2] = 0.0f;
 		mumble->fAvatarFront[0] = 1.0f;
 		mumble->fAvatarFront[1] = mumble->fAvatarFront[2] = 0.0f;
@@ -838,31 +841,34 @@ void I_UpdateMumble(const mobj_t *mobj, const listener_t listener)
 		mumble->context_len = (UINT32)(p - mumble->context);
 	}
 
-	if (mobj) {
-		mumble->fAvatarPosition[0] = FIXED_TO_FLOAT(mobj->x) / MUMBLEUNIT;
-		mumble->fAvatarPosition[1] = FIXED_TO_FLOAT(mobj->z) / MUMBLEUNIT;
-		mumble->fAvatarPosition[2] = FIXED_TO_FLOAT(mobj->y) / MUMBLEUNIT;
+	if (mobj)
+	{
+		mumble->fAvatarPosition[0] = FixedToFloat(mobj->x) / MUMBLEUNIT;
+		mumble->fAvatarPosition[1] = FixedToFloat(mobj->z) / MUMBLEUNIT;
+		mumble->fAvatarPosition[2] = FixedToFloat(mobj->y) / MUMBLEUNIT;
 
 		anglef = AngleFixed(mobj->angle);
-		angle = FIXED_TO_FLOAT(anglef)*DEG2RAD;
-		mumble->fAvatarFront[0] = (float)cos(angle);
+		angle = (float)(FixedToFloat(anglef) * DEG2RAD);
+		mumble->fAvatarFront[0] = cosf(angle);
 		mumble->fAvatarFront[1] = 0.0f;
-		mumble->fAvatarFront[2] = (float)sin(angle);
-	} else {
+		mumble->fAvatarFront[2] = sinf(angle);
+	}
+	else
+	{
 		mumble->fAvatarPosition[0] = mumble->fAvatarPosition[1] = mumble->fAvatarPosition[2] = 0.0f;
 		mumble->fAvatarFront[0] = 1.0f;
 		mumble->fAvatarFront[1] = mumble->fAvatarFront[2] = 0.0f;
 	}
 
-	mumble->fCameraPosition[0] = FIXED_TO_FLOAT(listener.x) / MUMBLEUNIT;
-	mumble->fCameraPosition[1] = FIXED_TO_FLOAT(listener.z) / MUMBLEUNIT;
-	mumble->fCameraPosition[2] = FIXED_TO_FLOAT(listener.y) / MUMBLEUNIT;
+	mumble->fCameraPosition[0] = FixedToFloat(listener.x) / MUMBLEUNIT;
+	mumble->fCameraPosition[1] = FixedToFloat(listener.z) / MUMBLEUNIT;
+	mumble->fCameraPosition[2] = FixedToFloat(listener.y) / MUMBLEUNIT;
 
 	anglef = AngleFixed(listener.angle);
-	angle = FIXED_TO_FLOAT(anglef)*DEG2RAD;
-	mumble->fCameraFront[0] = (float)cos(angle);
+	angle = (float)(FixedToFloat(anglef) * DEG2RAD);
+	mumble->fCameraFront[0] = cosf(angle);
 	mumble->fCameraFront[1] = 0.0f;
-	mumble->fCameraFront[2] = (float)sin(angle);
+	mumble->fCameraFront[2] = sinf(angle);
 #else
 	(void)mobj;
 	(void)listener;

src/doomdef.h

@@ -117,7 +117,7 @@ extern char  logfilename[1024];
 #define VERSIONSTRING "Saturn v9"
 #define VERSIONSTRINGW L"Saturn v9"
 
-#define SATURN_TESTING // comment out for saturn release builds!
+//#define SATURN_TESTING // comment out for saturn release builds!
 
 // Hey! If you change this, add 1 to the MODVERSION below! Otherwise we can't force updates!
 // And change CMakeLists.txt (not src/, but in root), for CMake users!

src/f_wipe.c

@@ -98,7 +98,8 @@ static fixed_t paldiv;
   * \param	lump	Lump name to get data from
   * \return	fademask_t for lump
   */
-static fademask_t *F_GetFadeMask(UINT8 masknum, UINT8 scrnnum) {
+static fademask_t *F_GetFadeMask(UINT8 masknum, UINT8 scrnnum)
+{
 	static char lumpname[9] = "FADEmmss";
 	static fademask_t fm = {NULL,0,0,0,0,0};
 	lumpnum_t lumpnum;
@@ -148,6 +149,7 @@ static fademask_t *F_GetFadeMask(UINT8 masknum, UINT8 scrnnum) {
 		case 0: // end marker (not bad!, but still need clearing)
 			goto freemask;
 	}
+
 	if (lsize != fm.size)
 		fm.mask = Z_Realloc(fm.mask, lsize, PU_STATIC, NULL);
 	fm.size = lsize;
@@ -361,6 +363,7 @@ void F_RunWipe(UINT8 wipetype, boolean drawMenu)
 	{
 		// get fademask first so we can tell if it exists or not
 		fmask = F_GetFadeMask(wipetype, wipeframe++);
+
 		if (!fmask)
 			break;
 
@@ -377,7 +380,7 @@ void F_RunWipe(UINT8 wipetype, boolean drawMenu)
 			HWR_DoWipe(wipetype, wipeframe-1); // send in the wipe type and wipeframe because we need to cache the graphic
 		else
 #endif
-		if (rendermode != render_none) //this allows F_RunWipe to be called in dedicated servers
+		if (rendermode != render_none) // this allows F_RunWipe to be called in dedicated servers
 			F_DoWipe(fmask);
 
 		I_OsPolling();
@@ -401,6 +404,7 @@ void F_RunWipe(UINT8 wipetype, boolean drawMenu)
 
 		NetKeepAlive(); // Update the network so we don't cause timeouts
 	}
+
 	WipeInAction = false;
 #endif
 }

src/g_game.c

@@ -2288,7 +2288,7 @@ void G_PlayerReborn(INT32 player)
 	}
 
 	/* I'm putting this here because lol */
-	fade = (cv_birdmusic.value && cv_fading.value && P_IsLocalPlayer(p));
+	fade = (cv_fading.value && P_IsLocalPlayer(p));
 
 	if (fade)
 	{

src/g_input.c

@@ -262,9 +262,6 @@ void G_ResetControls(void)
 
 	memset(joyxmove, 0, sizeof(joyxmove));
 	memset(joyymove, 0, sizeof(joyymove));
-
-	// reset those just in case the game missed the keyup event
-	memset(dpadscrollstate, false, sizeof(dpadscrollstate));
 }
 
 //

src/g_input.h

@@ -37,7 +37,7 @@ typedef enum
 	KEY_JOY1 = KEY_MOUSE1 + MOUSEBUTTONS,
 	KEY_HAT1 = KEY_JOY1 + JOYBUTTONS,
 
-	KEY_DBLMOUSE1 =KEY_HAT1 + JOYHATS*4, // double clicks
+	KEY_DBLMOUSE1 = KEY_HAT1 + JOYHATS*4, // double clicks
 	KEY_DBLJOY1 = KEY_DBLMOUSE1 + MOUSEBUTTONS,
 	KEY_DBLHAT1 = KEY_DBLJOY1 + JOYBUTTONS,
 

src/hardware/hw_main.cpp

@@ -430,13 +430,13 @@ void HWR_Lighting(FSurfaceInfo *Surface, INT32 light_level, extracolormap_t *col
 		blue  = (float)poly_color.s.blue;
 
 		// 48 is just an arbritrary value that looked relatively okay.
-		tint_alpha = (float)(sqrt(tint_color.s.alpha) * 48) / 255.0f;
+		tint_alpha = (sqrtf((float)tint_color.s.alpha) * 48.0f) / 255.0f;
 
 		// 8 is roughly the brightness of the "close" color in Software, and 16 the brightness of the "far" color.
 		// 8 is too bright for dark levels, and 16 is too dark for bright levels.
 		// 12 is the compromise value. It doesn't look especially good anywhere, but it's the most balanced.
 		// (Also, as far as I can tell, fade_color's alpha is actually not used in Software, so we only use light level.)
-		fade_alpha = (float)(sqrt(255-light_level) * 12) / 255.0f;
+		fade_alpha = (sqrtf((float)(255-light_level)) * 12.0f) / 255.0f;
 
 		// Clamp the alpha values
 		tint_alpha = CLAMP(tint_alpha, 0.0f, 1.0f);
@@ -557,7 +557,8 @@ static void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, bool
 	size_t len;
 
 	float tempxsow, tempytow;
-	float scrollx = 0.0f, scrolly = 0.0f, anglef = 0.0f;
+	float scrollx = 0.0f, scrolly = 0.0f;
+	float anglef  = 0.0f, cosangf = 0.0f, sinangf = 0.0f;
 	angle_t angle = 0;
 
 	static FOutVector *planeVerts = NULL;
@@ -571,7 +572,7 @@ static void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, bool
 
 	nrPlaneVerts = planepoly->numpts;
 
-	if (nrPlaneVerts < 3)   //not even a triangle ?
+	if (nrPlaneVerts < 3) // not even a triangle ?
 		return;
 
 	const sector_t *sec = FOFsector ? FOFsector : gl_frontsector;
@@ -654,8 +655,10 @@ static void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, bool
 		tempxsow = flatxref;
 		tempytow = flatyref;
 		anglef   = ANG2RAD(InvAngle(angle));
-		flatxref = (tempxsow * cosf(anglef)) - (tempytow * sinf(anglef));
-		flatyref = (tempxsow * sinf(anglef)) + (tempytow * cosf(anglef));
+		cosangf = cosf(anglef);
+		sinangf = sinf(anglef);
+		flatxref = (tempxsow * cosangf) - (tempytow * sinangf);
+		flatyref = (tempxsow * sinangf) + (tempytow * cosangf);
 	}
 
 #define SETUP3DVERT(vert, vx, vy) {\
@@ -668,8 +671,8 @@ static void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, bool
 		{\
 			tempxsow = vert->s;\
 			tempytow = vert->t;\
-			vert->s = (tempxsow * cosf(anglef)) - (tempytow * sinf(anglef));\
-			vert->t = (tempxsow * sinf(anglef)) + (tempytow * cosf(anglef));\
+			vert->s = (tempxsow * cosangf) - (tempytow * sinangf);\
+			vert->t = (tempxsow * sinangf) + (tempytow * cosangf);\
 		}\
 \
 		vert->x = (vx);\
@@ -1150,11 +1153,11 @@ static void HWR_SplitWall(sector_t *sector, FOutVector *wallVerts, INT32 texnum,
 // Additionally, to remove the need to draw the sky twice, drawing a plane at the far clip boundary to the stencil buffer after other
 // rendering will also allow stencil sky rendering to fill in any untouched pixels too.
 
-FOutVector* skyWallVertexArray = NULL;
-int skyWallVertexArraySize = 0;
-int skyWallVertexArrayAllocSize = 65536;// what a mouthful
+static FOutVector* skyWallVertexArray = NULL;
+static int skyWallVertexArraySize = 0;
+static int skyWallVertexArrayAllocSize = 65536;// what a mouthful
 
-boolean gl_collect_skywalls = false;
+static boolean gl_collect_skywalls = false;
 
 static void HWR_SkyWallList_Clear(void)
 {
@@ -1183,7 +1186,7 @@ static void HWR_SkyWallList_Add(FOutVector *wallVerts)
 static void HWR_DrawSkyWallList(void)
 {
 	int i;
-	FSurfaceInfo surf;
+	FSurfaceInfo surf = {};
 
 	surf.PolyColor.rgba = 0xFFFFFFFF;
 
@@ -1268,8 +1271,8 @@ static inline boolean HWR_BlendMidtextureSurface(FSurfaceInfo *pSurf)
 			pSurf->PolyColor.s.alpha = 0x00; // This shouldn't draw anything regardless of blendmode
 			return false;
 		}
-		else
-			blendmode = HWR_TranstableToAlpha(gl_curline->polyseg->translucency, pSurf);
+
+		blendmode = HWR_TranstableToAlpha(gl_curline->polyseg->translucency, pSurf);
 	}
 
 	if (blendmode != PF_Masked && pSurf->PolyColor.s.alpha == 0x00)
@@ -1362,6 +1365,9 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
 	const INT32 gl_midtexture = R_GetTextureNum(gl_sidedef->midtexture);
 	GLMapTexture_t *glTex = NULL;
 
+	static constexpr float FLOATMAX = INT32_MAX / (float)FRACUNIT;
+	static constexpr float FLOATMIN = INT32_MIN / (float)FRACUNIT;
+
 	// two sided line
 	if (gl_backsector)
 	{
@@ -1376,7 +1382,7 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
 		if (!gl_curline->polyseg) // Don't do it for polyobjects
 		{
 			// Sky Ceilings
-			wallVerts[3].y = wallVerts[2].y = FixedToFloat(INT32_MAX);
+			wallVerts[3].y = wallVerts[2].y = FLOATMAX;
 
 			auto draw_sky_walls = [&](int vert1, int vert2, fixed_t world, fixed_t worldslope)
 			{
@@ -1411,7 +1417,7 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
 			}
 
 			// Sky Floors
-			wallVerts[0].y = wallVerts[1].y = FixedToFloat(INT32_MIN);
+			wallVerts[0].y = wallVerts[1].y = FLOATMIN;
 
 			if (gl_frontsector->floorpic == skyflatnum)
 			{
@@ -1455,18 +1461,21 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
 		// check TOP TEXTURE
 		if (gl_toptexture && (worldhighslope < worldtopslope || worldhigh < worldtop))
 		{
+			fixed_t texheight = textureheight[gl_toptexture];
+
 			// PEGGING
+			// FIXME: This is probably not correct?
 			if (gl_linedef->flags & ML_DONTPEGTOP)
 				texturevpeg = 0;
 			else if (gl_linedef->flags & ML_EFFECT1)
-				texturevpeg = worldhigh + textureheight[gl_toptexture] - worldtop;
+				texturevpeg = worldhigh + texheight - worldtop;
 			else
-				texturevpeg = gl_backsector->ceilingheight + textureheight[gl_toptexture] - gl_frontsector->ceilingheight;
+				texturevpeg = gl_backsector->ceilingheight + texheight - gl_frontsector->ceilingheight;
 
 			texturevpeg += gl_sidedef->rowoffset;
 
 			// This is so that it doesn't overflow and screw up the wall, it doesn't need to go higher than the texture's height anyway
-			texturevpeg %= textureheight[gl_toptexture];
+			texturevpeg %= texheight;
 
 			glTex = HWR_GetTexture(gl_toptexture, noencore);
 
@@ -1487,13 +1496,13 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
 			else if (gl_linedef->flags & ML_DONTPEGTOP)
 			{
 				// Skewed by top
-				wallVerts[0].t = (texturevpeg + worldtop - worldhigh) * glTex->scaleY;
-				wallVerts[1].t = (texturevpeg + worldtopslope - worldhighslope) * glTex->scaleY;
+				wallVerts[0].t = (texturevpeg + (worldtop - worldhigh)) * glTex->scaleY;
+				wallVerts[1].t = (texturevpeg + (worldtopslope - worldhighslope)) * glTex->scaleY;
 			}
 			else
 			{
 				// Skewed by bottom
-				wallVerts[0].t = wallVerts[1].t = (texturevpeg + worldtop - worldhigh) * glTex->scaleY;
+				wallVerts[0].t = wallVerts[1].t = (texturevpeg + (worldtop - worldhigh)) * glTex->scaleY;
 				wallVerts[3].t = wallVerts[0].t - (worldtop - worldhigh) * glTex->scaleY;
 				wallVerts[2].t = wallVerts[1].t - (worldtopslope - worldhighslope) * glTex->scaleY;
 			}
@@ -1533,7 +1542,7 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
 			glTex = HWR_GetTexture(gl_bottomtexture, noencore);
 
 			wallVerts[3].t = wallVerts[2].t = texturevpeg * glTex->scaleY;
-			wallVerts[0].t = wallVerts[1].t = (texturevpeg + gl_backsector->floorheight - gl_frontsector->floorheight) * glTex->scaleY;
+			wallVerts[0].t = wallVerts[1].t = (texturevpeg + (gl_backsector->floorheight - gl_frontsector->floorheight)) * glTex->scaleY;
 			wallVerts[0].s = wallVerts[3].s = cliplow * glTex->scaleX;
 			wallVerts[2].s = wallVerts[1].s = cliphigh * glTex->scaleX;
 
@@ -1549,14 +1558,14 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
 			else if (gl_linedef->flags & ML_DONTPEGBOTTOM)
 			{
 				// Skewed by bottom
-				wallVerts[0].t = wallVerts[1].t = (texturevpeg + worldlow - worldbottom) * glTex->scaleY;
+				wallVerts[0].t = wallVerts[1].t = (texturevpeg + (worldlow - worldbottom)) * glTex->scaleY;
 				wallVerts[2].t = wallVerts[1].t - (worldlowslope - worldbottomslope) * glTex->scaleY;
 			}
 			else
 			{
 				// Skewed by top
-				wallVerts[0].t = (texturevpeg + worldlow - worldbottom) * glTex->scaleY;
-				wallVerts[1].t = (texturevpeg + worldlowslope - worldbottomslope) * glTex->scaleY;
+				wallVerts[0].t = (texturevpeg + (worldlow - worldbottom)) * glTex->scaleY;
+				wallVerts[1].t = (texturevpeg + (worldlowslope - worldbottomslope)) * glTex->scaleY;
 			}
 
 			// set top/bottom coords
@@ -1588,6 +1597,8 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
 			else
 				back = gl_linedef->backsector;
 
+			fixed_t texheight = textureheight[gl_midtexture];
+
 			if (gl_sidedef->repeatcnt)
 				repeats = 1 + gl_sidedef->repeatcnt;
 			else if (gl_linedef->flags & ML_EFFECT5 || gl_portal_state == GLPORTAL_STENCIL || gl_portal_state == GLPORTAL_DEPTH)
@@ -1604,8 +1615,8 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
 				else
 					low = back->floorheight;
 
-				repeats = (high - low) / textureheight[gl_midtexture];
-				if ((high - low) % textureheight[gl_midtexture])
+				repeats = (high - low) / texheight;
+				if ((high - low) % texheight)
 					repeats++; // tile an extra time to fill the gap -- Monster Iestyn
 			}
 			else
@@ -1637,18 +1648,22 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
 			}
 
 			// Find the wall's coordinates
-			const fixed_t midtexheight = textureheight[gl_midtexture] * repeats;
+			const fixed_t midtexheight = texheight * repeats;
 
+			fixed_t rowoffset = gl_sidedef->rowoffset;
+
+			// Texture is not skewed
 			if (gl_linedef->flags & ML_EFFECT2)
 			{
 				if (!!(gl_linedef->flags & ML_DONTPEGBOTTOM) ^ !!(gl_linedef->flags & ML_EFFECT3)) // Peg it to the floor
 				{
-					polybottom = std::max(front->floorheight, back->floorheight) + gl_sidedef->rowoffset;
-					polytop    = polybottom + midtexheight;
+					polybottom = std::max(gl_frontsector->floorheight, gl_backsector->floorheight) + rowoffset;
+					polytop = polybottom + midtexheight;
 				}
-				else // Peg it to the ceiling
+				// Peg it to the ceiling
+				else
 				{
-					polytop    = std::min(front->ceilingheight, back->ceilingheight) + gl_sidedef->rowoffset;
+					polytop = std::min(gl_frontsector->ceilingheight, gl_backsector->ceilingheight) + rowoffset;
 					polybottom = polytop - midtexheight;
 				}
 
@@ -1658,16 +1673,16 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
 			}
 			else if (!!(gl_linedef->flags & ML_DONTPEGBOTTOM) ^ !!(gl_linedef->flags & ML_EFFECT3)) // Skew the texture, but peg it to the floor
 			{
-				polybottom = popenbottom + gl_sidedef->rowoffset;
+				polybottom = popenbottom + rowoffset;
 				polytop = polybottom + midtexheight;
-				polybottomslope = popenbottomslope + gl_sidedef->rowoffset;
+				polybottomslope = popenbottomslope + rowoffset;
 				polytopslope = polybottomslope + midtexheight;
 			}
 			else // Skew it according to the ceiling's slope
 			{
-				polytop         = popentop + gl_sidedef->rowoffset;
+				polytop         = popentop + rowoffset;
 				polybottom      = polytop - midtexheight;
-				polytopslope    = popentopslope + gl_sidedef->rowoffset;
+				polytopslope    = popentopslope + rowoffset;
 				polybottomslope = polytopslope - midtexheight;
 			}
 
@@ -1751,7 +1766,7 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
 		{
 			glTex = HWR_GetTexture(gl_midtexture, noencore);
 
-			fixed_t     texturevpeg;
+			fixed_t texturevpeg;
 
 			// PEGGING
 			if ((gl_linedef->flags & (ML_DONTPEGBOTTOM|ML_EFFECT2)) == (ML_DONTPEGBOTTOM|ML_EFFECT2))
@@ -1776,13 +1791,13 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
 			}
 			else if (gl_linedef->flags & ML_DONTPEGBOTTOM)
 			{
-				wallVerts[3].t = wallVerts[0].t + (worldbottom-worldtop) * glTex->scaleY;
-				wallVerts[2].t = wallVerts[1].t + (worldbottomslope-worldtopslope) * glTex->scaleY;
+				wallVerts[3].t = wallVerts[0].t + (worldbottom - worldtop) * glTex->scaleY;
+				wallVerts[2].t = wallVerts[1].t + ((worldbottomslope - worldtopslope)) * glTex->scaleY;
 			}
 			else
 			{
-				wallVerts[0].t = wallVerts[3].t - (worldbottom-worldtop) * glTex->scaleY;
-				wallVerts[1].t = wallVerts[2].t - (worldbottomslope-worldtopslope) * glTex->scaleY;
+				wallVerts[0].t = wallVerts[3].t - (worldbottom - worldtop) * glTex->scaleY;
+				wallVerts[1].t = wallVerts[2].t - (worldbottomslope - worldtopslope) * glTex->scaleY;
 			}
 
 			//Set textures properly on single sided walls that are sloped
@@ -1819,7 +1834,7 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
 		{
 			if (gl_frontsector->ceilingpic == skyflatnum) // It's a single-sided line with sky for its sector
 			{
-				wallVerts[2].y = wallVerts[3].y = FixedToFloat(INT32_MAX); // draw to top of map space
+				wallVerts[2].y = wallVerts[3].y = FLOATMAX; // draw to top of map space
 				wallVerts[0].y = FixedToFloat(worldtop);
 				wallVerts[1].y = FixedToFloat(worldtopslope);
 
@@ -1829,7 +1844,7 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
 			{
 				wallVerts[3].y = FixedToFloat(worldbottom);
 				wallVerts[2].y = FixedToFloat(worldbottomslope);
-				wallVerts[0].y = wallVerts[1].y = FixedToFloat(INT32_MIN); // draw to bottom of map space
+				wallVerts[0].y = wallVerts[1].y = FLOATMIN; // draw to bottom of map space
 
 				HWR_DrawSkyWall(wallVerts, &Surf);
 			}
@@ -1847,7 +1862,6 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
 		fixed_t high1, highslope1, low1, lowslope1;
 
 		INT32 texnum;
-		line_t * newline = NULL; // Multi-Property FOF
 
 		lowcut       = std::max(worldbottom, worldlow);
 		highcut      = std::min(worldtop, worldhigh);
@@ -1882,14 +1896,24 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
 				if ((high1 < lowcut || highslope1 < lowcutslope) || (low1 > highcut || lowslope1 > highcutslope))
 					continue;
 
-				texnum = R_GetTextureNum(sides[rover->master->sidenum[0]].midtexture);
+				side_t *side = R_GetFFloorSide(gl_curline->linedef, rover, gl_backsector);
+
+				boolean do_texture_skew;
+				boolean dont_peg_bottom;
 
 				if (rover->master->flags & ML_TFERLINE)
 				{
-					size_t linenum = std::min((size_t)(gl_curline->linedef-gl_backsector->lines[0]), rover->master->frontsector->linecount);
-					newline = rover->master->frontsector->lines[0] + linenum;
-					texnum = R_GetTextureNum(sides[newline->sidenum[0]].midtexture);
+					line_t *newline = R_GetFFloorLine(gl_curline->linedef, rover, gl_backsector);
+					do_texture_skew = newline->flags & ML_DONTPEGTOP;
+					dont_peg_bottom = newline->flags & ML_DONTPEGBOTTOM;
 				}
+				else
+				{
+					do_texture_skew = rover->master->flags & ML_DONTPEGTOP;
+					dont_peg_bottom = gl_curline->linedef->flags & ML_DONTPEGBOTTOM;
+				}
+
+				texnum = R_GetTextureNum(side->midtexture);
 
 				h  = P_GetFFloorTopZAt   (rover, v1x, v1y);
 				hS = P_GetFFloorTopZAt   (rover, v2x, v2y);
@@ -1926,44 +1950,30 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
 				}
 				else
 				{
-					fixed_t texturevpeg;
-					boolean attachtobottom = false;
-					boolean slopeskew = false; // skew FOF walls with slopes?
-
 					// Wow, how was this missing from OpenGL for so long?
 					// ...Oh well, anyway, Lower Unpegged now changes pegging of FOFs like in software
 					// -- Monster Iestyn 26/06/18
-					if (newline)
-					{
-						texturevpeg = sides[newline->sidenum[0]].rowoffset;
-						attachtobottom = !!(newline->flags & ML_DONTPEGBOTTOM);
-						slopeskew = !!(newline->flags & ML_DONTPEGTOP);
-					}
-					else
-					{
-						texturevpeg = sides[rover->master->sidenum[0]].rowoffset;
-						attachtobottom = !!(gl_linedef->flags & ML_DONTPEGBOTTOM);
-						slopeskew = !!(rover->master->flags & ML_DONTPEGTOP);
-					}
+					fixed_t texturevpeg = side->rowoffset;
 
 					glTex = HWR_GetTexture(texnum, noencore);
 
-					if (!slopeskew) // no skewing
+					if (!do_texture_skew) // no skewing
 					{
-						if (attachtobottom)
-							texturevpeg -= *rover->topheight - *rover->bottomheight;
-						wallVerts[3].t = (*rover->topheight - h + texturevpeg) * glTex->scaleY;
-						wallVerts[2].t = (*rover->topheight - hS + texturevpeg) * glTex->scaleY;
-						wallVerts[0].t = (*rover->topheight - l + texturevpeg) * glTex->scaleY;
-						wallVerts[1].t = (*rover->topheight - lS + texturevpeg) * glTex->scaleY;
+						if (dont_peg_bottom)
+							texturevpeg -= (*rover->topheight - *rover->bottomheight);
+
+						wallVerts[3].t = ((*rover->topheight - h) + texturevpeg) * glTex->scaleY;
+						wallVerts[2].t = ((*rover->topheight - hS) + texturevpeg) * glTex->scaleY;
+						wallVerts[0].t = ((*rover->topheight - l) + texturevpeg) * glTex->scaleY;
+						wallVerts[1].t = ((*rover->topheight - lS) + texturevpeg) * glTex->scaleY;
 					}
 					else
 					{
-						if (!attachtobottom) // skew by top
+						if (!dont_peg_bottom) // skew by top
 						{
 							wallVerts[3].t = wallVerts[2].t = texturevpeg * glTex->scaleY;
-							wallVerts[0].t = (h - l + texturevpeg) * glTex->scaleY;
-							wallVerts[1].t = (hS - lS + texturevpeg) * glTex->scaleY;
+							wallVerts[0].t = ((h - l) + texturevpeg) * glTex->scaleY;
+							wallVerts[1].t = ((hS - lS) + texturevpeg) * glTex->scaleY;
 						}
 						else // skew by bottom
 						{
@@ -2032,7 +2042,9 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
 						break;
 					}
 
-				if (bothsides) continue;
+				if (bothsides)
+					continue;
+
 				const ffloortype_e roverflags = rover->flags;
 
 				if (!(roverflags & FF_EXISTS) || !(roverflags & FF_RENDERSIDES) || !(roverflags & FF_ALLSIDES))
@@ -2044,14 +2056,24 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
 				if ((high1 < lowcut || highslope1 < lowcutslope) || (low1 > highcut || lowslope1 > highcutslope))
 					continue;
 
-				texnum = R_GetTextureNum(sides[rover->master->sidenum[0]].midtexture);
+				side_t *side = R_GetFFloorSide(gl_curline->linedef, rover, gl_backsector);
+
+				boolean do_texture_skew;
+				boolean dont_peg_bottom;
 
 				if (rover->master->flags & ML_TFERLINE)
 				{
-					size_t linenum = std::min((size_t)(gl_curline->linedef-gl_backsector->lines[0]), rover->master->frontsector->linecount);
-					newline = rover->master->frontsector->lines[0] + linenum;
-					texnum = R_GetTextureNum(sides[newline->sidenum[0]].midtexture);
+					line_t *newline = R_GetFFloorLine(gl_curline->linedef, rover, gl_backsector);
+					do_texture_skew = newline->flags & ML_DONTPEGTOP;
+					dont_peg_bottom = newline->flags & ML_DONTPEGBOTTOM;
 				}
+				else
+				{
+					do_texture_skew = rover->master->flags & ML_DONTPEGTOP;
+					dont_peg_bottom = gl_curline->linedef->flags & ML_DONTPEGBOTTOM;
+				}
+
+				texnum = R_GetTextureNum(side->midtexture);
 
 				h  = P_GetFFloorTopZAt   (rover, v1x, v1y);
 				hS = P_GetFFloorTopZAt   (rover, v2x, v2y);
@@ -2088,17 +2110,37 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
 				}
 				else
 				{
+					// Wow, how was this missing from OpenGL for so long?
+					// ...Oh well, anyway, Lower Unpegged now changes pegging of FOFs like in software
+					// -- Monster Iestyn 26/06/18
+					fixed_t texturevpeg = side->rowoffset;
+
 					glTex = HWR_GetTexture(texnum, noencore);
 
-					if (newline)
+					if (!do_texture_skew) // no skewing
 					{
-						wallVerts[3].t = wallVerts[2].t = (*rover->topheight - h + sides[newline->sidenum[0]].rowoffset) * glTex->scaleY;
-						wallVerts[0].t = wallVerts[1].t = (h - l + (*rover->topheight - h + sides[newline->sidenum[0]].rowoffset)) * glTex->scaleY;
+						if (dont_peg_bottom)
+							texturevpeg -= (*rover->topheight - *rover->bottomheight);
+
+						wallVerts[3].t = ((*rover->topheight - h) + texturevpeg) * glTex->scaleY;
+						wallVerts[2].t = ((*rover->topheight - hS) + texturevpeg) * glTex->scaleY;
+						wallVerts[0].t = ((*rover->topheight - l) + texturevpeg) * glTex->scaleY;
+						wallVerts[1].t = ((*rover->topheight - lS) + texturevpeg) * glTex->scaleY;
 					}
 					else
 					{
-						wallVerts[3].t = wallVerts[2].t = (*rover->topheight - h + sides[rover->master->sidenum[0]].rowoffset) * glTex->scaleY;
-						wallVerts[0].t = wallVerts[1].t = (h - l + (*rover->topheight - h + sides[rover->master->sidenum[0]].rowoffset)) * glTex->scaleY;
+						if (!dont_peg_bottom) // skew by top
+						{
+							wallVerts[3].t = wallVerts[2].t = texturevpeg * glTex->scaleY;
+							wallVerts[0].t = ((h - l) + texturevpeg) * glTex->scaleY;
+							wallVerts[1].t = ((hS - lS) + texturevpeg) * glTex->scaleY;
+						}
+						else // skew by bottom
+						{
+							wallVerts[0].t = wallVerts[1].t = texturevpeg * glTex->scaleY;
+							wallVerts[3].t = wallVerts[0].t - (h - l) * glTex->scaleY;
+							wallVerts[2].t = wallVerts[1].t - (hS - lS) * glTex->scaleY;
+						}
 					}
 
 					wallVerts[0].s = wallVerts[3].s = cliplow * glTex->scaleX;
@@ -2166,12 +2208,13 @@ boolean checkforemptylines = true;
 
 static boolean CheckClip(sector_t * afrontsector, sector_t * abacksector)
 {
-	fixed_t frontf1,frontf2, frontc1, frontc2; // front floor/ceiling ends
+	fixed_t frontf1, frontf2, frontc1, frontc2; // front floor/ceiling ends
 	fixed_t backf1, backf2, backc1, backc2; // back floor ceiling ends
 
 	// GZDoom method of sloped line clipping
 
-	if (afrontsector->f_slope || afrontsector->c_slope || abacksector->f_slope || abacksector->c_slope)
+	if (afrontsector->f_slope || afrontsector->c_slope
+	 || abacksector->f_slope || abacksector->c_slope)
 	{
 		fixed_t v1x, v1y, v2x, v2y; // the seg's vertexes as fixed_t
 
@@ -2195,8 +2238,8 @@ static boolean CheckClip(sector_t * afrontsector, sector_t * abacksector)
 	{
 		frontf1 = frontf2 = afrontsector->floorheight;
 		frontc1 = frontc2 = afrontsector->ceilingheight;
-		backf1 = backf2 = abacksector->floorheight;
-		backc1 = backc2 = abacksector->ceilingheight;
+		backf1  = backf2  = abacksector->floorheight;
+		backc1  = backc2  = abacksector->ceilingheight;
 	}
 
 	// using this check with portals causes weird culling issues on ante-station
@@ -2320,7 +2363,7 @@ static inline void DoAddLine(seg_t* line, angle_t angle1, angle_t angle2)
 
 		if constexpr (Type == AddLineType::kPortal)
 		{
-			if (gl_portal_state != GLPORTAL_SEARCH && !dontdraw)// no need to do this during the portal check
+			if (gl_portal_state != GLPORTAL_SEARCH && !dontdraw) // no need to do this during the portal check
 				HWR_ProcessSeg(); // Doesn't need arguments because they're defined globally :D
 		}
 		else if constexpr (Type == AddLineType::kNormal)
@@ -2560,7 +2603,7 @@ static void HWR_RenderPolyObjectPlane(polyobj_t *polysector, boolean isceiling,
 
 	nrPlaneVerts = polysector->numVertices;
 
-	if (nrPlaneVerts < 3)   //not even a triangle ?
+	if (nrPlaneVerts < 3) // not even a triangle ?
 		return;
 
 	if (nrPlaneVerts > INT16_MAX) // FIXME: exceeds plVerts size
@@ -2718,7 +2761,7 @@ static void HWR_AddPolyObjectPlanes(void)
 	// Polyobject Planes need their own function for drawing because they don't have extrasubsectors by themselves
 	// It should be okay because polyobjects should always be convex anyway
 
-	for (i  = 0; i < numpolys; i++)
+	for (i = 0; i < numpolys; i++)
 	{
 		polyobjsector = po_ptrs[i]->lines[0]->backsector; // the in-level polyobject sector
 
@@ -4422,7 +4465,8 @@ static void HWR_DrawSprites(void)
 			HWR_DrawPrecipitationSprite(spr);
 			continue;
 		}
-		else if (spr->mobj)
+
+		if (spr->mobj)
 		{
 			if constexpr (Type == DrawSpritesType::kModels)
 			{
@@ -4475,7 +4519,7 @@ template <AddSpritesType Type>
 static void HWR_AddSprites(sector_t *sec)
 {
 	mobj_t *thing;
-	INT32 limit_dist;
+	INT32 limit_dist = 0;
 
 	// BSP is traversed by subsector.
 	// A sector might have been split into several
@@ -4538,14 +4582,14 @@ static void HWR_AddPrecipitationSprites(void)
 		return;
 	}
 
-	drawdist = ((fixed_t)(cv_drawdist_precip.value) * mapobjectscale);
-
 	// No to infinite precipitation draw distance.
 	if (cv_drawdist_precip.value == 0)
 	{
 		return;
 	}
 
+	drawdist = ((fixed_t)(cv_drawdist_precip.value) * mapobjectscale);
+
 	if (current_bsp_culling_distance)
 		drawdist = std::min((fixed_t)current_bsp_culling_distance, drawdist);
 
@@ -5067,42 +5111,46 @@ static void HWR_ProjectPrecipitationSprite(precipmobj_t *thing)
 
 static gl_sky_t gl_sky;
 
-#define DEG2RADGL(a) ((a * M_PIl) / 180.0f)
-
 static void HWR_SkyDomeVertex(gl_sky_t *sky, gl_skyvertex_t *vbo, int r, int c, signed char yflip, float delta, boolean foglayer)
 {
+	static constexpr float radians = (float)(M_PIl / 180.0f);
 	static constexpr float scale = 10000.0f;
-	static constexpr float maxSideAngle = DEG2RADGL(60.0f);
+	static constexpr float maxSideAngle = 60.0f * radians;
 
-	float topAngle = DEG2RADGL(c / (float)sky->columns * 360.0f);
+	float topAngle = ((float)c / (float)sky->columns * 360.0f) * radians;
 	float sideAngle = (maxSideAngle * (float)(sky->rows - r) / (float)sky->rows);
-	float height = (float)(sin(sideAngle));
-	float realRadius = (scale * (float)cos(sideAngle));
-	float x = (realRadius * (float)cos(topAngle));
+	float height = sinf(sideAngle);
+	float realRadius = (scale * cosf(sideAngle));
+	float x = (realRadius * cosf(topAngle));
 	float y = (!yflip) ? scale * height : -scale * height;
-	float z = (realRadius * (float)sin(topAngle));
-	float timesRepeat = (4 * (256.0f / sky->width));
-
-	if (std::fpclassify(timesRepeat) == FP_ZERO)
-		timesRepeat = 1.0f;
+	float z = (realRadius * sinf(topAngle));
+	float timesRepeat;
 
 	if (!foglayer)
 	{
+		timesRepeat = (4.0f * (256.0f / (float)sky->width));
+
+		if (std::fpclassify(timesRepeat) == FP_ZERO)
+			timesRepeat = 1.0f;
+
 		vbo->r = 255;
 		vbo->g = 255;
 		vbo->b = 255;
 		vbo->a = (r == 0 ? 0 : 255);
 
 		// And the texture coordinates.
-		vbo->u = (-timesRepeat * c / (float)sky->columns);
-		if (!yflip)	// Flipped Y is for the lower hemisphere.
-			vbo->v = (r / (float)sky->rows) + 0.5f;
+		vbo->u = (-timesRepeat * (float)c / (float)sky->columns);
+
+		if (!yflip) // Flipped Y is for the lower hemisphere.
+			vbo->v = ((float)r / (float)sky->rows) + 0.5f;
 		else
-			vbo->v = 1.0f + ((sky->rows - r) / (float)sky->rows) + 0.5f;
+			vbo->v = 1.0f + ((float)(sky->rows - r) / (float)sky->rows) + 0.5f;
 	}
 
 	if (r != 4)
+	{
 		y += 300.0f;
+	}
 
 	// And finally the vertex.
 	vbo->x = x;
@@ -5254,7 +5302,7 @@ static inline void HWR_ClearView(void)
 				 viewwindowy,
 				(viewwindowx + viewwidth),
 				(viewwindowy + viewheight),
-						ZCLIP_PLANE, FAR_ZCLIP_DEFAULT);
+				 ZCLIP_PLANE, FAR_ZCLIP_DEFAULT);
 	GL_ClearBuffer(false, true, true, NULL);
 }
 
@@ -5536,14 +5584,16 @@ static void HWR_RenderFrame(player_t *player, boolean skybox)
 
 	current_bsp_culling_distance = 0;
 
-	if (!skybox && cv_glrenderdistance.value)
+	const INT32 renderdist = cv_glrenderdistance.value;
+
+	if (!skybox && renderdist)
 	{
 		GL_GClipRect(viewwindowx,
 					 viewwindowy,
 					(viewwindowx + viewwidth),
 					(viewwindowy + viewheight),
-					ZCLIP_PLANE, clipping_distances[cv_glrenderdistance.value - 1]);
-		current_bsp_culling_distance = bsp_culling_distances[cv_glrenderdistance.value - 1];
+					ZCLIP_PLANE, clipping_distances[renderdist - 1]);
+		current_bsp_culling_distance = bsp_culling_distances[renderdist- 1];
 	}
 
 	portalclipline = NULL;
@@ -5936,31 +5986,33 @@ static void HWR_DoPostProcessor(player_t *player)
 		float disStart = (leveltime-1) + FixedToFloat(R_GetTimeFrac(RTF_LEVEL));
 
 		UINT8 x, y;
-		INT32 WAVELENGTH;
-		INT32 AMPLITUDE;
-		INT32 FREQUENCY;
+		float WAVELENGTH;
+		float AMPLITUDE;
+		float FREQUENCY;
 
 		// Modifies the wave.
 		if (thiscam->postimg & POSTIMG_WATER)
 		{
-			WAVELENGTH = 5;
-			AMPLITUDE = 40;
-			FREQUENCY = 8;
+			WAVELENGTH = 5.0f;
+			AMPLITUDE = 40.0f;
+			FREQUENCY = 8.0f;
 		}
 		else
 		{
-			WAVELENGTH = 10;
-			AMPLITUDE = 60;
-			FREQUENCY = 4;
+			WAVELENGTH = 10.0f;
+			AMPLITUDE = 60.0f;
+			FREQUENCY = 4.0f;
 		}
 
+		//static constexpr float scale = ((float)SCREENVERTS - 1.0f) / 9.0f; // well this evals to just 1.0f and what is x / 1? kek
+
 		for (x = 0; x < SCREENVERTS; x++)
 		{
 			for (y = 0; y < SCREENVERTS; y++)
 			{
 				// Change X position based on its Y position.
-				v[x][y][0] = (x/((float)(SCREENVERTS-1.0f)/9.0f))-4.5f + (float)sin((disStart+(y*WAVELENGTH))/FREQUENCY)/AMPLITUDE;
-				v[x][y][1] = (y/((float)(SCREENVERTS-1.0f)/9.0f))-4.5f;
+				v[x][y][0] = x-4.5f + sinf(((disStart+((float)y * WAVELENGTH)) / FREQUENCY)) / AMPLITUDE; // (x / scale)
+				v[x][y][1] = y-4.5f; // (y / scale)
 			}
 		}
 
@@ -5986,20 +6038,27 @@ void HWR_DoWipe(UINT8 wipenum, UINT8 scrnnum)
 	}
 
 	if (wipenum > 99 || scrnnum > 99) // not a valid wipe number
+	{
+		V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31); // just draw a black screen instead of flashing and crap
 		return; // shouldn't end up here really, the loop should've stopped running beforehand
+	}
 
 	// puts the numbers into the lumpname
 	sprintf(&lumpname[4], "%.2hu%.2hu", (UINT16)wipenum, (UINT16)scrnnum);
 	lumpnum = W_CheckNumForName(lumpname);
 
 	if (lumpnum == LUMPERROR) // again, shouldn't be here really
+	{
+		V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31); // just draw a black screen instead of flashing and crap
 		return;
+	}
 
 	lsize = W_LumpLength(lumpnum);
 
 	if (!(lsize == 256000 || lsize == 64000 || lsize == 16000 || lsize == 4000))
 	{
 		CONS_Alert(CONS_WARNING, "Fade mask lump %s of incorrect size, ignored\n", lumpname);
+		V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31); // just draw a black screen instead of flashing and crap
 		return; // again, shouldn't get here if it is a bad size
 	}
 

src/hardware/r_opengl/r_opengl.c

@@ -1583,11 +1583,11 @@ void GL_Draw2DLine(F2DCoord * v1, F2DCoord * v2, RGBA_t Color)
 
 	// This is the preferred, 'modern' way of rendering lines -- creating a polygon.
 	if (fabsf(v2->x - v1->x) > FLT_EPSILON)
-		angle = (float)atan((v2->y-v1->y)/(v2->x-v1->x));
+		angle = atanf((v2->y-v1->y)/(v2->x-v1->x));
 	else
 		angle = (float)N_PI_DEMI;
-	dx = (float)sin(angle) / (float)screen_width;
-	dy = (float)cos(angle) / (float)screen_height;
+	dx = sinf(angle) / (float)screen_width;
+	dy = cosf(angle) / (float)screen_height;
 
 	p[0] = v1->x - dx;  p[1] = -(v1->y + dy); p[2] = 1;
 	p[3] = v2->x - dx;  p[4] = -(v2->y + dy); p[5] = 1;
@@ -3136,8 +3136,8 @@ void GL_DrawModelEx(model_t *model, INT32 frameIndex, float duration, float tics
 void GL_SetTransform(FTransform *stransform)
 {
 	static boolean special_splitscreen;
-	GLdouble used_fov;
 	boolean shearing = false;
+	float used_fov;
 
 	pglLoadIdentity();
 
@@ -3196,11 +3196,11 @@ void GL_SetTransform(FTransform *stransform)
 
 	if (special_splitscreen)
 	{
-		used_fov = (float)(atan(tan(used_fov * M_PIl / 360) * 0.8) * 360 / M_PIl);
-		GL_Perspective((GLfloat)used_fov, 2*ASPECT_RATIO);
+		used_fov = (atanf(tanf(used_fov * (float)M_PI / 360.0f) * 0.8f) * 360.0f / (float)M_PI);
+		GL_Perspective(used_fov, 2*ASPECT_RATIO);
 	}
 	else
-		GL_Perspective((GLfloat)used_fov, ASPECT_RATIO);
+		GL_Perspective(used_fov, ASPECT_RATIO);
 
 	pglGetFloatv(GL_PROJECTION_MATRIX, projMatrix); // added for new coronas' code (without depth buffer)
 	pglMatrixMode(GL_MODELVIEW);

src/i_system.h

@@ -61,10 +61,6 @@ precise_t I_GetPreciseTime(void);
   */
 UINT64 I_GetPrecisePrecision(void);
 
-/** \brief  Get the current time in rendering tics, including fractions.
-*/
-double I_GetFrameTime(void);
-
 /**	\brief	Sleeps for the given duration in milliseconds. Depending on the
             operating system's scheduler, the calling thread may give up its
 			time slice for a longer duration. The implementation should give a
@@ -221,10 +217,6 @@ INT32 I_mkdir(const char *dirname, INT32 unixright);
 */
 const char *I_LocateWad(void);
 
-/**	\brief Joystick events
-*/
-void I_GetJoystickEvents(UINT8 index);
-
 char *I_GetEnv(const char *name);
 
 INT32 I_PutEnv(char *variable);

src/i_time.c

@@ -63,7 +63,10 @@ void I_UpdateTime(fixed_t timescale)
 	ticratescaled = (double)((float)TICRATE * FixedToFloat(timescale));
 
 	enterprecise = I_GetPreciseTime();
-	elapsedseconds = (double)(enterprecise - oldenterprecise) / I_GetPrecisePrecision();
+	const precise_t elapsed = enterprecise - oldenterprecise;
+	const UINT64 precision = I_GetPrecisePrecision();
+	// explictily do this in double precision
+	elapsedseconds = (double)elapsed / (double)precision;
 	tictimer += elapsedseconds;
 	while (tictimer > 1.0/ticratescaled)
 	{

src/i_video.h

@@ -143,6 +143,8 @@ boolean I_CheckNativeRes(void);
 
 void I_SetBorderlessWindow(void);
 
+void I_HandleControllerHatRepeat(void);
+
 #ifdef USE_FBO_OGL
 
 void RefreshOGLSDLSurface(void);

src/k_kart.c

@@ -6479,7 +6479,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
 						}
 						player->kartstuff[k_invincibilitytimer] = itemtime+(2*TICRATE); // 10 seconds
 
-						if (P_IsLocalPlayer(player) && cv_supermusic.value == 1 && cv_birdmusic.value)
+						if (cv_supermusic.value == 1 && P_IsLocalPlayer(player))
 							S_ChangeMusicSpecial("kinvnc");
 
 						P_RestoreMusic(player);
@@ -6683,7 +6683,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
 							if (cv_kartdebugshrink.value && !modeattacking && !player->bot)
 								player->mo->destscale = (6*player->mo->destscale)/8;
 							player->kartstuff[k_growshrinktimer] = itemtime+(4*TICRATE); // 12 seconds
-							if (P_IsLocalPlayer(player) && cv_growmusic.value == 1 && cv_birdmusic.value )
+							if (cv_growmusic.value == 1 && P_IsLocalPlayer(player))
 								S_ChangeMusicSpecial("kgrow");
 							P_RestoreMusic(player);
 							S_StartSound(player->mo, sfx_kc5a);

src/lua_baselib.c

@@ -384,7 +384,9 @@ static int lib_pSpawnMobj(lua_State *L)
 	NOHUD
 	if (type >= NUMMOBJTYPES)
 		return luaL_error(L, "mobj type %d out of range (0 - %d)", type, NUMMOBJTYPES-1);
-	LUA_PushUserdata(L, P_SpawnMobj(x, y, z, type), META_MOBJ);
+	mobj_t *th = P_SpawnMobj(x, y, z, type);
+	th->islocal = !hook_important;
+	LUA_PushUserdata(L, th, META_MOBJ);
 	return 1;
 }
 
@@ -410,7 +412,9 @@ static int lib_pSpawnMissile(lua_State *L)
 		return LUA_ErrInvalid(L, "mobj_t");
 	if (type >= NUMMOBJTYPES)
 		return luaL_error(L, "mobj type %d out of range (0 - %d)", type, NUMMOBJTYPES-1);
-	LUA_PushUserdata(L, P_SpawnMissile(source, dest, type), META_MOBJ);
+	mobj_t *th = P_SpawnMissile(source, dest, type);
+	th->islocal = !hook_important;
+	LUA_PushUserdata(L, th, META_MOBJ);
 	return 1;
 }
 
@@ -427,7 +431,9 @@ static int lib_pSpawnXYZMissile(lua_State *L)
 		return LUA_ErrInvalid(L, "mobj_t");
 	if (type >= NUMMOBJTYPES)
 		return luaL_error(L, "mobj type %d out of range (0 - %d)", type, NUMMOBJTYPES-1);
-	LUA_PushUserdata(L, P_SpawnXYZMissile(source, dest, type, x, y, z), META_MOBJ);
+	mobj_t *th = P_SpawnXYZMissile(source, dest, type, x, y, z);
+	th->islocal = !hook_important;
+	LUA_PushUserdata(L, th, META_MOBJ);
 	return 1;
 }
 
@@ -446,7 +452,9 @@ static int lib_pSpawnPointMissile(lua_State *L)
 		return LUA_ErrInvalid(L, "mobj_t");
 	if (type >= NUMMOBJTYPES)
 		return luaL_error(L, "mobj type %d out of range (0 - %d)", type, NUMMOBJTYPES-1);
-	LUA_PushUserdata(L, P_SpawnPointMissile(source, xa, ya, za, type, x, y, z), META_MOBJ);
+	mobj_t *th = P_SpawnPointMissile(source, xa, ya, za, type, x, y, z);
+	th->islocal = !hook_important;
+	LUA_PushUserdata(L, th, META_MOBJ);
 	return 1;
 }
 
@@ -463,7 +471,9 @@ static int lib_pSpawnAlteredDirectionMissile(lua_State *L)
 		return LUA_ErrInvalid(L, "mobj_t");
 	if (type >= NUMMOBJTYPES)
 		return luaL_error(L, "mobj type %d out of range (0 - %d)", type, NUMMOBJTYPES-1);
-	LUA_PushUserdata(L, P_SpawnAlteredDirectionMissile(source, type, x, y, z, shiftingAngle), META_MOBJ);
+	mobj_t *th = P_SpawnAlteredDirectionMissile(source, type, x, y, z, shiftingAngle);
+	th->islocal = !hook_important;
+	LUA_PushUserdata(L, th, META_MOBJ);
 	return 1;
 }
 
@@ -492,7 +502,9 @@ static int lib_pSPMAngle(lua_State *L)
 		return LUA_ErrInvalid(L, "mobj_t");
 	if (type >= NUMMOBJTYPES)
 		return luaL_error(L, "mobj type %d out of range (0 - %d)", type, NUMMOBJTYPES-1);
-	LUA_PushUserdata(L, P_SPMAngle(source, type, angle, allowaim, flags2), META_MOBJ);
+	mobj_t *th = P_SPMAngle(source, type, angle, allowaim, flags2);
+	th->islocal = !hook_important;
+	LUA_PushUserdata(L, th, META_MOBJ);
 	return 1;
 }
 
@@ -506,7 +518,9 @@ static int lib_pSpawnPlayerMissile(lua_State *L)
 		return LUA_ErrInvalid(L, "mobj_t");
 	if (type >= NUMMOBJTYPES)
 		return luaL_error(L, "mobj type %d out of range (0 - %d)", type, NUMMOBJTYPES-1);
-	LUA_PushUserdata(L, P_SpawnPlayerMissile(source, type, flags2), META_MOBJ);
+	mobj_t *th = P_SpawnPlayerMissile(source, type, flags2);
+	th->islocal = !hook_important;
+	LUA_PushUserdata(L, th, META_MOBJ);
 	return 1;
 }
 

src/lua_hook.h

@@ -109,6 +109,7 @@ ENUM (STRING_HOOK);
 
 extern boolean hook_cmd_running;	// This is used by PlayerCmd and lua_playerlib to prevent anything from being wirtten to player while we run PlayerCmd.
 extern int hook_defrosting;
+extern bool hook_important;
 
 void LUA_HookVoid(int hook);
 void LUA_HookHUD(int hook, huddrawlist_h drawlist);

src/lua_hooklib.c

@@ -19,6 +19,7 @@
 #include "b_bot.h"
 #include "z_zone.h"
 #include "m_perfstats.h"
+#include "w_wad.h"
 
 #include "lua_script.h"
 #include "lua_libs.h"
@@ -39,14 +40,20 @@ LIST (stringHookNames, STRING_HOOK_LIST);
 
 #undef LIST
 
+typedef struct {
+	int id;
+	bool important;
+} hookinfo_t;
+
 typedef struct {
 	int numHooks;
-	int *ids;
+	hookinfo_t *ids;
 } hook_t;
 
 typedef struct {
 	int numGeneric;
 	int ref;
+	bool important;
 } stringhook_t;
 
 static hook_t hookIds[HOOK(MAX)];
@@ -56,6 +63,8 @@ static hook_t mobjHookIds[NUMMOBJTYPES][MOBJ_HOOK(MAX)];
 // Lua tables are used to lookup string hook ids.
 static stringhook_t stringHooks[STRING_HOOK(MAX)];
 
+bool hook_important = true;
+
 // This will be indexed by hook id, the value of which fetches the registry.
 static int * hookRefs;
 static int   nextid;
@@ -109,7 +118,11 @@ static void get_table(lua_State *L)
 
 FUNCINLINE static ATTRINLINE void add_hook_to_table(lua_State *L, int n)
 {
+	lua_newtable(L);
 	lua_pushnumber(L, nextid);
+	lua_rawseti(L, -2, 1);
+	lua_pushboolean(L, wadfiles[numwadfiles-1]->important);
+	lua_rawseti(L, -2, 2);
 	lua_rawseti(L, -2, n);
 }
 
@@ -180,7 +193,8 @@ FUNCINLINE static ATTRINLINE void add_hook(hook_t *map)
 {
 	Z_Realloc(map->ids, (map->numHooks + 1) * sizeof *map->ids,
 			PU_STATIC, &map->ids);
-	map->ids[map->numHooks++] = nextid;
+	map->ids[map->numHooks].important = wadfiles[numwadfiles-1]->important;
+	map->ids[map->numHooks++].id = nextid;
 }
 
 FUNCINLINE static ATTRINLINE void add_mobj_hook(lua_State *L, int hook_type)
@@ -287,6 +301,7 @@ struct Hook_State {
 	const char * string;/* used to fetch table, ran first if set */
 	int          top;/* index of last argument passed to hook */
 	int          id;/* id to fetch ref */
+	boolean      important;/* is this hook from local addon */
 	int          values;/* num arguments passed to hook */
 	int          results;/* num values returned by hook */
 	Hook_Callback results_handler;/* callback when hook successfully returns */
@@ -416,22 +431,29 @@ FUNCINLINE static ATTRINLINE void init_hook_call
 	hook->results_handler = results_handler;
 }
 
-FUNCINLINE static ATTRINLINE void get_hook(Hook_State *hook, const int *ids, int n)
+FUNCINLINE static ATTRINLINE void get_hook(Hook_State *hook, const hookinfo_t *ids, int n)
 {
-	hook->id = ids[n];
+	hook->id = ids[n].id;
+	hook->important = ids[n].important;
 	lua_getref(gL, hookRefs[hook->id]);
 }
 
 FUNCINLINE static ATTRINLINE void get_hook_from_table(Hook_State *hook, int n)
 {
 	lua_rawgeti(gL, -1, n);
+	lua_rawgeti(gL, -1, 1);
 	hook->id = lua_tonumber(gL, -1);
 	lua_pop(gL, 1);
+	lua_rawgeti(gL, -2, 2);
+	hook->important = lua_toboolean(gL, -1);
+	lua_pop(gL, 2);
 	lua_getref(gL, hookRefs[hook->id]);
 }
 
 static int call_single_hook_no_copy(Hook_State *hook)
 {
+	hook_important = hook->important;
+
 	if (lua_pcall(gL, hook->values, hook->results, EINDEX) == 0)
 	{
 		if (hook->results > 0)

src/m_menu.c

@@ -754,8 +754,6 @@ static void Command_Manual_f(void)
 	itemOn = 0;
 }
 
-boolean dpadscrollstate[4] = {false, false, false, false};
-
 //
 // M_Responder
 //
@@ -802,19 +800,15 @@ boolean M_Responder(event_t *ev)
 				break;
 			case KEY_HAT1:
 				ch = KEY_UPARROW;
-				dpadscrollstate[DPAD_UP] = true;
 				break;
 			case KEY_HAT1 + 1:
 				ch = KEY_DOWNARROW;
-				dpadscrollstate[DPAD_DOWN] = true;
 				break;
 			case KEY_HAT1 + 2:
 				ch = KEY_LEFTARROW;
-				dpadscrollstate[DPAD_LEFT] = true;
 				break;
 			case KEY_HAT1 + 3:
 				ch = KEY_RIGHTARROW;
-				dpadscrollstate[DPAD_RIGHT] = true;
 				break;
 		}
 
@@ -830,24 +824,6 @@ boolean M_Responder(event_t *ev)
 			}
 		}
 	}
-	else if (ev->type == ev_keyup)
-	{
-		switch (ev->data1) // if you let go of those set those to false
-		{
-			case KEY_HAT1:
-				dpadscrollstate[DPAD_UP] = false;
-				break;
-			case KEY_HAT1 + 1:
-				dpadscrollstate[DPAD_DOWN] = false;
-				break;
-			case KEY_HAT1 + 2:
-				dpadscrollstate[DPAD_LEFT] = false;
-				break;
-			case KEY_HAT1 + 3:
-				dpadscrollstate[DPAD_RIGHT] = false;
-				break;
-		}
-	}
 	else if (menuactive)
 	{
 		tic_t thistime = I_GetTime();
@@ -1726,6 +1702,9 @@ void M_Ticker(void)
 	if (dedicated)
 		return;
 
+	if (menuactive)
+		I_HandleControllerHatRepeat();
+
 	if (--skullAnimCounter <= 0)
 		skullAnimCounter = 8;
 

src/m_menu.h

@@ -38,16 +38,6 @@ extern boolean forceshowhud;
 // Does all the real work of the menu interaction.
 boolean M_Responder(event_t *ev);
 
-// for scrolling through menus with controllers
-extern boolean dpadscrollstate[4];
-enum
-{
-	DPAD_UP,
-	DPAD_DOWN,
-	DPAD_LEFT,
-	DPAD_RIGHT
-};
-
 // Called by main loop, runs for demo playback. If this returns true, nullify any further user input.
 boolean M_DemoResponder(event_t *ev);
 

src/m_menudefs.c

@@ -2026,11 +2026,10 @@ static menuitem_t OP_BirdMenu[] =
 	//{IT_STRING | IT_CVAR, NULL, "Encore Choices",              &cv_encorevotes,     90},
 
 	{IT_HEADER, NULL, "Music", NULL, 70},
-	{IT_STRING | IT_CVAR, NULL, "Music Features",    	 &cv_birdmusic,            80},
-	{IT_STRING | IT_CVAR, NULL, "Resume Level Music",    &cv_resume,            95},
-	{IT_STRING | IT_CVAR, NULL, "Restart Special Music", &cv_resetspecialmusic, 105},
+	{IT_STRING | IT_CVAR, NULL, "Resume Level Music",    &cv_resume,            80},
+	{IT_STRING | IT_CVAR, NULL, "Restart Special Music", &cv_resetspecialmusic, 95},
 
-	{IT_STRING | IT_SUBMENU, NULL, "Advanced Music Options...", &OP_AdvancedBirdDef, 130},
+	{IT_STRING | IT_SUBMENU, NULL, "Advanced Music Options...", &OP_AdvancedBirdDef, 120},
 };
 
 static const char* OP_BirdTooltips[] =
@@ -2044,7 +2043,6 @@ static const char* OP_BirdTooltips[] =
 	//"Only show one battle choice in map vote",
 	//"Amount of encore choices in map vote.",
 	NULL,
-	"Global toggle for all bird music features.",
 	"Resume level music from last position after music change.",
 	"Restart Special music if item is used again.",
 	"Options for advanced music settings.",
@@ -2058,7 +2056,6 @@ enum
 	viewpointext,
 	freeplaytext,
 	headermusic,
-	birdmusic,
 	lvlresum,
 	spclresum,
 	advmusic,
@@ -2885,19 +2882,6 @@ void Bird_menu_Onchange(void)
 	OP_AdvancedBirdMenu[fadegrow].status = status;
 	OP_AdvancedBirdMenu[respawnfadeout].status = status;
 	OP_AdvancedBirdMenu[respawnfadein].status = status;
-
-	if (cv_birdmusic.value)
-	{
-		OP_BirdMenu[lvlresum].status = IT_STRING | IT_CVAR;
-		OP_BirdMenu[spclresum].status = IT_STRING | IT_CVAR;
-		OP_BirdMenu[advmusic].status = IT_STRING | IT_SUBMENU;
-	}
-	else
-	{
-		OP_BirdMenu[lvlresum].status = IT_GRAYEDOUT;
-		OP_BirdMenu[spclresum].status = IT_GRAYEDOUT;
-		OP_BirdMenu[advmusic].status = IT_GRAYEDOUT;
-	}
 }
 
 //menu code is nice

src/mserv.c

@@ -608,10 +608,17 @@ Update_parameters (void)
 	}
 #endif/*MASTERSERVER*/
 }
+
+#ifdef MASTERSERVER
+void Update_MS(void)
+{
+	Update_parameters();
+}
+#endif
+
 #ifdef MASTERSERVER
 static void MasterServer_OnChange(void)
 {
-
 	UnregisterServer();
 
 	Set_api(cv_masterserver.string);

src/mserv.h

@@ -88,6 +88,8 @@ char *GetMODVersion(int id);
 #endif
 
 char *GetMasterServerRules(void);
+
+void Update_MS(void);
 #endif
 
 void AddMServCommands(void);

src/p_inter.c

@@ -869,7 +869,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
 
 					toucher->angle = special->angle;
 
-					for (UINT8 i = 0; i <= splitscreen; i++)
+					for (i = 0; i <= splitscreen; i++)
 					{
 						if (player == P_GetLocalPlayerForNum(i))
 						{
@@ -1605,7 +1605,7 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source)
 
 		target->player->playerstate = PST_DEAD;
 
-		if (cv_birdmusic.value && cv_fading.value && P_IsLocalPlayer(target->player))
+		if (cv_fading.value && P_IsLocalPlayer(target->player))
 		{
 			if (netgame || multiplayer)
 				ms = cv_respawntime.value * 1000;

src/p_mobj.c

@@ -10758,7 +10758,7 @@ void P_SpawnPlayer(INT32 playernum)
 	{
 		if (!p->spectator)
 		{
-			for (UINT8 i = 0; i <= splitscreen; i++)
+			for (i = 0; i <= splitscreen; i++)
 			{
 				if (playernum == P_GetLocalPlayerNumForNum(i))
 				{
@@ -10776,17 +10776,12 @@ void P_AfterPlayerSpawn(INT32 playernum)
 	mobj_t *mobj = p->mo;
 	UINT8 i;
 
-	if (playernum == consoleplayer)
-		localangle[0] = mobj->angle;
-	else if (splitscreen)
+	for (i = 0; i <= splitscreen; i++)
 	{
-		for (i = 1; i <= splitscreen; i++)
+		if (playernum == P_GetLocalPlayerNumForNum(i))
 		{
-			if (playernum == displayplayers[i])
-			{
-				localangle[i] = mobj->angle;
-				break;
-			}
+			localangle[i] = mobj->angle;
+			break;
 		}
 	}
 

src/p_setup.c

@@ -2653,7 +2653,8 @@ static void P_SetupPlayer(void)
 	spbplace = -1;
 
 	startedInFreePlay = true;
-	for (UINT8 nump = 0, i = 0; i < MAXPLAYERS; i++)
+	UINT8 nump = 0;
+	for (i = 0; i < MAXPLAYERS; i++)
 	{
 		if (!playeringame[i] || players[i].spectator)
 		{

src/p_spec.c

@@ -4798,7 +4798,6 @@ static ffloor_t *P_AddFakeFloor(sector_t *sec, sector_t *sec2, line_t *master, f
 	ffloor->master = master;
 	ffloor->norender = INFTICS;
 
-
 	// Scan the thinkers to check for special conditions applying to this FOF.
 	// If we have thinkers sorted by sector, just check the relevant ones;
 	// otherwise, check them all. Apologies for the ugly loop...

src/p_user.c

@@ -700,6 +700,7 @@ void P_RestoreMusic(player_t *player)
 	if (P_EndingMusic(player))
 		return;
 
+	// Event - Level Start
 	if (leveltime < MUSICSTARTTIME)
 		S_StartMapMusic();
 	else // see also where time overs are handled - search for "lives = 2" in this file
@@ -5193,7 +5194,7 @@ void P_PlayerAfterThink(player_t *player)
 			player->mo->tracer->target->health += cmd->sidemove;
 			player->mo->angle += cmd->sidemove << ANGLETOFINESHIFT; // 2048 --> ANGLE_MAX
 
-			for (UINT8 i = 0; i <= splitscreen; i++)
+			for (i = 0; i <= splitscreen; i++)
 			{
 				if (player == P_GetLocalPlayerForNum(i))
 				{

src/r_main.cpp

@@ -442,6 +442,28 @@ fixed_t R_ScaleFromGlobalAngle(angle_t visangle)
 	return 64*FRACUNIT;
 }
 
+line_t *R_GetFFloorLine(const line_t *line, const ffloor_t *pfloor, const sector_t *sector)
+{
+	if (pfloor->master->flags & ML_TFERLINE)
+	{
+		size_t linenum = std::min<size_t>((size_t)(line - sector->lines[0]), pfloor->master->frontsector->linecount);
+		return pfloor->master->frontsector->lines[0] + linenum;
+	}
+	else
+		return pfloor->master;
+}
+
+side_t *R_GetFFloorSide(const line_t *line, const ffloor_t *pfloor, const sector_t *sector)
+{
+	if (pfloor->master->flags & ML_TFERLINE)
+	{
+		line_t *newline = R_GetFFloorLine(line, pfloor, sector);
+		return &sides[newline->sidenum[0]];
+	}
+	else
+		return &sides[pfloor->master->sidenum[0]];
+}
+
 //
 // R_DoCulling
 // Checks viewz and top/bottom heights of an item against culling planes

src/r_main.h

@@ -150,6 +150,9 @@ subsector_t *R_IsPointInSubsector(fixed_t x, fixed_t y);
 #define R_PointToDist(x, y) R_PointToDist2(viewx, viewy, x, y)
 #define R_PointToDist2(px2, py2, px1, py1) FixedHypot((px1) - (px2), (py1) - (py2))
 
+line_t *R_GetFFloorLine(const line_t *line, const ffloor_t *pfloor, const sector_t *sector);
+side_t *R_GetFFloorSide(const line_t *line, const ffloor_t *pfloor, const sector_t *sector);
+
 boolean R_DoCulling(line_t *cullheight, line_t *viewcullheight, fixed_t vz, fixed_t bottomh, fixed_t toph);
 void R_GetRenderBlockMapDimensions(fixed_t drawdist, INT32 *xl, INT32 *xh, INT32 *yl, INT32 *yh);
 

src/r_segs.cpp

@@ -617,6 +617,11 @@ static boolean R_IsFFloorTranslucent(visffloor_t *pfloor)
 	return false;
 }
 
+static fixed_t R_GetSlopeTextureSlide(pslope_t *slope, angle_t lineangle)
+{
+	return FixedMul(slope->zdelta, FINECOSINE((lineangle-slope->xydirection)>>ANGLETOFINESHIFT));
+}
+
 //
 // R_RenderThickSideRange
 // Renders all the thick sides in the given range.
@@ -633,16 +638,15 @@ void R_RenderThickSideRange(drawseg_t *drawseg, INT32 x1, INT32 x2, ffloor_t *pf
 	lightlist_t     *light;
 	r_lightlist_t   *rlight;
 	INT32           range;
-	line_t          *newline = NULL;
 	// Render FOF sides kinda like normal sides, with the frac and step and everything
 	// NOTE: INT64 instead of fixed_t because overflow concerns
 	INT64         top_frac, top_step, bottom_frac, bottom_step;
-	// skew FOF walls with slopes?
-	boolean	      slopeskew = false;
 	fixed_t       ffloortextureslide = 0;
-	INT32         oldx = -1;
+	fixed_t       oldtexturecolumn = -1;
 	fixed_t       left_top, left_bottom; // needed here for slope skewing
 	pslope_t      *skewslope = NULL;
+	boolean do_texture_skew;
+	boolean dont_peg_bottom;
 	boolean fog = false;
 	boolean fuzzy = false;
 
@@ -650,7 +654,6 @@ void R_RenderThickSideRange(drawseg_t *drawseg, INT32 x1, INT32 x2, ffloor_t *pf
 
 	void (*colfunc_2s) (drawcolumndata_t* dc, column_t *);
 
-
 	// Calculate light table.
 	// Use different light tables
 	//   for horizontal / vertical / diagonal. Diagonal?
@@ -659,16 +662,23 @@ void R_RenderThickSideRange(drawseg_t *drawseg, INT32 x1, INT32 x2, ffloor_t *pf
 	curline = drawseg->curline;
 	backsector = pfloor->target;
 	frontsector = curline->frontsector == pfloor->target ? curline->backsector : curline->frontsector;
-	texnum = R_GetTextureNum(sides[pfloor->master->sidenum[0]].midtexture);
+	sidedef = R_GetFFloorSide(curline->linedef, pfloor, pfloor->target);
 
 	R_SetColumnFunc(BASEDRAWFUNC);
 
 	if (pfloor->master->flags & ML_TFERLINE)
 	{
-		size_t linenum = std::min((size_t)(curline->linedef-backsector->lines[0]), pfloor->master->frontsector->linecount);
-		newline = pfloor->master->frontsector->lines[0] + linenum;
-		texnum = R_GetTextureNum(sides[newline->sidenum[0]].midtexture);
+		line_t *newline = R_GetFFloorLine(curline->linedef, pfloor, pfloor->target);
+		do_texture_skew = newline->flags & ML_DONTPEGTOP;
+		dont_peg_bottom = newline->flags & ML_DONTPEGBOTTOM;
 	}
+	else
+	{
+		do_texture_skew = pfloor->master->flags & ML_DONTPEGTOP;
+		dont_peg_bottom = curline->linedef->flags & ML_DONTPEGBOTTOM;
+	}
+
+	texnum = R_GetTextureNum(sidedef->midtexture);
 
 	if (pfloor->flags & FF_TRANSLUCENT)
 	{
@@ -828,54 +838,35 @@ void R_RenderThickSideRange(drawseg_t *drawseg, INT32 x1, INT32 x2, ffloor_t *pf
 	mceilingclip = drawseg->sprtopclip;
 	dc->texheight = textureheight[texnum]>>FRACBITS;
 
-	// calculate both left endrawseg
+	// calculate both left ends
 	left_top    = P_GetFFloorTopZAt   (pfloor, drawseg->leftpos.x, drawseg->leftpos.y) - viewz;
 	left_bottom = P_GetFFloorBottomZAt(pfloor, drawseg->leftpos.x, drawseg->leftpos.y) - viewz;
 
-	skewslope = *pfloor->t_slope; // skew using top slope by default
-
-	if (newline)
+	if (do_texture_skew)
 	{
-		if (newline->flags & ML_DONTPEGTOP)
-			slopeskew = true;
-	}
-	else if (pfloor->master->flags & ML_DONTPEGTOP)
-		slopeskew = true;
-
-	if (slopeskew)
+		skewslope = *pfloor->t_slope; // skew using top slope by default
 		dc->texturemid = left_top;
+	}
 	else
 		dc->texturemid = *pfloor->topheight - viewz;
 
-	if (newline)
+	offsetvalue = sidedef->rowoffset;
+
+	if (dont_peg_bottom)
 	{
-		offsetvalue = sides[newline->sidenum[0]].rowoffset;
-		if (newline->flags & ML_DONTPEGBOTTOM)
+		if (do_texture_skew)
 		{
 			skewslope = *pfloor->b_slope; // skew using bottom slope
-			if (slopeskew)
-				dc->texturemid = left_bottom;
-			else
-			offsetvalue -= *pfloor->topheight - *pfloor->bottomheight;
+			dc->texturemid = left_bottom;
 		}
-	}
-	else
-	{
-		offsetvalue = sides[pfloor->master->sidenum[0]].rowoffset;
-		if (curline->linedef->flags & ML_DONTPEGBOTTOM)
-		{
-			skewslope = *pfloor->b_slope; // skew using bottom slope
-			if (slopeskew)
-				dc->texturemid = left_bottom;
-			else
+		else
 			offsetvalue -= *pfloor->topheight - *pfloor->bottomheight;
-		}
 	}
 
-	if (slopeskew && skewslope)
+	if (skewslope)
 	{
 		angle_t lineangle = R_PointToAngle2(curline->v1->x, curline->v1->y, curline->v2->x, curline->v2->y);
-		ffloortextureslide = FixedMul(skewslope->zdelta, FINECOSINE((lineangle-skewslope->xydirection)>>ANGLETOFINESHIFT));
+		ffloortextureslide = R_GetSlopeTextureSlide(skewslope, lineangle);
 	}
 
 	dc->texturemid += offsetvalue;
@@ -921,9 +912,9 @@ void R_RenderThickSideRange(drawseg_t *drawseg, INT32 x1, INT32 x2, ffloor_t *pf
 		// skew FOF walls
 		if (ffloortextureslide)
 		{
-			if (oldx != -1)
-				dc->texturemid += FixedMul(ffloortextureslide, (maskedtexturecol[oldx]-maskedtexturecol[dc->x]));
-			oldx = dc->x;
+			if (oldtexturecolumn != -1)
+				dc->texturemid += FixedMul(ffloortextureslide, (oldtexturecolumn-maskedtexturecol[dc->x]));
+			oldtexturecolumn = drawseg->thicksidecol[dc->x];
 		}
 
 		// Calculate bounds

src/s_sound.c

@@ -114,7 +114,6 @@ consvar_t cv_respawnfademusicback = {"respawnfademusicback", "500", CV_SAVE, CV_
 consvar_t cv_resetspecialmusic = {"resetspecialmusic", "No", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_resume = {"resume", "No", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_fading = {"fading", "Off", CV_SAVE|CV_CALL, CV_OnOff, Bird_menu_Onchange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_birdmusic = {"birdmusicstuff", "No", CV_SAVE|CV_CALL, CV_YesNo, Bird_menu_Onchange, 0, NULL, NULL, 0, 0, NULL};
 
 consvar_t cv_keepmusic = {"keepmusic", "No", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_skipintromusic = {"skipintromusic", "No", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
@@ -215,26 +214,33 @@ static INT32 S_getChannel(const void *origin, sfxinfo_t *sfxinfo)
 		if (!channels[cnum].sfxinfo)
 			break;
 
+		const boolean samesoundplaying = channels[cnum].sfxinfo == sfxinfo;
+
 		// Now checks if same sound is being played, rather
 		// than just one sound per mobj
-		else if (sfxinfo == channels[cnum].sfxinfo && (sfxinfo->pitch & SF_NOMULTIPLESOUND))
+		if (samesoundplaying && (sfxinfo->pitch & SF_NOMULTIPLESOUND))
 		{
 			return -1;
 		}
-		else if (sfxinfo == channels[cnum].sfxinfo && sfxinfo->singularity == true)
+
+		if (samesoundplaying && sfxinfo->singularity == true)
 		{
 			S_StopChannel(cnum);
 			break;
 		}
-		else if (origin && channels[cnum].origin == origin && channels[cnum].sfxinfo == sfxinfo)
+
+		const boolean sameorigin = origin && channels[cnum].origin == origin;
+
+		if (sameorigin && samesoundplaying)
 		{
 			if (sfxinfo->pitch & SF_NOINTERRUPT)
 				return -1;
-			else
-				S_StopChannel(cnum);
+
+			S_StopChannel(cnum);
 			break;
 		}
-		else if (origin && channels[cnum].origin == origin
+
+		if (sameorigin
 			&& channels[cnum].sfxinfo->name != sfxinfo->name
 			&& (channels[cnum].sfxinfo->pitch & SF_TOTALLYSINGLE) && (sfxinfo->pitch & SF_TOTALLYSINGLE))
 		{
@@ -303,7 +309,6 @@ void S_RegisterSoundStuff(void)
 
 	CV_RegisterVar(&cv_resume);
 	CV_RegisterVar(&cv_fading);
-	CV_RegisterVar(&cv_birdmusic);
 	// bird music stuff end
 
 	CV_RegisterVar(&cv_keepmusic);
@@ -1276,8 +1281,7 @@ static musicdef_t *S_AddMusicCredit(void)
 
 struct cursongcredit cursongcredit = {0}; // Currently displayed song credit info
 
-static boolean
-ReadMusicDefFields (UINT16 wadnum, int line, char *stoken, musicdef_t **defp)
+static boolean ReadMusicDefFields(UINT16 wadnum, int line, char *stoken, musicdef_t **defp)
 {
 	musicdef_t *def;
 
@@ -1488,7 +1492,7 @@ void S_InitMusicDefs(void)
 //
 musicdef_t *S_FindMusicCredit(const char *musname)
 {
-	UINT32 hash = quickncasehash (musname, 6);
+	UINT32 hash = quickncasehash(musname, 6);
 	musicdef_t *def;
 
 	for (INT32 i = 0; i < nummusicdefs; ++i)
@@ -1647,7 +1651,8 @@ static lumpnum_t S_GetMusicLumpNum(const char *mname)
 {
 	if (S_MusicExists(mname, false, true)) // check non midis first
 		return W_GetNumForName(va("o_%s", mname));
-	else if (S_MusicExists(mname, true, false))
+
+	if (S_MusicExists(mname, true, false))
 	{
 #ifdef NO_MIDI
 		CONS_Alert(CONS_ERROR, "A MIDI music lump %.6s was found,\nbut SRB2Kart does not support MIDI output.\nWe apologise for the inconvenience.\n", mname);
@@ -1687,8 +1692,8 @@ static boolean S_LoadMusic(const char *mname)
 		music.data = mdata;
 		return true;
 	}
-	else
-		return false;
+
+	return false;
 }
 
 static void S_UnloadMusic(void)
@@ -1832,7 +1837,7 @@ void S_ChangeMusicEx(const char *mmusic, UINT16 mflags, boolean looping, UINT32
 	}
 }
 
-void S_ChangeMusicSpecial (const char *mmusic)
+void S_ChangeMusicSpecial(const char *mmusic)
 {
 	if (cv_resetspecialmusic.value)
 		S_ChangeMusic(mmusic, MUSIC_FORCERESET, true);
@@ -1847,7 +1852,7 @@ void S_StopMusic(void)
 		|| demo.title) // SRB2Kart: Demos don't interrupt title screen music
 		return;
 
-	mapmusic.resume = (cv_birdmusic.value && fasticmp(music.name, mapmusic.name)) ? I_GetSongPosition() : 0;
+	mapmusic.resume = (cv_resume.value && fasticmp(music.name, mapmusic.name)) ? I_GetSongPosition() : 0;
 
 	S_SetKeepMusResume();
 
@@ -1899,7 +1904,7 @@ void S_SetMusicVolume(INT32 volume)
 
 void S_SetRestoreMusicFadeInCvar(consvar_t *cv)
 {
-	music_refade_cv = cv_birdmusic.value ? cv : 0;
+	music_refade_cv = cv;
 }
 
 int S_GetRestoreMusicFadeIn(void)
@@ -1928,8 +1933,8 @@ boolean S_FadeMusicFromVolume(UINT8 target_volume, INT16 source_volume, UINT32 m
 {
 	if (source_volume < 0)
 		return I_FadeSong(target_volume, ms, NULL);
-	else
-		return I_FadeSongFromVolume(target_volume, source_volume, ms, NULL);
+
+	return I_FadeSongFromVolume(target_volume, source_volume, ms, NULL);
 }
 
 boolean S_FadeOutStopMusic(UINT32 ms)
@@ -2081,6 +2086,7 @@ void S_InitMapMusic(void)
 		{
 			S_ChangeMusicEx(mapmusic.name, mapmusic.flags, true, keepmusic.resume, 0, 500);
 		}
+
 		return;
 	}
 
@@ -2094,7 +2100,7 @@ void S_InitMapMusic(void)
 		return;
 
 	if (leveltime < MUSICSTARTTIME) // SRB2Kart
-		S_ChangeMusicInternal((encoremode ? "estart" : "kstart"), false); //S_StopMusic();
+		S_ChangeMusicInternal((encoremode ? "estart" : "kstart"), false); // S_StopMusic();
 }
 
 void S_StartMapMusic(void)
@@ -2362,7 +2368,7 @@ static void AmigaType_OnChange(void)
 		openmpt_module_ctl_set_text(openmpt_mhandle, "render.resampler.emulate_amiga_type", cv_amigatype.string);
 
 	if (sound_started)
-        S_RestartMusic(); //need to restart the music system or else it wont work
+        S_RestartMusic(); // need to restart the music system or else it wont work
 }
 #endif
 #endif

src/s_sound.h

@@ -68,7 +68,6 @@ extern consvar_t cv_resetspecialmusic;
 
 extern consvar_t cv_resume;
 extern consvar_t cv_fading;
-extern consvar_t cv_birdmusic;
 
 extern consvar_t cv_keepmusic;
 extern consvar_t cv_skipintromusic;

src/sdl/i_system.cpp

@@ -719,16 +719,13 @@ static void JoyReset(SDLJoyInfo_t *JoySet)
 	{
 		SDL_GameControllerClose(JoySet->dev);
 	}
+
 	JoySet->dev = NULL;
 	JoySet->oldjoy = -1;
+	JoySet->id = -1;
 	JoySet->axises = JoySet->buttons = JoySet->hats = JoySet->balls = 0;
-	//JoySet->scale
 }
 
-/**	\brief joystick up and running
-*/
-static INT32 joystick_started[MAXSPLITSCREENPLAYERS] = {0, 0, 0, 0};
-
 /**	\brief SDL info about joystick
 */
 SDLJoyInfo_t JoyInfo[MAXSPLITSCREENPLAYERS];
@@ -783,22 +780,26 @@ void I_UpdateJoystickDeviceIndex(UINT8 player)
 	///////////////////////////////////////////////
 	if (JoyInfo[player].dev)
 	{
-		cv_usejoystick[player].value = I_GetJoystickDeviceIndex(JoyInfo[player].dev) + 1;
+		cv_usejoystick[player].value = JoyInfo[player].id + 1;
 	}
 	else
 	{
 		UINT8 joystickID, compareJoystick;
+
 		for (joystickID = 0; joystickID < MAXSPLITSCREENPLAYERS; joystickID++)
 		{
 			// is this cv_usejoystick used?
 			const INT32 value = atoi(cv_usejoystick[joystickID].string);
+
 			for (compareJoystick = 0; compareJoystick < MAXSPLITSCREENPLAYERS; compareJoystick++)
 			{
 				if (compareJoystick == player)
 					continue;
+
 				if (value == JoyInfo[compareJoystick].oldjoy || value == cv_usejoystick[compareJoystick].value)
 					break;
 			}
+
 			if (compareJoystick == MAXSPLITSCREENPLAYERS)
 			{
 				// We DID make it through the whole loop, so we can use this one!
@@ -806,6 +807,7 @@ void I_UpdateJoystickDeviceIndex(UINT8 player)
 				break;
 			}
 		}
+
 		if (joystickID == MAXSPLITSCREENPLAYERS)
 		{
 			// We DID NOT make it through the whole loop, so we can't assign this joystick to anything.
@@ -828,14 +830,6 @@ void I_UpdateJoystickDeviceIndices(UINT8 excludePlayer)
 	}
 }
 
-/**	\brief Joystick buttons states
-*/
-static UINT64 lastjoybuttons[MAXSPLITSCREENPLAYERS] = {0,0,0,0};
-
-/**	\brief Joystick hats state
-*/
-static UINT64 lastjoyhats[MAXSPLITSCREENPLAYERS] = {0,0,0,0};
-
 /**	\brief	Shuts down joystick
 	\return void
 */
@@ -847,74 +841,34 @@ void I_ShutdownJoystick(UINT8 index)
 	event.data2 = 0;
 	event.data3 = 0;
 
-	lastjoybuttons[index] = lastjoyhats[index] = 0;
-
 	// emulate the up of all joystick buttons
 	for (i = 0; i < JOYBUTTONS; i++)
 	{
-		event.data1=KEY_JOY1 + i;
+		event.data1 = KEY_JOY1 + i;
 		D_PostEvent(&event);
 	}
 
 	// emulate the up of all joystick hats
 	for (i = 0; i < JOYHATS*4; i++)
 	{
-		event.data1=KEY_HAT1+i;
+		event.data1 = KEY_HAT1+i;
 		D_PostEvent(&event);
 	}
 
 	// reset joystick position
 	event.type = ev_joystick;
+
 	for (i = 0; i < JOYAXISSET; i++)
 	{
 		event.data1 = i;
 		D_PostEvent(&event);
 	}
 
-	joystick_started[index] = 0;
 	JoyReset(&JoyInfo[index]);
 
 	// don't shut down the subsystem here, because hotplugging
 }
 
-void I_GetJoystickEvents(UINT8 index)
-{
-	static event_t event = {};
-	INT32 i = 0;
-	UINT64 joyhats = 0;
-
-	if (!joystick_started[index])
-		return;
-
-	if (!JoyInfo[index].dev) //I_ShutdownJoystick();
-		return;
-
-	joyhats |= SDL_GameControllerGetButton(JoyInfo[index].dev, SDL_CONTROLLER_BUTTON_DPAD_UP);
-	joyhats |= SDL_GameControllerGetButton(JoyInfo[index].dev, SDL_CONTROLLER_BUTTON_DPAD_DOWN) << 1;
-	joyhats |= SDL_GameControllerGetButton(JoyInfo[index].dev, SDL_CONTROLLER_BUTTON_DPAD_LEFT) << 2;
-	joyhats |= SDL_GameControllerGetButton(JoyInfo[index].dev, SDL_CONTROLLER_BUTTON_DPAD_RIGHT) << 3;
-
-	if (joyhats != lastjoyhats[index])
-	{
-		INT64 j = 1; // keep only bits that changed since last time
-		INT64 newhats = joyhats ^ lastjoyhats[index];
-		lastjoyhats[index] = joyhats;
-
-		for (i = 0; i < JOYHATS*4; i++, j <<= 1)
-		{
-			if (newhats & j) // hat changed state?
-			{
-				if (joyhats & j)
-					event.type = ev_keydown;
-				else
-					event.type = ev_keyup;
-				event.data1 = KEY_HAT1 + i;
-				D_PostEvent(&event);
-			}
-		}
-	}
-}
-
 /**	\brief	Open joystick handle
 
 	\param	fname	name of joystick
@@ -931,6 +885,7 @@ static int joy_open(int playerIndex, int joyIndex)
 		CONS_Printf(M_GetText("Joystick subsystem not started\n"));
 		return -1;
 	}
+
 	if (SDL_WasInit(SDL_INIT_GAMECONTROLLER) == 0)
 	{
 		CONS_Printf(M_GetText("Game Controller subsystem not started\n"));
@@ -965,12 +920,14 @@ static int joy_open(int playerIndex, int joyIndex)
 		if (JoyInfo[playerIndex].dev == newdev // same device, nothing to do
 			|| (newdev == NULL && SDL_GameControllerGetAttached(JoyInfo[playerIndex].dev))) // we failed, but already have a working device
 			return SDL_CONTROLLER_AXIS_MAX;
+
 		// Else, we're changing devices, so send neutral joy events
 		CONS_Debug(DBG_GAMELOGIC, "Joystick1 device is changing; resetting events...\n");
 		I_ShutdownJoystick(playerIndex);
 	}
 
 	JoyInfo[playerIndex].dev = newdev;
+	JoyInfo[playerIndex].id = I_GetJoystickDeviceIndex(JoyInfo[playerIndex].dev);
 
 	if (JoyInfo[playerIndex].dev == NULL)
 	{
@@ -1007,8 +964,9 @@ void I_InitJoystick(UINT8 index)
 	UINT8 i;
 	SDL_GameController *newcontroller = NULL;
 
-	//I_ShutdownJoystick();
-	//SDL_SetHintWithPriority("SDL_XINPUT_ENABLED", "0", SDL_HINT_OVERRIDE);
+	// not sure if this is the best place to put this
+	SDL_SetHint(SDL_HINT_AUTO_UPDATE_SENSORS, "0");
+
 	if (M_CheckParm("-nojoy"))
 		return;
 
@@ -1037,6 +995,11 @@ void I_InitJoystick(UINT8 index)
 		}
 	}
 
+	JoyInfo[index].dev = NULL;
+	JoyInfo[index].oldjoy = -1;
+	JoyInfo[index].id = -1;
+	JoyInfo[index].axises = JoyInfo[index].buttons = JoyInfo[index].hats = JoyInfo[index].balls = 0;
+
 	if (cv_usejoystick[index].value)
 		newcontroller = SDL_GameControllerOpen(cv_usejoystick[index].value-1);
 
@@ -1049,23 +1012,24 @@ void I_InitJoystick(UINT8 index)
 			break;
 	}
 
+	JoyInfo[index].id = I_GetJoystickDeviceIndex(JoyInfo[index].dev);
+
 	if (newcontroller && i < MAXSPLITSCREENPLAYERS) // don't override an active device
 	{
-		cv_usejoystick[index].value = I_GetJoystickDeviceIndex(JoyInfo[index].dev) + 1;
+		cv_usejoystick[index].value = JoyInfo[index].id + 1;
 	}
 	else if (newcontroller && joy_open(index, cv_usejoystick[index].value) != -1)
 	{
 		// SDL's device indexes are unstable, so cv_usejoystick may not match
 		// the actual device index. So let's cheat a bit and find the device's current index.
-		JoyInfo[index].oldjoy = I_GetJoystickDeviceIndex(JoyInfo[index].dev) + 1;
-		joystick_started[index] = 1;
+		JoyInfo[index].oldjoy = JoyInfo[index].id + 1;
 	}
 	else
 	{
 		if (JoyInfo[index].oldjoy)
 			I_ShutdownJoystick(index);
+
 		cv_usejoystick[index].value = 0;
-		joystick_started[index] = 0;
 	}
 
 	for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
@@ -1130,8 +1094,10 @@ static void I_ShutdownInput(void)
 INT32 I_NumJoys(void)
 {
 	INT32 numjoy = 0;
+
 	if (SDL_WasInit(SDL_INIT_JOYSTICK) == SDL_INIT_JOYSTICK)
 		numjoy = SDL_NumJoysticks();
+
 	return numjoy;
 }
 
@@ -1142,15 +1108,18 @@ const char *I_GetJoyName(INT32 joyindex)
 	const char *tempname = NULL;
 	joyname[0] = 0;
 	joyindex--; //SDL's Joystick System starts at 0, not 1
+
 	if (SDL_WasInit(SDL_INIT_JOYSTICK) == SDL_INIT_JOYSTICK)
 	{
 		tempname = SDL_JoystickNameForIndex(joyindex);
+
 		if (tempname)
 		{
 			memcpy(joyname, tempname, 255);
 			joyname[255] = '\0';
 		}
 	}
+
 	return joyname;
 }
 
@@ -1260,7 +1229,7 @@ static void I_SetupMumble(void)
 void I_UpdateMumble(const mobj_t *mobj, const listener_t listener)
 {
 #ifdef HAVE_MUMBLE
-	double angle;
+	float angle;
 	fixed_t anglef;
 
 	if (!mumble)
@@ -1274,7 +1243,9 @@ void I_UpdateMumble(const mobj_t *mobj, const listener_t listener)
 	}
 	mumble->uiTick++;
 
-	if (!netgame || gamestate != GS_LEVEL) { // Zero out, but never delink.
+	// Zero out, but never delink.
+	if (!netgame || gamestate != GS_LEVEL)
+	{
 		mumble->fAvatarPosition[0] = mumble->fAvatarPosition[1] = mumble->fAvatarPosition[2] = 0.0f;
 		mumble->fAvatarFront[0] = 1.0f;
 		mumble->fAvatarFront[1] = mumble->fAvatarFront[2] = 0.0f;
@@ -1293,30 +1264,32 @@ void I_UpdateMumble(const mobj_t *mobj, const listener_t listener)
 
 	if (mobj)
 	{
-		mumble->fAvatarPosition[0] = FIXED_TO_FLOAT(mobj->x) / MUMBLEUNIT;
-		mumble->fAvatarPosition[1] = FIXED_TO_FLOAT(mobj->z) / MUMBLEUNIT;
-		mumble->fAvatarPosition[2] = FIXED_TO_FLOAT(mobj->y) / MUMBLEUNIT;
+		mumble->fAvatarPosition[0] = FixedToFloat(mobj->x) / MUMBLEUNIT;
+		mumble->fAvatarPosition[1] = FixedToFloat(mobj->z) / MUMBLEUNIT;
+		mumble->fAvatarPosition[2] = FixedToFloat(mobj->y) / MUMBLEUNIT;
 
 		anglef = AngleFixed(mobj->angle);
-		angle = FIXED_TO_FLOAT(anglef)*DEG2RAD;
-		mumble->fAvatarFront[0] = (float)cos(angle);
+		angle = (float)(FixedToFloat(anglef) * DEG2RAD);
+		mumble->fAvatarFront[0] = cosf(angle);
 		mumble->fAvatarFront[1] = 0.0f;
-		mumble->fAvatarFront[2] = (float)sin(angle);
-	} else {
+		mumble->fAvatarFront[2] = sinf(angle);
+	}
+	else
+	{
 		mumble->fAvatarPosition[0] = mumble->fAvatarPosition[1] = mumble->fAvatarPosition[2] = 0.0f;
 		mumble->fAvatarFront[0] = 1.0f;
 		mumble->fAvatarFront[1] = mumble->fAvatarFront[2] = 0.0f;
 	}
 
-	mumble->fCameraPosition[0] = FIXED_TO_FLOAT(listener.x) / MUMBLEUNIT;
-	mumble->fCameraPosition[1] = FIXED_TO_FLOAT(listener.z) / MUMBLEUNIT;
-	mumble->fCameraPosition[2] = FIXED_TO_FLOAT(listener.y) / MUMBLEUNIT;
+	mumble->fCameraPosition[0] = FixedToFloat(listener.x) / MUMBLEUNIT;
+	mumble->fCameraPosition[1] = FixedToFloat(listener.z) / MUMBLEUNIT;
+	mumble->fCameraPosition[2] = FixedToFloat(listener.y) / MUMBLEUNIT;
 
 	anglef = AngleFixed(listener.angle);
-	angle = FIXED_TO_FLOAT(anglef)*DEG2RAD;
-	mumble->fCameraFront[0] = (float)cos(angle);
+	angle = (float)(FixedToFloat(anglef) * DEG2RAD);
+	mumble->fCameraFront[0] = cosf(angle);
 	mumble->fCameraFront[1] = 0.0f;
-	mumble->fCameraFront[2] = (float)sin(angle);
+	mumble->fCameraFront[2] = sinf(angle);
 #else
 	(void)mobj;
 	(void)listener;
@@ -1339,55 +1312,7 @@ precise_t I_GetPreciseTime(void)
 
 UINT64 I_GetPrecisePrecision(void)
 {
-	return SDL_GetPerformanceFrequency();
-}
-
-static UINT32 frame_rate;
-
-static double frame_frequency;
-static UINT64 frame_epoch;
-static double elapsed_frames;
-
-static void I_InitFrameTime(const UINT64 now, const UINT32 cap)
-{
-	frame_rate = cap;
-	frame_epoch = now;
-
-	//elapsed_frames = 0.0;
-
-	if (frame_rate == 0)
-	{
-		// Shouldn't be used, but just in case...?
-		frame_frequency = 1.0;
-		return;
-	}
-
-	frame_frequency = timer_frequency / (double)frame_rate;
-}
-
-double I_GetFrameTime(void)
-{
-	const UINT64 now = SDL_GetPerformanceCounter();
-	const UINT32 cap = R_GetFramerateCap();
-
-	if (cap != frame_rate)
-	{
-		// Maybe do this in a OnChange function for cv_fpscap?
-		I_InitFrameTime(now, cap);
-	}
-
-	if (frame_rate == 0)
-	{
-		// Always advance a frame.
-		elapsed_frames += 1.0;
-	}
-	else
-	{
-		elapsed_frames += (now - frame_epoch) / frame_frequency;
-	}
-
-	frame_epoch = now; // moving epoch
-	return elapsed_frames;
+	return timer_frequency;
 }
 
 //
@@ -1396,9 +1321,6 @@ double I_GetFrameTime(void)
 void I_StartupTimer(void)
 {
 	timer_frequency = SDL_GetPerformanceFrequency();
-
-	I_InitFrameTime(0, R_GetFramerateCap());
-	elapsed_frames  = 0.0;
 }
 
 void I_Sleep(UINT32 ms)

src/sdl/i_video.c

@@ -558,7 +558,7 @@ static void Impl_HandleWindowEvent(SDL_WindowEvent evt)
 
 static void Impl_HandleKeyboardEvent(SDL_KeyboardEvent evt, Uint32 type)
 {
-	event_t event;
+	event_t event = {0};
 
 	switch (type)
 	{
@@ -586,7 +586,9 @@ static void Impl_HandleKeyboardEvent(SDL_KeyboardEvent evt, Uint32 type)
 	}
 
 	if (event.data1)
+	{
 		D_PostEvent(&event);
+	}
 }
 
 static void Impl_HandleMouseMotionEvent(SDL_MouseMotionEvent evt)
@@ -638,7 +640,7 @@ static void Impl_HandleMouseMotionEvent(SDL_MouseMotionEvent evt)
 
 static void Impl_HandleMouseButtonEvent(SDL_MouseButtonEvent evt, Uint32 type)
 {
-	event_t event;
+	event_t event = {0};
 
 	// Ignore the event if the mouse is not actually focused on the window.
 	// This can happen if you used the mouse to restore keyboard focus;
@@ -651,8 +653,6 @@ static void Impl_HandleMouseButtonEvent(SDL_MouseButtonEvent evt, Uint32 type)
 	/// \todo inputEvent.button.which
 	if (USE_MOUSEINPUT)
 	{
-		SDL_memset(&event, 0, sizeof(event_t));
-
 		switch (type)
 		{
 			case SDL_MOUSEBUTTONUP:
@@ -693,27 +693,28 @@ static void Impl_HandleMouseButtonEvent(SDL_MouseButtonEvent evt, Uint32 type)
 
 static void Impl_HandleMouseWheelEvent(SDL_MouseWheelEvent evt)
 {
-	event_t event;
+	event_t event = {0};
 
 	if (USE_MOUSEINPUT)
 	{
-		SDL_memset(&event, 0, sizeof(event_t));
-
 		if (evt.y > 0)
 		{
 			event.data1 = KEY_MOUSEWHEELUP;
 			event.type = ev_keydown;
 		}
+
 		if (evt.y < 0)
 		{
 			event.data1 = KEY_MOUSEWHEELDOWN;
 			event.type = ev_keydown;
 		}
+
 		if (evt.y == 0)
 		{
 			event.data1 = 0;
 			event.type = ev_keyup;
 		}
+
 		if (event.type == ev_keyup || event.type == ev_keydown)
 		{
 			D_PostEvent(&event);
@@ -721,40 +722,78 @@ static void Impl_HandleMouseWheelEvent(SDL_MouseWheelEvent evt)
 	}
 }
 
+static UINT8 hatrepeattimer[MAXSPLITSCREENPLAYERS];
+#define HATREPEATDELAY 19
+
+void I_HandleControllerHatRepeat(void)
+{
+	// why bother if theres no controllers?
+	if (numcontrollers == 0)
+		return;
+
+	event_t event = {ev_keydown, 0, 0, 0};
+
+	static const SDL_GameControllerButton hatbutt[4] =
+	{
+		SDL_CONTROLLER_BUTTON_DPAD_UP,
+		SDL_CONTROLLER_BUTTON_DPAD_DOWN,
+		SDL_CONTROLLER_BUTTON_DPAD_LEFT,
+		SDL_CONTROLLER_BUTTON_DPAD_RIGHT
+	};
+
+	for (int i = 0; i < MAXSPLITSCREENPLAYERS; i++)
+	{
+		if (!cv_usejoystick[i].value)
+			continue;
+
+		SDL_GameController *controller = JoyInfo[i].dev;
+
+		if (!controller)
+			continue;
+
+		for (UINT8 h = 0; h < JOYHATS; h++)
+		{
+			if (SDL_GameControllerGetButton(controller, hatbutt[h]))
+			{
+				if (hatrepeattimer[i] < HATREPEATDELAY)
+				{
+					hatrepeattimer[i]++;
+				}
+				else if (hatrepeattimer[i] == HATREPEATDELAY)
+				{
+					event.data1 = KEY_HAT1 + (i * JOYHATS) + h;
+					D_PostEvent(&event);
+				}
+
+				return;
+			}
+		}
+
+		hatrepeattimer[i] = 0;
+	}
+}
+
 static void Impl_HandleControllerAxisEvent(SDL_ControllerAxisEvent evt)
 {
 	event_t event;
-	SDL_JoystickID joyid[4];
 	INT32 value;
 	UINT8 i;
 
 	// Determine the Joystick IDs for each current open joystick
 	for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
 	{
-		joyid[i] = SDL_JoystickInstanceID(SDL_GameControllerGetJoystick(JoyInfo[i].dev));
+		if (evt.which == JoyInfo[i].id)
+		{
+			event.type = ev_joystick + i;
+			break;
+		}
 	}
 
+	if (i == MAXSPLITSCREENPLAYERS)
+		return;
+
 	event.data1 = event.data2 = event.data3 = INT32_MAX;
 
-	if (evt.which == joyid[0])
-	{
-		event.type = ev_joystick;
-	}
-	else if (evt.which == joyid[1])
-	{
-		event.type = ev_joystick2;
-	}
-	else if (evt.which == joyid[2])
-	{
-		event.type = ev_joystick3;
-	}
-	else if (evt.which == joyid[3])
-	{
-		event.type = ev_joystick4;
-	}
-	else
-		return;
-
 	//axis
 	if (evt.axis > JOYAXISSET*2)
 		return;
@@ -790,47 +829,89 @@ static void Impl_HandleControllerAxisEvent(SDL_ControllerAxisEvent evt)
 		default:
 			return;
 	}
+
 	D_PostEvent(&event);
 }
 
-static void Impl_HandleControllerButtonEvent(SDL_ControllerButtonEvent evt, Uint32 type)
+static void Impl_HandleControllerHatEvent(SDL_ControllerButtonEvent evt, Uint32 type)
 {
-	event_t event;
-	SDL_JoystickID joyid[4];
+	event_t event = {0};
 	UINT8 i;
+	static const int hat_buttons_base[] = {KEY_HAT1, KEY_2HAT1, KEY_3HAT1, KEY_4HAT1};
 
 	// Determine the Joystick IDs for each current open joystick
 	for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
 	{
-		joyid[i] = SDL_JoystickInstanceID(SDL_GameControllerGetJoystick(JoyInfo[i].dev));
+		if (evt.which == JoyInfo[i].id)
+		{
+			event.data1 = hat_buttons_base[i];
+			break;
+		}
 	}
 
-	if (   evt.button == SDL_CONTROLLER_BUTTON_DPAD_UP
-		|| evt.button == SDL_CONTROLLER_BUTTON_DPAD_DOWN
-		|| evt.button == SDL_CONTROLLER_BUTTON_DPAD_LEFT
-		|| evt.button == SDL_CONTROLLER_BUTTON_DPAD_RIGHT)
+	if (i == MAXSPLITSCREENPLAYERS)
+		return;
+
+	switch (type)
 	{
-		// dpad buttons are mapped as the hat instead
+		case SDL_CONTROLLERBUTTONUP:
+			event.type = ev_keyup;
+			break;
+		case SDL_CONTROLLERBUTTONDOWN:
+			event.type = ev_keydown;
+			break;
+		default:
+			return;
+	}
+
+	switch (evt.button)
+	{
+		case SDL_CONTROLLER_BUTTON_DPAD_UP:
+			break;
+		case SDL_CONTROLLER_BUTTON_DPAD_DOWN:
+			event.data1 += 1;
+			break;
+		case SDL_CONTROLLER_BUTTON_DPAD_LEFT:
+			event.data1 += 2;
+			break;
+		case SDL_CONTROLLER_BUTTON_DPAD_RIGHT:
+			event.data1 += 3;
+			break;
+		default:
+			return;
+	}
+
+	if (event.type != ev_console)
+	{
+		D_PostEvent(&event);
+	}
+}
+
+static void Impl_HandleControllerButtonEvent(SDL_ControllerButtonEvent evt, Uint32 type)
+{
+	event_t event = {0};
+	UINT8 i;
+	static const int buttons_base[] = {KEY_JOY1, KEY_2JOY1, KEY_3JOY1, KEY_4JOY1};
+
+	// dpad special case handling
+	if (evt.button >= SDL_CONTROLLER_BUTTON_DPAD_UP &&
+		evt.button <= SDL_CONTROLLER_BUTTON_DPAD_RIGHT)
+	{
+		Impl_HandleControllerHatEvent(evt, type);
 		return;
 	}
 
-	if (evt.which == joyid[0])
+	// Determine the Joystick IDs for each current open joystick
+	for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
 	{
-		event.data1 = KEY_JOY1;
+		if (evt.which == JoyInfo[i].id)
+		{
+			event.data1 = buttons_base[i];
+			break;
+		}
 	}
-	else if (evt.which == joyid[1])
-	{
-		event.data1 = KEY_2JOY1;
-	}
-	else if (evt.which == joyid[2])
-	{
-		event.data1 = KEY_3JOY1;
-	}
-	else if (evt.which == joyid[3])
-	{
-		event.data1 = KEY_4JOY1;
-	}
-	else
+
+	if (i == MAXSPLITSCREENPLAYERS)
 		return;
 
 	switch (type)
@@ -853,7 +934,9 @@ static void Impl_HandleControllerButtonEvent(SDL_ControllerButtonEvent evt, Uint
 		return;
 
 	if (event.type != ev_console)
+	{
 		D_PostEvent(&event);
+	}
 }
 
 static void Impl_HandleControllerAddedEvent(SDL_Event evt)
@@ -1097,7 +1180,6 @@ void I_StartupMouse(void)
 void I_OsPolling(void)
 {
 	SDL_Keymod mod;
-	INT32 i;
 
 	if (consolevent)
 		I_GetConsoleEvents();
@@ -1105,9 +1187,6 @@ void I_OsPolling(void)
 	if (SDL_WasInit(SDL_INIT_JOYSTICK|SDL_INIT_GAMECONTROLLER) == (SDL_INIT_JOYSTICK|SDL_INIT_GAMECONTROLLER))
 	{
 		SDL_GameControllerUpdate();
-
-		for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
-			I_GetJoystickEvents(i);
 	}
 
 	I_GetEvent();
@@ -1597,7 +1676,11 @@ static SDL_bool Impl_CreateContext(void)
 			I_Error("Failed to create a GL context: %s\n", SDL_GetError());
 		}
 
-		SDL_GL_MakeCurrent(window, sdlglcontext);
+		if (SDL_GL_MakeCurrent(window, sdlglcontext) < 0)
+		{
+			SDL_DestroyWindow(window);
+			I_Error("Failed to set up GL context: %s\n", SDL_GetError());
+		}
 
 		return SDL_TRUE;
 	}
@@ -1635,8 +1718,7 @@ static SDL_bool Impl_CreateContext(void)
 
 		if (renderer == NULL)
 		{
-			CONS_Printf(M_GetText("Couldn't create rendering context: %s\n"), SDL_GetError());
-			return SDL_FALSE;
+			I_Error("Couldn't create rendering context: %s\n", SDL_GetError());
 		}
 
 		SDL_RenderSetLogicalSize(renderer, BASEVIDWIDTH, BASEVIDHEIGHT);
@@ -1689,8 +1771,7 @@ static SDL_bool Impl_CreateWindow(SDL_bool fullscreen)
 
 	if (window == NULL)
 	{
-		CONS_Printf(M_GetText("Couldn't create window: %s\n"), SDL_GetError());
-		return SDL_FALSE;
+		I_Error("Couldn't create window: %s\n", SDL_GetError());
 	}
 
 	return Impl_CreateContext();

src/sdl/mixer_sound.c

@@ -73,7 +73,7 @@ write netcode into the sound code, OKAY?
 
 
 //static UINT16 BUFFERSIZE = 2048;
-static UINT16 SAMPLERATE = 44100;
+static const UINT16 SAMPLERATE = 44100;
 
 #ifdef HAVE_OPENMPT
 #include "libopenmpt/libopenmpt.h"
@@ -169,10 +169,11 @@ void I_StartupSound(void)
 	if (sound_started)
 		return;
 
-#ifdef _WIN32
+#if defined(_WIN32) && !SDL_VERSION_ATLEAST(2,26,5)
 	// Force DirectSound instead of WASAPI
 	// SDL 2.0.6+ defaults to the latter and it screws up our sound effects
-	SDL_setenv("SDL_AUDIODRIVER", "directsound", 1);
+	// SDL 2.26.5 brought imrovements to resampling so this just screws up other stuff now
+	//SDL_setenv("SDL_AUDIODRIVER", "directsound", 1);
 #endif
 
 	// EE inits audio first so we're following along.
@@ -181,7 +182,8 @@ void I_StartupSound(void)
 		CONS_Debug(DBG_DETAILED, "SDL Audio already started\n");
 		return;
 	}
-	else if (SDL_InitSubSystem(SDL_INIT_AUDIO) < 0)
+
+	if (SDL_InitSubSystem(SDL_INIT_AUDIO) < 0)
 	{
 		CONS_Alert(CONS_ERROR, "Error initializing SDL Audio: %s\n", SDL_GetError());
 		// call to start audio failed -- we do not have it
@@ -606,8 +608,8 @@ static UINT32 get_adjusted_position(UINT32 position)
 		UINT32 looppoint = I_GetSongLoopPoint();
 		return position >= length ? (position % (length-looppoint)) : position;
 	}
-	else
-		return position;
+
+	return position;
 }
 
 static void do_fading_callback(void)
@@ -624,7 +626,7 @@ static void Countstutter(int len)
 {
 	UINT32 bytes;
 
-	if (!cv_birdmusic.value || gamestate != GS_LEVEL)
+	if (gamestate != GS_LEVEL)
 		return;
 
 	if (hu_stopped)
@@ -693,11 +695,13 @@ static UINT32 music_fade(UINT32 interval, void *param)
 		do_fading_callback();
 		return 0;
 	}
-	else if (songpaused) // don't decrement timer
+
+	if (songpaused) // don't decrement timer
 	{
 		return interval;
 	}
-	else if ((fading_timer -= 10) <= 0)
+
+	if ((fading_timer -= 10) <= 0)
 	{
 		internal_volume = fading_target;
 		Mix_VolumeMusic(get_real_volume(music_volume));
@@ -705,20 +709,18 @@ static UINT32 music_fade(UINT32 interval, void *param)
 		do_fading_callback();
 		return 0;
 	}
-	else
-	{
-		UINT8 delta = abs(fading_target - fading_source);
-		fixed_t factor = FixedDiv(fading_duration - fading_timer, fading_duration);
 
-		if (fading_target < fading_source)
-			internal_volume = max(min(internal_volume, fading_source - FixedMul(delta, factor)), fading_target);
-		else if (fading_target > fading_source)
-			internal_volume = min(max(internal_volume, fading_source + FixedMul(delta, factor)), fading_target);
+	UINT8 delta = abs(fading_target - fading_source);
+	fixed_t factor = FixedMul(delta, FixedDiv(fading_duration - fading_timer, fading_duration));
 
-		Mix_VolumeMusic(get_real_volume(music_volume));
+	if (fading_target < fading_source)
+		internal_volume = max(min(internal_volume, fading_source - factor), fading_target);
+	else if (fading_target > fading_source)
+		internal_volume = min(max(internal_volume, fading_source + factor), fading_target);
 
-		return interval;
-	}
+	Mix_VolumeMusic(get_real_volume(music_volume));
+
+	return interval;
 }
 
 #ifdef HAVE_LIBGME
@@ -792,7 +794,6 @@ musictype_t I_SongType(void)
 #ifdef HAVE_LIBGME
 	if (gme)
 		return MU_GME;
-	else
 #endif
 #ifdef HAVE_OPENMPT
 	if (openmpt_mhandle)
@@ -822,10 +823,10 @@ boolean I_SongPlaying(void)
 {
 	return (
 #ifdef HAVE_LIBGME
-		(I_SongType() == MU_GME && gme) ||
+		(gme && I_SongType() == MU_GME) ||
 #endif
 #ifdef HAVE_OPENMPT
-		(I_SongType() == MU_MOD_EX && openmpt_mhandle) ||
+		(openmpt_mhandle && I_SongType() == MU_MOD_EX) ||
 #endif
 		music != NULL
 	);
@@ -844,7 +845,6 @@ boolean I_SetSongSpeed(float speed)
 {
 	if (speed > 250.0f)
 		speed = 250.0f; //limit speed up to 250x
-
 #ifdef HAVE_LIBGME
 	if (gme)
 	{
@@ -853,7 +853,6 @@ boolean I_SetSongSpeed(float speed)
 		SDL_UnlockAudio();
 		return true;
 	}
-	else
 #endif
 #ifdef HAVE_OPENMPT
 	if (openmpt_mhandle)
@@ -917,30 +916,26 @@ UINT32 I_GetSongLength(void)
 
 		return max(length, 0);
 	}
-	else
 #endif
 #ifdef HAVE_OPENMPT
 	if (openmpt_mhandle)
 	{
 		return (UINT32)(openmpt_module_get_duration_seconds(openmpt_mhandle) * 1000.);
 	}
-	else
 #endif
 	if (!music || I_SongType() == MU_MOD || I_SongType() == MU_MID)
 	{
 		return 0;
 	}
-	else
-	{
-		// VERY IMPORTANT to set your LENGTHMS= in your song files, folks!
-		// SDL mixer can't read music length itself.
-		length = (UINT32)(song_length*1000);
 
-		if (!length)
-			CONS_Debug(DBG_DETAILED, "Getting music length: music is missing LENGTHMS= tag. Needed for seeking.\n");
+	// VERY IMPORTANT to set your LENGTHMS= in your song files, folks!
+	// SDL mixer can't read music length itself.
+	length = (UINT32)(song_length*1000);
 
-		return length;
-	}
+	if (!length)
+		CONS_Debug(DBG_DETAILED, "Getting music length: music is missing LENGTHMS= tag. Needed for seeking.\n");
+
+	return length;
 }
 
 boolean I_SetSongLoopPoint(UINT32 looppoint)
@@ -980,18 +975,16 @@ UINT32 I_GetSongLoopPoint(void)
 			looppoint = info->intro_length > 0 ? info->intro_length : 0;
 
 		gme_free_info(info);
+
 		return max(looppoint, 0);
 	}
-	else
 #endif
 	if (!music || I_SongType() == MU_MOD || I_SongType() == MU_MID)
 	{
 		return 0;
 	}
-	else
-	{
-		return (UINT32)(loop_point * 1000);
-	}
+
+	return (UINT32)(loop_point * 1000);
 }
 
 boolean I_SetSongPosition(UINT32 position)
@@ -1021,7 +1014,6 @@ boolean I_SetSongPosition(UINT32 position)
 		// else
 		// 	return true;
 	}
-	else
 #endif
 #ifdef HAVE_OPENMPT
 	if (openmpt_mhandle)
@@ -1031,40 +1023,38 @@ boolean I_SetSongPosition(UINT32 position)
 		openmpt_module_set_position_seconds(openmpt_mhandle, (double)(get_adjusted_position(position)/1000.0L)); // returns new position
 		return true;
 	}
-	else
 #endif
 	if (!music || I_SongType() == MU_MID)
 	{
 		return false;
 	}
-	else if (I_SongType() == MU_MOD)
+
+	if (I_SongType() == MU_MOD)
 	{
 		return Mix_SetMusicPosition(position); // Goes by channels
 	}
+
+	// Because SDL mixer can't identify song length, if you have
+	// a position input greater than the real length, then
+	// music_bytes becomes inaccurate.
+
+	length = I_GetSongLength(); // get it in MS
+
+	if (length)
+		position = get_adjusted_position(position);
+
+	Mix_RewindMusic(); // needed for mp3
+
+	if (Mix_SetMusicPosition((float)(position/1000.0L)) == 0)
+		music_bytes = (UINT32)(position/1000.0L*44100.0L*4); //assume 44.1khz, 4-byte length (see I_GetSongPosition)
 	else
-	{
-		// Because SDL mixer can't identify song length, if you have
-		// a position input greater than the real length, then
-		// music_bytes becomes inaccurate.
+		// NOTE: This block fires on incorrect song format,
+		// NOT if position input is greater than song length.
+		music_bytes = 0;
 
-		length = I_GetSongLength(); // get it in MS
+	music_stutter_bytes = 0;
 
-		if (length)
-			position = get_adjusted_position(position);
-
-		Mix_RewindMusic(); // needed for mp3
-
-		if (Mix_SetMusicPosition((float)(position/1000.0L)) == 0)
-			music_bytes = (UINT32)(position/1000.0L*44100.0L*4); //assume 44.1khz, 4-byte length (see I_GetSongPosition)
-		else
-			// NOTE: This block fires on incorrect song format,
-			// NOT if position input is greater than song length.
-			music_bytes = 0;
-
-		music_stutter_bytes = 0;
-
-		return true;
-	}
+	return true;
 }
 
 UINT32 I_GetSongPosition(void)
@@ -1097,7 +1087,6 @@ UINT32 I_GetSongPosition(void)
 
 		return max(position, 0);
 	}
-	else
 #endif
 #ifdef HAVE_OPENMPT
 	if (openmpt_mhandle)
@@ -1105,19 +1094,16 @@ UINT32 I_GetSongPosition(void)
 		// So return unadjusted. See note in SetMusicPosition: we adjust for that.
 		return (UINT32)(openmpt_module_get_position_seconds(openmpt_mhandle)*1000.);
 		//return get_adjusted_position((UINT32)(openmpt_module_get_position_seconds(openmpt_mhandle)*1000.));
-	else
 #endif
 	if (!music || I_SongType() == MU_MID)
 	{
 		return 0;
 	}
-	else
-	{
-		return (UINT32)(music_bytes/44100.0L*1000.0L/4); //assume 44.1khz
-		// 4 = byte length for 16-bit samples (AUDIO_S16SYS), stereo (2-channel)
-		// This is hardcoded in I_StartupSound. Other formats for factor:
-		// 8M: 1 | 8S: 2 | 16M: 2 | 16S: 4
-	}
+
+	return (UINT32)(music_bytes/44100.0L*1000.0L/4); //assume 44.1khz
+	// 4 = byte length for 16-bit samples (AUDIO_S16SYS), stereo (2-channel)
+	// This is hardcoded in I_StartupSound. Other formats for factor:
+	// 8M: 1 | 8S: 2 | 16M: 2 | 16S: 4
 }
 
 void I_UpdateSongLagThreshold(void)
@@ -1235,8 +1221,8 @@ boolean I_LoadSong(char *data, size_t len)
 			CONS_Alert(CONS_ERROR, "openmpt_module_create_from_memory2: %s\n", mod_err_str);
 			return false;
 		}
-		else
-			return true; // All good and we're ready for music playback!
+
+		return true; // All good and we're ready for music playback!
 	}
 #endif
 
@@ -1331,31 +1317,20 @@ boolean I_PlaySong(boolean looping)
 
 		return true;
 	}
-	else
 #endif
 #ifdef HAVE_OPENMPT
 	if (openmpt_mhandle)
 	{
 		openmpt_module_select_subsong(openmpt_mhandle, 0);
-
+		openmpt_module_set_render_param(openmpt_mhandle, OPENMPT_MODULE_RENDER_STEREOSEPARATION_PERCENT, cv_stereosep.value); //have a feeling some might like it
 #if OPENMPT_API_VERSION_MAJOR < 1 && OPENMPT_API_VERSION_MINOR > 4
 		openmpt_module_ctl_set_text(openmpt_mhandle, "dither", "1");
+		openmpt_module_ctl_set_boolean(openmpt_mhandle, "render.resampler.emulate_amiga", cv_amigafilter.value);
+		openmpt_module_ctl_set_text(openmpt_mhandle, "render.resampler.emulate_amiga_type", cv_amigatype.string);
 #else
 		openmpt_module_ctl_set(openmpt_mhandle, "dither", "1");
-#endif
-
-		openmpt_module_set_render_param(openmpt_mhandle, OPENMPT_MODULE_RENDER_STEREOSEPARATION_PERCENT, cv_stereosep.value); //have a feeling some might like it
-
-#if OPENMPT_API_VERSION_MAJOR < 1 && OPENMPT_API_VERSION_MINOR > 4
-		openmpt_module_ctl_set_boolean(openmpt_mhandle, "render.resampler.emulate_amiga", cv_amigafilter.value);
-#else
 		openmpt_module_ctl_set(openmpt_mhandle, "render.resampler.emulate_amiga", cv_amigafilter.value ? "1" : "0");
 #endif
-
-#if OPENMPT_API_VERSION_MAJOR < 1 && OPENMPT_API_VERSION_MINOR > 4
-		openmpt_module_ctl_set_text(openmpt_mhandle, "render.resampler.emulate_amiga_type", cv_amigatype.string);
-#endif
-
 		openmpt_module_set_render_param(openmpt_mhandle, OPENMPT_MODULE_RENDER_INTERPOLATIONFILTER_LENGTH, cv_modfilter.value);
 		if (looping)
 			openmpt_module_set_repeat_count(openmpt_mhandle, -1); // Always repeat
@@ -1363,7 +1338,6 @@ boolean I_PlaySong(boolean looping)
 		Mix_HookMusic(mix_openmpt, openmpt_mhandle);
 		return true;
 	}
-	else
 #endif
 	if (!music)
 		return false;
@@ -1504,7 +1478,6 @@ boolean I_SetSongTrack(INT32 track)
 
 		return false;
 	}
-	else
 #endif
 #ifdef HAVE_OPENMPT
 	if (openmpt_mhandle)

src/sdl/sdl_sound.c

@@ -1073,9 +1073,10 @@ void I_StartupSound(void)
 	// Configure sound device
 	CONS_Printf("I_StartupSound:\n");
 
-#ifdef _WIN32
+#if defined(_WIN32) && !SDL_VERSION_ATLEAST(2,26,5)
 	// Force DirectSound instead of WASAPI
 	// SDL 2.0.6+ defaults to the latter and it screws up our sound effects
+	// SDL 2.26.5 brought imrovements to resampling so this just screws up other stuff now
 	SDL_setenv("SDL_AUDIODRIVER", "directsound", 1);
 #endif
 

src/sdl/sdlmain.h

@@ -42,6 +42,8 @@ typedef struct SDLJoyInfo_s
 {
 	/// Controller handle
 	SDL_GameController *dev;
+	/// Controller index
+	INT32 id;
 	/// number of old joystick
 	int oldjoy;
 	/// number of axies

src/v_video.c

@@ -141,7 +141,6 @@ static boolean InitCube(void)
 
 #define diffcons(cv) (!fastcmp(cv.string, cv.defaultvalue))
 #define diffconsbrightness(cv) (cv.value != 0)
-
 #define diffconssat(cv) (cv.value != 10)
 
 	doingbrightness = diffcons(cv_globalbrightness);