update sdl2_mixer to 2.8.1

since we use wasapi now we can finally update this to 2.8.1 hopefully without any regressions now

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/Makefile

@@ -49,7 +49,6 @@
 #                    Already enabled by default for 32-bit
 #                    Windows.
 # NOCURL=1 - Disable libcurl--HTTP capability.
-# NOHOLEPUNCH=1 - Disable holepunch capability.
 # NOLIBGME=1 - Disable game music emu, retro VGM support.
 # NOOPENMPT=1 - Disable module (tracker) music support.
 # NOMIXER=1 - Disable SDL Mixer (audio playback).

src/Makefile.d/features.mk

@@ -6,8 +6,7 @@ passthru_opts+=\
 	NOHW NOMD5 NOPOSTPROCESSING\
 	MOBJCONSISTANCY PACKETDROP ZDEBUG\
 	HAVE_MINIUPNPC\
-	HAVE_DISCORDRPC DEVELOP\
-	NOHOLEPUNCH\
+	HAVE_DISCORDRPC DEVELOP
 
 # build with debugging information
 ifdef DEBUGMODE

src/Makefile.d/versions.mk

@@ -144,10 +144,8 @@ ifdef GCC81
  WFLAGS+=-Wno-error=multistatement-macros
 endif
 
-ifneq (,$(filter $(CC) $(CXX),clang clang++))
- WFLAGS+= -Wno-unknown-pragmas
- WFLAGS+= -Wno-cast-align
- WFLAGS+= -Wno-cast-qual # not a fan, but clang really hates our read macros
+ifeq ($(CC),clang)
+ WFLAGS+= -Wno-unknown-pragmas -Wno-cast-align
 endif
 
 ifdef NONX86

src/blua/lapi.c

@@ -434,7 +434,7 @@ LUA_API void lua_pushnumber (lua_State *L, lua_Number n) {
 LUA_API void lua_pushlstring (lua_State *L, const char *s, size_t len) {
   lua_lock(L);
   luaC_checkGC(L);
-  setsvalue2s(L, L->top, (len == 0) ? luaS_new(L, "") : luaS_newlstr(L, s, len));
+  setsvalue2s(L, L->top, luaS_newlstr(L, s, len));
   api_incr_top(L);
   lua_unlock(L);
 }

src/blua/lauxlib.c

@@ -24,8 +24,6 @@
 
 #include "lauxlib.h"
 
-#include "../doomdef.h"
-
 
 #define FREELIST_REF	0	/* free list of references */
 
@@ -42,7 +40,7 @@ LUALIB_API int luaL_argerror (lua_State *L, int narg, const char *extramsg) {
   if (!lua_getstack(L, 0, &ar))  /* no stack frame? */
     return luaL_error(L, "bad argument #%d (%s)", narg, extramsg);
   lua_getinfo(L, "n", &ar);
-  if (fastcmp(ar.namewhat, "method")) {
+  if (strcmp(ar.namewhat, "method") == 0) {
     narg--;  /* do not count `self' */
     if (narg == 0)  /* error is in the self argument itself? */
       return luaL_error(L, "calling " LUA_QS " on bad self (%s)",
@@ -99,7 +97,7 @@ LUALIB_API int luaL_checkoption (lua_State *L, int narg, const char *def,
                              luaL_checkstring(L, narg);
   int i;
   for (i=0; lst[i]; i++)
-    if (fastcmp(lst[i], name))
+    if (strcmp(lst[i], name) == 0)
       return i;
   return luaL_argerror(L, narg,
                        lua_pushfstring(L, "invalid option " LUA_QS, name));

src/blua/liolib.c

@@ -161,13 +161,12 @@ static int io_tostring (lua_State *L) {
 
 static int StartsWith(const char *a, const char *b) // this is wolfs being lazy yet again
 {
-   if (strncmp(a, b, strlen(b)) == 0) return 1;
+   if(strncmp(a, b, strlen(b)) == 0) return 1;
    return 0;
 }
 
 
-static int io_open(lua_State *L)
-{
+static int io_open (lua_State *L) {
 	FILE **pf;
 	const char *filename = luaL_checkstring(L, 1);
 	int pass = 0;
@@ -179,13 +178,12 @@ static int io_open(lua_State *L)
 
 	for (i = 0; i < (sizeof (whitelist) / sizeof(const char *)); i++)
 	{
-		if (fasticmp(&filename[length - strlen(whitelist[i])], whitelist[i]))
+		if (!stricmp(&filename[length - strlen(whitelist[i])], whitelist[i]))
 		{
 			pass = 1;
 			break;
 		}
 	}
-
 	if (l_unlikely(strstr(filename, "..") || strchr(filename, ':') || StartsWith(filename, "\\")
 		|| StartsWith(filename, "/") || !pass))
 	{

src/byteptr.h

@@ -1,8 +1,7 @@
-// SONIC ROBO BLAST 2 KART
+// SONIC ROBO BLAST 2
 //-----------------------------------------------------------------------------
-// Copyright (C) 2025 by Kart Krew.
-// Copyright (C) 2020 by Sonic Team Junior.
-// Copyright (C) 2000 by DooM Legacy Team.
+// Copyright (C) 1998-2000 by DooM Legacy Team.
+// Copyright (C) 1999-2025 by Sonic Team Junior.
 //
 // This program is free software distributed under the
 // terms of the GNU General Public License, version 2.
@@ -25,9 +24,8 @@ extern "C" {
 //
 // Little-endian machines
 //
-
 #define WRITEUINT8(p,b)     do {   UINT8 *p_tmp = (  UINT8 *)p; const   UINT8 tv = (  UINT8)(b); memcpy(p, &tv, sizeof(  UINT8)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; } while (0)
-#define WRITESINT8(p,b)     do {   SINT8 *p_tmp = (  SINT8 *)p; const   SINT8 tv = (  SINT8)(b); memcpy(p, &tv, sizeof(  SINT8)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; } while (0)
+#define WRITESINT8(p,b)     do {   SINT8 *p_tmp = (  SINT8 *)p; const   SINT8 tv = (  UINT8)(b); memcpy(p, &tv, sizeof(  UINT8)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; } while (0)
 #define WRITEINT16(p,b)     do {   INT16 *p_tmp = (  INT16 *)p; const   INT16 tv = (  INT16)(b); memcpy(p, &tv, sizeof(  INT16)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; } while (0)
 #define WRITEUINT16(p,b)    do {  UINT16 *p_tmp = ( UINT16 *)p; const  UINT16 tv = ( UINT16)(b); memcpy(p, &tv, sizeof( UINT16)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; } while (0)
 #define WRITEINT32(p,b)     do {   INT32 *p_tmp = (  INT32 *)p; const   INT32 tv = (  INT32)(b); memcpy(p, &tv, sizeof(  INT32)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; } while (0)
@@ -38,25 +36,25 @@ extern "C" {
 
 // what is this?
 #if defined (__GNUC__)
-#define READUINT8(p)        ({   const UINT8 *p_tmp = (const UINT8   *)p;   UINT8 b; memcpy(&b, p, sizeof(  UINT8)); p_tmp++; *(const void**)(&(p)) = (const void *)p_tmp; b; })
-#define READSINT8(p)        ({   const SINT8 *p_tmp = (const SINT8   *)p;   SINT8 b; memcpy(&b, p, sizeof(  SINT8)); p_tmp++; *(const void**)(&(p)) = (const void *)p_tmp; b; })
-#define READINT16(p)        ({   const INT16 *p_tmp = (const INT16   *)p;   INT16 b; memcpy(&b, p, sizeof(  INT16)); p_tmp++; *(const void**)(&(p)) = (const void *)p_tmp; b; })
-#define READUINT16(p)       ({  const UINT16 *p_tmp = (const UINT16  *)p;  UINT16 b; memcpy(&b, p, sizeof( UINT16)); p_tmp++; *(const void**)(&(p)) = (const void *)p_tmp; b; })
-#define READINT32(p)        ({   const INT32 *p_tmp = (const INT32   *)p;   INT32 b; memcpy(&b, p, sizeof(  INT32)); p_tmp++; *(const void**)(&(p)) = (const void *)p_tmp; b; })
-#define READUINT32(p)       ({  const UINT32 *p_tmp = (const UINT32  *)p;  UINT32 b; memcpy(&b, p, sizeof( UINT32)); p_tmp++; *(const void**)(&(p)) = (const void *)p_tmp; b; })
-#define READCHAR(p)         ({    const char *p_tmp = (const char    *)p;    char b; memcpy(&b, p, sizeof(   char)); p_tmp++; *(const void**)(&(p)) = (const void *)p_tmp; b; })
-#define READFIXED(p)        ({ const fixed_t *p_tmp = (const fixed_t *)p; fixed_t b; memcpy(&b, p, sizeof(fixed_t)); p_tmp++; *(const void**)(&(p)) = (const void *)p_tmp; b; })
-#define READANGLE(p)        ({ const angle_t *p_tmp = (const angle_t *)p; angle_t b; memcpy(&b, p, sizeof(angle_t)); p_tmp++; *(const void**)(&(p)) = (const void *)p_tmp; b; })
+#define READUINT8(p)        ({   UINT8 *p_tmp = (UINT8   *)p;   UINT8 b; memcpy(&b, p, sizeof(  UINT8)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; b; })
+#define READSINT8(p)        ({   SINT8 *p_tmp = (SINT8   *)p;   SINT8 b; memcpy(&b, p, sizeof(  SINT8)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; b; })
+#define READINT16(p)        ({   INT16 *p_tmp = (INT16   *)p;   INT16 b; memcpy(&b, p, sizeof(  INT16)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; b; })
+#define READUINT16(p)       ({  UINT16 *p_tmp = (UINT16  *)p;  UINT16 b; memcpy(&b, p, sizeof( UINT16)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; b; })
+#define READINT32(p)        ({   INT32 *p_tmp = (INT32   *)p;   INT32 b; memcpy(&b, p, sizeof(  INT32)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; b; })
+#define READUINT32(p)       ({  UINT32 *p_tmp = (UINT32  *)p;  UINT32 b; memcpy(&b, p, sizeof( UINT32)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; b; })
+#define READCHAR(p)         ({    char *p_tmp = (char    *)p;    char b; memcpy(&b, p, sizeof(   char)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; b; })
+#define READFIXED(p)        ({ fixed_t *p_tmp = (fixed_t *)p; fixed_t b; memcpy(&b, p, sizeof(fixed_t)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; b; })
+#define READANGLE(p)        ({ angle_t *p_tmp = (angle_t *)p; angle_t b; memcpy(&b, p, sizeof(angle_t)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; b; })
 #else
-#define READUINT8(p)        ((const UINT8*)  (*(const void**)(&(p)) = (const void*)&((const UINT8*)  (p))[1]))[-1]
-#define READSINT8(p)        ((const SINT8*)  (*(const void**)(&(p)) = (const void*)&((const SINT8*)  (p))[1]))[-1]
-#define READINT16(p)        ((const INT16*)  (*(const void**)(&(p)) = (const void*)&((const INT16*)  (p))[1]))[-1]
-#define READUINT16(p)       ((const UINT16*) (*(const void**)(&(p)) = (const void*)&((const UINT16*) (p))[1]))[-1]
-#define READINT32(p)        ((const INT32*)  (*(const void**)(&(p)) = (const void*)&((const INT32*)  (p))[1]))[-1]
-#define READUINT32(p)       ((const UINT32*) (*(const void**)(&(p)) = (const void*)&((const UINT32*) (p))[1]))[-1]
-#define READCHAR(p)         ((const char*)   (*(const void**)(&(p)) = (const void*)&((const char*)   (p))[1]))[-1]
-#define READFIXED(p)        ((const fixed_t*)(*(const void**)(&(p)) = (const void*)&((const fixed_t*)(p))[1]))[-1]
-#define READANGLE(p)        ((const angle_t*)(*(const void**)(&(p)) = (const void*)&((const angle_t*)(p))[1]))[-1]
+#define READUINT8(p)        ((UINT8*)(*(void**)(&(p)) = (void*)&((UINT8*)(p))[1]))[-1]
+#define READSINT8(p)        ((SINT8*)(*(void**)(&(p)) = (void*)&((SINT8*)(p))[1]))[-1]
+#define READINT16(p)        ((INT16*)(*(void**)(&(p)) = (void*)&((INT16*)(p))[1]))[-1]
+#define READUINT16(p)       ((UINT16*)(*(void**)(&(p)) = (void*)&((UINT16*)(p))[1]))[-1]
+#define READINT32(p)        ((INT32*)(*(void**)(&(p)) = (void*)&((INT32*)(p))[1]))[-1]
+#define READUINT32(p)       ((UINT32*)(*(void**)(&(p)) = (void*)&((UINT32*)(p))[1]))[-1]
+#define READCHAR(p)         ((char*)(*(void**)(&(p)) = (void*)&((char*)(p))[1]))[-1]
+#define READFIXED(p)        ((fixed_t*)(*(void**)(&(p)) = (void*)&((fixed_t*)(p))[1]))[-1]
+#define READANGLE(p)        ((angle_t*)(*(void**)(&(p)) = (void*)&((angle_t*)(p))[1]))[-1]
 #endif
 
 #else //SRB2_BIG_ENDIAN
@@ -119,15 +117,15 @@ FUNCINLINE static ATTRINLINE UINT32 readulong(void *ptr)
 	return (ucp[3] << 24) | (ucp[2] << 16) | (ucp[1] << 8) | ucp[0];
 }
 
-#define READUINT8(p)        ((const UINT8*)(p = (const void*)&((const UINT8*)p)[1]))[-1]
-#define READSINT8(p)        ((const SINT8*)(p = (const void*)&((const SINT8*)p)[1]))[-1]
-#define READINT16(p)        readshort(&((const INT16*)(p = (const void*)&((const INT16*)p)[1]))[-1])
-#define READUINT16(p)       readushort(&((const UINT16*)(p = (const void*)&((const UINT16*)p)[1]))[-1])
-#define READINT32(p)        readlong(&((const INT32*)(p = (const void*)&((const INT32*)p)[1]))[-1])
-#define READUINT32(p)       readulong(&((const UINT32*)(p = (const void*)&((const UINT32*)p)[1]))[-1])
-#define READCHAR(p)         ((const char*)(p = (const void*)&((const char*)p)[1]))[-1]
-#define READFIXED(p)        readlong(&((const fixed_t*)(p = (const void*)&((const fixed_t*)p)[1]))[-1])
-#define READANGLE(p)        readulong(&((const angle_t*)(p = (const void*)&((const angle_t*)p)[1]))[-1])
+#define READUINT8(p)        ((UINT8*)(p = (void*)&((UINT8*)p)[1]))[-1]
+#define READSINT8(p)        ((SINT8*)(p = (void*)&((SINT8*)p)[1]))[-1]
+#define READINT16(p)        readshort(&((INT16*)(p = (void*)&((INT16*)p)[1]))[-1])
+#define READUINT16(p)       readushort(&((UINT16*)(p = (void*)&((UINT16*)p)[1]))[-1])
+#define READINT32(p)        readlong(&((INT32*)(p = (void*)&((INT32*)p)[1]))[-1])
+#define READUINT32(p)       readulong(&((UINT32*)(p = (void*)&((UINT32*)p)[1]))
+#define READCHAR(p)         ((char*)(p = (void*)&((char*)p)[1]))[-1]
+#define READFIXED(p)        readlong(&((fixed_t*)(p = (void*)&((fixed_t*)p)[1]))[-1])
+#define READANGLE(p)        readulong(&((angle_t*)(p = (void*)&((angle_t*)p)[1]))[-1])
 #endif //SRB2_BIG_ENDIAN
 
 #define WRITESTRINGN(p, s, n) do {                          \

src/command.c

@@ -142,7 +142,7 @@ void COM_BufInsertText(const char *ptext)
 	templen = com_text.cursize;
 	if (templen)
 	{
-		temp = memcpy(ZZ_Alloc(templen), com_text.data, templen);
+		temp = M_Memcpy(ZZ_Alloc(templen), com_text.data, templen);
 		VS_Clear(&com_text);
 	}
 
@@ -199,7 +199,7 @@ void COM_BufExecute(void)
 				break;
 		}
 
-		memcpy(line, ptext, i);
+		M_Memcpy(line, ptext, i);
 		line[i] = 0;
 
 		// flush the command text from the command buffer, _BEFORE_
@@ -281,7 +281,7 @@ char *com_argv[MAX_ARGS];
 static const char *com_null_string = "";
 static char *com_args = NULL; // current command args or NULL
 
-static void Got_NetVar(const UINT8 **p, INT32 playernum);
+static void Got_NetVar(UINT8 **p, INT32 playernum);
 
 /** Initializes command buffer and adds basic commands.
   */
@@ -359,7 +359,7 @@ size_t COM_CheckParm(const char *check)
 	size_t i;
 
 	for (i = 1; i < com_argc; i++)
-		if (fasticmp(check, com_argv[i]))
+		if (!strcasecmp(check, com_argv[i]))
 			return i;
 	return 0;
 }
@@ -456,7 +456,7 @@ void COM_AddCommand(const char *name, com_func_t func)
 	// fail if the command already exists
 	for (cmd = com_commands; cmd; cmd = cmd->next)
 	{
-		if (fasticmp(name, cmd->name)) //case insensitive now that we have lower and uppercase!
+		if (!stricmp(name, cmd->name)) //case insensitive now that we have lower and uppercase!
 		{
 			// don't I_Error for Lua commands
 			// Lua commands can replace game commands, and they have priority.
@@ -492,7 +492,7 @@ int COM_AddLuaCommand(const char *name)
 	// command already exists
 	for (cmd = com_commands; cmd; cmd = cmd->next)
 	{
-		if (fasticmp(name, cmd->name)) //case insensitive now that we have lower and uppercase!
+		if (!stricmp(name, cmd->name)) //case insensitive now that we have lower and uppercase!
 		{
 			// replace the built in command.
 			cmd->function = COM_Lua_f;
@@ -519,7 +519,7 @@ static boolean COM_Exists(const char *com_name)
 	xcommand_t *cmd;
 
 	for (cmd = com_commands; cmd; cmd = cmd->next)
-		if (fasticmp(com_name, cmd->name))
+		if (!stricmp(com_name, cmd->name))
 			return true;
 
 	return false;
@@ -571,7 +571,7 @@ static void COM_ExecuteString(char *ptext)
 	// check functions
 	for (cmd = com_commands; cmd; cmd = cmd->next)
 	{
-		if (fasticmp(com_argv[0], cmd->name)) //case insensitive now that we have lower and uppercase!
+		if (!stricmp(com_argv[0], cmd->name)) //case insensitive now that we have lower and uppercase!
 		{
 			cmd->function();
 			return;
@@ -581,7 +581,7 @@ static void COM_ExecuteString(char *ptext)
 	// check aliases
 	for (a = com_alias; a; a = a->next)
 	{
-		if (fasticmp(com_argv[0], a->name))
+		if (!stricmp(com_argv[0], a->name))
 		{
 			if (recursion > MAX_ALIAS_RECURSION)
 				CONS_Alert(CONS_WARNING, M_GetText("Alias recursion cycle detected!\n"));
@@ -836,7 +836,7 @@ static void COM_Help_f(void)
 			if (cvar->PossibleValue)
 			{
 				{
-					if (fasticmp(cvar->PossibleValue[0].strvalue, "MIN") && fasticmp(cvar->PossibleValue[1].strvalue, "MAX"))
+					if (!stricmp(cvar->PossibleValue[0].strvalue, "MIN") && !stricmp(cvar->PossibleValue[1].strvalue, "MAX"))
 					{
 						if (floatmode)
 						{
@@ -879,7 +879,7 @@ static void COM_Help_f(void)
 		{
 			for (cmd = com_commands; cmd; cmd = cmd->next)
 			{
-				if (!fastcmp(cmd->name, help))
+				if (strcmp(cmd->name, help))
 					continue;
 
 				CONS_Printf("\x82""Command %s:\n", cmd->name);
@@ -1129,7 +1129,7 @@ void *VS_GetSpace(vsbuf_t *buf, size_t length)
   */
 void VS_Write(vsbuf_t *buf, const void *data, size_t length)
 {
-	memcpy(VS_GetSpace(buf, length), data, length);
+	M_Memcpy(VS_GetSpace(buf, length), data, length);
 }
 
 /** Prints text in a variable buffer. Like VS_Write() plus a
@@ -1146,9 +1146,9 @@ void VS_Print(vsbuf_t *buf, const char *data)
 	len = strlen(data) + 1;
 
 	if (buf->data[buf->cursize-1])
-		memcpy((UINT8 *)VS_GetSpace(buf, len), data, len); // no trailing 0
+		M_Memcpy((UINT8 *)VS_GetSpace(buf, len), data, len); // no trailing 0
 	else
-		memcpy((UINT8 *)VS_GetSpace(buf, len-1) - 1, data, len); // write over trailing 0
+		M_Memcpy((UINT8 *)VS_GetSpace(buf, len-1) - 1, data, len); // write over trailing 0
 }
 
 // =========================================================================
@@ -1176,7 +1176,7 @@ consvar_t *CV_FindVar(const char *name)
 	consvar_t *cvar;
 
 	for (cvar = consvar_vars; cvar; cvar = cvar->next)
-		if (fasticmp(name,cvar->name))
+		if (!stricmp(name,cvar->name))
 			return cvar;
 
 	return NULL;
@@ -1366,7 +1366,7 @@ static void Setvalue(consvar_t *var, const char *valstr, boolean stealth)
 				v = INT32_MIN; // Invalid integer trigger
 		}
 
-		if (var->PossibleValue[0].strvalue && fasticmp(var->PossibleValue[0].strvalue, "MIN")) // bounded cvar
+		if (var->PossibleValue[0].strvalue && !stricmp(var->PossibleValue[0].strvalue, "MIN")) // bounded cvar
 		{
 #define MINVAL 0
 #define MAXVAL 1
@@ -1379,21 +1379,21 @@ static void Setvalue(consvar_t *var, const char *valstr, boolean stealth)
 
 			// search for other
 			for (i = MAXVAL+1; var->PossibleValue[i].strvalue; i++)
-				if (v == var->PossibleValue[i].value || fasticmp(var->PossibleValue[i].strvalue, valstr))
+				if (v == var->PossibleValue[i].value || !stricmp(var->PossibleValue[i].strvalue, valstr))
 				{
 					var->value = var->PossibleValue[i].value;
 					var->string = var->PossibleValue[i].strvalue;
 					goto finish;
 				}
 
-			if ((v != INT32_MIN && v < var->PossibleValue[MINVAL].value) || fasticmp(valstr, "MIN"))
+			if ((v != INT32_MIN && v < var->PossibleValue[MINVAL].value) || !stricmp(valstr, "MIN"))
 			{
 				v = var->PossibleValue[MINVAL].value;
 				valstr = var->PossibleValue[MINVAL].strvalue;
 				override = true;
 				overrideval = v;
 			}
-			else if ((v != INT32_MIN && v > var->PossibleValue[MAXVAL].value) || fasticmp(valstr, "MAX"))
+			else if ((v != INT32_MIN && v > var->PossibleValue[MAXVAL].value) || !stricmp(valstr, "MAX"))
 			{
 				v = var->PossibleValue[MAXVAL].value;
 				valstr = var->PossibleValue[MAXVAL].strvalue;
@@ -1411,7 +1411,7 @@ static void Setvalue(consvar_t *var, const char *valstr, boolean stealth)
 
 			// check first strings
 			for (i = 0; var->PossibleValue[i].strvalue; i++)
-				if (fasticmp(var->PossibleValue[i].strvalue, valstr))
+				if (!stricmp(var->PossibleValue[i].strvalue, valstr))
 					goto found;
 			if (v != INT32_MIN)
 			{
@@ -1424,9 +1424,9 @@ static void Setvalue(consvar_t *var, const char *valstr, boolean stealth)
 			if (var->PossibleValue == CV_OnOff || var->PossibleValue == CV_YesNo)
 			{
 				overrideval = -1;
-				if (fasticmp(valstr, "on") || fasticmp(valstr, "yes"))
+				if (!stricmp(valstr, "on") || !stricmp(valstr, "yes"))
 					overrideval = 1;
-				else if (fasticmp(valstr, "off") || fasticmp(valstr, "no"))
+				else if (!stricmp(valstr, "off") || !stricmp(valstr, "no"))
 					overrideval = 0;
 
 				if (overrideval != -1)
@@ -1474,7 +1474,7 @@ finish:
 	var->flags |= CV_MODIFIED;
 
 	// raise 'on change' code
-	LUA_CVarChanged(var); // let consolelib know what cvar this is.
+	LUA_CVarChanged(var->name); // let consolelib know what cvar this is.
 
 	if (var->flags & CV_CALL && !stealth)
 		var->func();
@@ -1500,11 +1500,11 @@ badinput:
 
 static boolean serverloading = false;
 
-static void Got_NetVar(const UINT8 **p, INT32 playernum)
+static void Got_NetVar(UINT8 **p, INT32 playernum)
 {
 	consvar_t *cvar;
 	UINT16 netid;
-	const char *svalue;
+	char *svalue;
 	UINT8 stealth = false;
 
 	if (playernum != serverplayer && !IsPlayerAdmin(playernum) && !serverloading)
@@ -1518,10 +1518,9 @@ static void Got_NetVar(const UINT8 **p, INT32 playernum)
 		}
 		return;
 	}
-
 	netid = READUINT16(*p);
 	cvar = CV_FindNetVar(netid);
-	svalue = (const char *)*p;
+	svalue = (char *)*p;
 	SKIPSTRING(*p);
 	stealth = READUINT8(*p);
 
@@ -1577,9 +1576,8 @@ void CV_SaveNetVars(UINT8 **p, boolean isdemorecording)
 	WRITEUINT16(count_p, count);
 }
 
-size_t CV_LoadNetVars(const UINT8 *bufstart)
+void CV_LoadNetVars(UINT8 **p)
 {
-	const UINT8 *p = bufstart;
 	consvar_t *cvar;
 	UINT16 count;
 
@@ -1590,13 +1588,11 @@ size_t CV_LoadNetVars(const UINT8 *bufstart)
 		if (cvar->flags & CV_NETVAR)
 			Setvalue(cvar, cvar->defaultvalue, true);
 
-	count = READUINT16(p);
+	count = READUINT16(*p);
 	while (count--)
-		Got_NetVar(&p, 0);
+		Got_NetVar(p, 0);
 
 	serverloading = false;
-
-	return p - bufstart;
 }
 
 static void CV_SetCVar(consvar_t *var, const char *value, boolean stealth);
@@ -1614,7 +1610,7 @@ void CV_ResetCheatNetVars(void)
 // Returns true if the variable's current value is its default value
 boolean CV_IsSetToDefault(consvar_t *v)
 {
-	return (fastcmp(v->defaultvalue, v->string));
+	return (!(strcmp(v->defaultvalue, v->string)));
 }
 
 // If any cheats CVars are not at their default settings, return true.
@@ -1626,7 +1622,7 @@ UINT8 CV_CheatsEnabled(void)
 	consvar_t *cvar;
 
 	for (cvar = consvar_vars; cvar; cvar = cvar->next)
-		if ((cvar->flags & CV_CHEAT) && !fastcmp(cvar->defaultvalue, cvar->string))
+		if ((cvar->flags & CV_CHEAT) && strcmp(cvar->defaultvalue, cvar->string))
 			return 1;
 	return 0;
 }
@@ -1647,7 +1643,7 @@ static void CV_SetCVar(consvar_t *var, const char *value, boolean stealth)
 	if (!var->string)
 		I_Error("CV_Set: %s no string set!\n", var->name);
 #endif
-	if (!var || !var->string || !value || fasticmp(var->string, value))
+	if (!var || !var->string || !value || !stricmp(var->string, value))
 		return; // no changes
 
 	if (var->flags & CV_NETVAR)
@@ -1669,7 +1665,7 @@ static void CV_SetCVar(consvar_t *var, const char *value, boolean stealth)
 
 		if (var == &cv_kartspeed && !M_SecretUnlocked(SECRET_HARDSPEED))
 		{
-			if (fasticmp(value, "Hard") || atoi(value) == 2)
+			if (!stricmp(value, "Hard") || atoi(value) == 2)
 			{
 				CONS_Alert(CONS_NOTICE, "You haven't unlocked this yet!\n");
 				return;
@@ -1803,7 +1799,7 @@ void CV_AddValue(consvar_t *var, INT32 increment)
 		}
 #define MINVAL 0
 #define MAXVAL 1
-		else if (var->PossibleValue[MINVAL].strvalue && fastcmp(var->PossibleValue[MINVAL].strvalue, "MIN"))
+		else if (var->PossibleValue[MINVAL].strvalue && !strcmp(var->PossibleValue[MINVAL].strvalue, "MIN"))
 		{ // SRB2Kart
 #ifdef PARANOIA
 			if (!var->PossibleValue[MAXVAL].strvalue)
@@ -1975,12 +1971,12 @@ static boolean CV_FilterJoyAxisVars(consvar_t *v, const char *valstr)
 	{
 		if (joyaxis_default[i])
 		{
-			if (fasticmp(v->name, "joyaxis_fire"))
+			if (!stricmp(v->name, "joyaxis_fire"))
 			{
 				if (joyaxis_count[i] > 7) return false;
 				else if (joyaxis_count[i] == 7) return true;
 
-				if (fasticmp(valstr, "None")) joyaxis_count[i]++;
+				if (!stricmp(valstr, "None")) joyaxis_count[i]++;
 				else joyaxis_default[i] = false;
 			}
 			// reset all axis settings to defaults
@@ -2012,37 +2008,37 @@ static boolean CV_FilterJoyAxisVars(consvar_t *v, const char *valstr)
 // Block the Xbox DInput default axes and reset to the current defaults
 static boolean CV_FilterJoyAxisVars2(consvar_t *v, const char *valstr)
 {
-	if (fasticmp(v->name, "joyaxis_turn") && fasticmp(valstr, "X-Axis"))
+	if (!stricmp(v->name, "joyaxis_turn") && !stricmp(valstr, "X-Axis"))
 		return false;
-	if (fasticmp(v->name, "joyaxis2_turn") && fasticmp(valstr, "X-Axis"))
+	if (!stricmp(v->name, "joyaxis2_turn") && !stricmp(valstr, "X-Axis"))
 		return false;
-	if (fasticmp(v->name, "joyaxis3_turn") && fasticmp(valstr, "X-Axis"))
+	if (!stricmp(v->name, "joyaxis3_turn") && !stricmp(valstr, "X-Axis"))
 		return false;
-	if (fasticmp(v->name, "joyaxis4_turn") && fasticmp(valstr, "X-Axis"))
+	if (!stricmp(v->name, "joyaxis4_turn") && !stricmp(valstr, "X-Axis"))
 		return false;
-	if (fasticmp(v->name, "joyaxis_aim") && fasticmp(valstr, "Y-Axis"))
+	if (!stricmp(v->name, "joyaxis_aim") && !stricmp(valstr, "Y-Axis"))
 		return false;
-	if (fasticmp(v->name, "joyaxis2_aim") && fasticmp(valstr, "Y-Axis"))
+	if (!stricmp(v->name, "joyaxis2_aim") && !stricmp(valstr, "Y-Axis"))
 		return false;
-	if (fasticmp(v->name, "joyaxis3_aim") && fasticmp(valstr, "Y-Axis"))
+	if (!stricmp(v->name, "joyaxis3_aim") && !stricmp(valstr, "Y-Axis"))
 		return false;
-	if (fasticmp(v->name, "joyaxis4_aim") && fasticmp(valstr, "Y-Axis"))
+	if (!stricmp(v->name, "joyaxis4_aim") && !stricmp(valstr, "Y-Axis"))
 		return false;
-	if (fasticmp(v->name, "joyaxis_fire") && fasticmp(valstr, "None"))
+	if (!stricmp(v->name, "joyaxis_fire") && !stricmp(valstr, "None"))
 		return false;
-	if (fasticmp(v->name, "joyaxis2_fire") && fasticmp(valstr, "None"))
+	if (!stricmp(v->name, "joyaxis2_fire") && !stricmp(valstr, "None"))
 		return false;
-	if (fasticmp(v->name, "joyaxis3_fire") && fasticmp(valstr, "None"))
+	if (!stricmp(v->name, "joyaxis3_fire") && !stricmp(valstr, "None"))
 		return false;
-	if (fasticmp(v->name, "joyaxis4_fire") && fasticmp(valstr, "None"))
+	if (!stricmp(v->name, "joyaxis4_fire") && !stricmp(valstr, "None"))
 		return false;
-	if (fasticmp(v->name, "joyaxis_drift") && fasticmp(valstr, "None"))
+	if (!stricmp(v->name, "joyaxis_drift") && !stricmp(valstr, "None"))
 		return false;
-	if (fasticmp(v->name, "joyaxis2_drift") && fasticmp(valstr, "None"))
+	if (!stricmp(v->name, "joyaxis2_drift") && !stricmp(valstr, "None"))
 		return false;
-	if (fasticmp(v->name, "joyaxis3_drift") && fasticmp(valstr, "None"))
+	if (!stricmp(v->name, "joyaxis3_drift") && !stricmp(valstr, "None"))
 		return false;
-	if (fasticmp(v->name, "joyaxis4_drift") && fasticmp(valstr, "None"))
+	if (!stricmp(v->name, "joyaxis4_drift") && !stricmp(valstr, "None"))
 		return false;
 
 	return true;
@@ -2059,8 +2055,8 @@ static boolean CV_FilterVarByVersion(consvar_t *v, const char *valstr)
 
 	if (GETMAJOREXECVERSION(cv_execversion.value) < 8) // 8 = 1.4
 	{
-		if (fasticmp(v->name, "masterserver") // Replaces a hack in MasterServer_OnChange for the original SRB2 MS.
-			|| fasticmp(v->name, "gamma")) // Too easy to accidentially change in prior versions.
+		if (!stricmp(v->name, "masterserver") // Replaces a hack in MasterServer_OnChange for the original SRB2 MS.
+			|| !stricmp(v->name, "gamma")) // Too easy to accidentially change in prior versions.
 			return false;
 	}
 
@@ -2143,7 +2139,7 @@ void CV_SaveVariables(FILE *f)
 			char stringtowrite[MAXTEXTCMD+1];
 
 			// Silly hack for Min/Max vars
-			if (fastcmp(cvar->string, "MAX") || fastcmp(cvar->string, "MIN"))
+			if (!strcmp(cvar->string, "MAX") || !strcmp(cvar->string, "MIN"))
 			{
 				if (cvar->flags & CV_FLOAT)
 					sprintf(stringtowrite, "%f", FixedToFloat(cvar->value));

src/command.h

@@ -182,7 +182,7 @@ void CV_SaveVariables(FILE *f);
 
 // load/save gamesate (load and save option and for network join in game)
 void CV_SaveNetVars(UINT8 **p, boolean isdemorecording);
-size_t CV_LoadNetVars(const UINT8 *p);
+void CV_LoadNetVars(UINT8 **p);
 
 // reset cheat netvars after cheats is deactivated
 void CV_ResetCheatNetVars(void);

src/console.c

@@ -521,7 +521,7 @@ static void CON_RecalcSize(void)
 	oldcon_width = con_width;
 	oldnumlines = con_totallines;
 	oldcon_cy = con_cy;
-	memcpy(tmp_buffer, con_buffer, CON_BUFFERSIZE);
+	M_Memcpy(tmp_buffer, con_buffer, CON_BUFFERSIZE);
 
 	if (conw < 1)
 		con_width = (BASEVIDWIDTH>>3) - 2;
@@ -547,7 +547,7 @@ static void CON_RecalcSize(void)
 		{
 			if (tmp_buffer[(i%oldnumlines)*oldcon_width])
 			{
-				memcpy(string, &tmp_buffer[(i%oldnumlines)*oldcon_width], oldcon_width);
+				M_Memcpy(string, &tmp_buffer[(i%oldnumlines)*oldcon_width], oldcon_width);
 				conw = oldcon_width - 1;
 				while (string[conw] == ' ' && conw)
 					conw--;
@@ -1010,7 +1010,7 @@ boolean CON_Responder(event_t *ev)
 		Lock_state();
 
 		// Only add command to history if it differs from previous one
-		if (!fastcmp(input.buffer, inputlines[(inputline-1) & 31]))
+		if (strcmp(input.buffer, inputlines[(inputline-1) & 31]))
 		{
 			inputline = (inputline+1) & 31;
 			M_TextInputInit(&input, inputlines[inputline], CON_MAXPROMPTCHARS);

src/cxxutil.hpp

@@ -147,51 +147,6 @@ public:
 template <class T>
 NotNull(T) -> NotNull<T>;
 
-// does a super safe cast from floating point to interger types
-// this prob could be better since i suck at ceepeepee
-// but atleast we can just template shit to our desired types
-template <typename FloatT, typename IntT>
-static inline IntT floattoint(FloatT val)
-{
-	// :chaosleep:
-	static_assert(std::is_floating_point_v<FloatT>, "Input must be a floating-point type");
-	static_assert(std::is_integral_v<IntT>, "Output must be a integer type");
-
-	if (std::fpclassify(val) == FP_NAN)
-		return 0; // if stuffs not a number we sure screwed up lmao
-
-	// treat inifinity as "int min/max"
-	if (std::fpclassify(val) == FP_INFINITE)
-	{
-		// yes infinity can be signed kek
-		if (std::signbit(val))
-			return std::numeric_limits<IntT>::min(); // negative infinity, so return min
-		else
-			return std::numeric_limits<IntT>::max();
-	}
-
-	// make sure we fit into our targettype uwu
-	if (val > static_cast<FloatT>(std::numeric_limits<IntT>::max()))
-		return std::numeric_limits<IntT>::max();
-	else if (val < static_cast<FloatT>(std::numeric_limits<IntT>::min()))
-		return std::numeric_limits<IntT>::min();
-
-	return static_cast<IntT>(val);
-}
-
-// safe float to fixed
-// which handles nan and inf
-// pretty much the same stuff as the above, but uh, idk how id use the above with this
-template <typename FloatT> // can use both float and doubles yay
-static inline int32_t floattofixed(FloatT val)
-{
-	// :chaosleep:
-	static_assert(std::is_floating_point_v<FloatT>, "Input must be a floating-point type");
-
-	// fixed_t is just an int32_t, i dont wanna include doomtype here if it can be avoided
-	return floattoint<FloatT, int32_t>(val * 65535.);
-}
-
 } // namespace srb2
 
 #endif // __SRB2_CXXUTIL_HPP__

src/d_clisrv.c

@@ -78,14 +78,14 @@
 #define MAX_REASONLENGTH 30
 #define FORCECLOSE 0x8000
 
-static long long unsigned packetstat[NUMPACKETTYPE+1] = {};
+static long long unsigned packetstat[NUMPACKETTYPE+1] = {0};
 
 boolean server = true; // true or false but !server == client
 #define client (!server)
 boolean nodownload = false;
 boolean serverrunning = false;
 INT32 serverplayer = 0;
-char motd[254] = {}, server_context[8] = {}; // Message of the Day, Unique Context (even without Mumble support)
+char motd[254], server_context[8]; // Message of the Day, Unique Context (even without Mumble support)
 
 #define MAP_ICON_REQUEST_FREQUENCY 8
 
@@ -98,13 +98,14 @@ static int map_icon_request_count; // current count of icon requests sent
 static UINT8 *map_icon_data;
 static patch_t *map_icon;
 
-plrinfo playerinfo[MAXPLAYERS] = {};
+plrinfo playerinfo[MAXPLAYERS];
 SINT8 joinnode = 0; // used for CL_VIEWSERVER
 
-boolean player_muted[MAXPLAYERS] = {};
+boolean player_muted[MAXPLAYERS] = {0};
 
 // Server specific vars
-UINT8 playernode[MAXPLAYERS] = {};
+UINT8 playernode[MAXPLAYERS];
+
 
 // Minimum timeout for sending the savegame
 // The actual timeout will be longer depending on the savegame length
@@ -117,15 +118,15 @@ static tic_t savegameresendcooldown[MAXNETNODES]; // How long before we can rese
 static tic_t freezetimeout[MAXNETNODES]; // Until when can this node freeze the server before getting a timeout?
 
 UINT16 pingmeasurecount = 1;
-UINT32 realpingtable[MAXPLAYERS] = {}; //the base table of ping where an average will be sent to everyone.
-UINT32 playerpingtable[MAXPLAYERS] = {}; //table of player latency values.
+UINT32 realpingtable[MAXPLAYERS]; //the base table of ping where an average will be sent to everyone.
+UINT32 playerpingtable[MAXPLAYERS]; //table of player latency values.
 
 #define GENTLEMANSMOOTHING (TICRATE)
 static tic_t reference_lag;
 static UINT8 spike_time;
-tic_t lowest_lag = 0;
-tic_t simulated_lag = 0;
-boolean server_lagless = true;
+tic_t lowest_lag;
+tic_t simulated_lag;
+boolean server_lagless;
 
 static void Lagless_OnChange(void)
 {
@@ -143,12 +144,12 @@ 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...
 
-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)
-SINT8 nodetoplayer4[MAXNETNODES] = {}; // say the numplayer for this node if any (splitscreen == 3)
-UINT8 playerpernode[MAXNETNODES] = {}; // used specialy for splitscreen
-boolean nodeingame[MAXNETNODES]  = {}; // set false as nodes leave game
+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)
+SINT8 nodetoplayer4[MAXNETNODES]; // say the numplayer for this node if any (splitscreen == 3)
+UINT8 playerpernode[MAXNETNODES]; // used specialy for splitscreen
+boolean nodeingame[MAXNETNODES]; // set false as nodes leave game
 
 tic_t servermaxping = 20; // server's max delay, in frames. Defaults to 20
 static tic_t nettics[MAXNETNODES]; // what tic the client have received
@@ -195,7 +196,7 @@ boolean is_client_saturn[MAXNETNODES];
 static UINT8 localtextcmd[MAXSPLITSCREENPLAYERS][MAXTEXTCMD];
 static tic_t neededtic;
 SINT8 servernode = 0; // the number of the server node
-char connectedservername[MAXSERVERNAME+1] = {};
+char connectedservername[MAXSERVERNAME+1];
 /// \brief do we accept new players?
 /// \todo WORK!
 boolean acceptnewnode = true;
@@ -226,7 +227,7 @@ struct textcmdbuf_s
 static textcmdbuf_t *textcmdbuf[MAXSPLITSCREENPLAYERS] = {NULL};
 
 static ticcmd_t playercmds[MAXPLAYERS];
-ticcmd_t netcmds[BACKUPTICS][MAXPLAYERS] = {};
+ticcmd_t netcmds[BACKUPTICS][MAXPLAYERS];
 static textcmdtic_t *textcmds[TEXTCMD_HASH_SIZE] = {NULL};
 
 consvar_t cv_showjoinaddress = {"showjoinaddress", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
@@ -284,7 +285,7 @@ static inline void *G_ScpyTiccmd(ticcmd_t* dest, void* src, const size_t n)
 // Some software don't support largest packet
 // (original sersetup, not exactely, but the probability of sending a packet
 // of 512 bytes is like 0.1)
-UINT16 software_MAXPACKETLENGTH = 0;
+UINT16 software_MAXPACKETLENGTH;
 
 /** Guesses the value of a tic from its lowest byte and from maketic
   *
@@ -311,9 +312,9 @@ static inline tic_t ExpandTics(INT32 low, tic_t basetic)
 // Some extra data function for handle textcmd buffer
 // -----------------------------------------------------------------
 
-static void (*listnetxcmd[MAXNETXCMD])(const UINT8 **p, INT32 playernum);
+static void (*listnetxcmd[MAXNETXCMD])(UINT8 **p, INT32 playernum);
 
-void RegisterNetXCmd(netxcmd_t id, void (*cmd_f)(const UINT8 **p, INT32 playernum))
+void RegisterNetXCmd(netxcmd_t id, void (*cmd_f)(UINT8 **p, INT32 playernum))
 {
 #ifdef PARANOIA
 	if (id >= MAXNETXCMD)
@@ -330,7 +331,7 @@ static void WriteNetXCmd(UINT8 *cmd, netxcmd_t id, const void *param, size_t npa
 	cmd[cmd[0]] = (UINT8)id;
 	if (param && nparam)
 	{
-		memcpy(&cmd[cmd[0]+1], param, nparam);
+		M_Memcpy(&cmd[cmd[0]+1], param, nparam);
 		cmd[0] = (UINT8)(cmd[0] + (UINT8)nparam);
 	}
 }
@@ -459,12 +460,12 @@ static void ExtraDataTicker(void)
 	{
 		if (playeringame[i] || i == 0)
 		{
-			const UINT8 *bufferstart = D_GetExistingTextcmd(gametic, i);
+			UINT8 *bufferstart = D_GetExistingTextcmd(gametic, i);
 
 			if (bufferstart)
 			{
-				const UINT8 *curpos = bufferstart;
-				const UINT8 *bufferend = &curpos[curpos[0]+1];
+				UINT8 *curpos = bufferstart;
+				UINT8 *bufferend = &curpos[curpos[0]+1];
 
 				curpos++;
 				while (curpos < bufferend)
@@ -1584,7 +1585,7 @@ static void SV_SendServerInfo(INT32 node, tic_t servertime)
 		MAXSERVERNAME);
 	strncpy(netbuffer->u.serverinfo.mapname, G_BuildMapName(gamemap), sizeof(netbuffer->u.serverinfo.mapname)-1);
 
-	memcpy(netbuffer->u.serverinfo.mapmd5, mapmd5, sizeof(netbuffer->u.serverinfo.mapmd5));
+	M_Memcpy(netbuffer->u.serverinfo.mapmd5, mapmd5, sizeof(netbuffer->u.serverinfo.mapmd5));
 
 	netbuffer->u.serverinfo.iszone = 0;
 
@@ -1655,7 +1656,12 @@ static void SV_SendPlayerInfo(INT32 node)
 
 		netbuffer->u.playerinfo[i].node = i;
 
-		strlcpy(netbuffer->u.playerinfo[i].name, (const char *)&player_names[i], MAXPLAYERNAME+1);
+		// Can't really change this because net compatibility, but the warning is annoying
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wstringop-truncation"
+		strncpy(netbuffer->u.playerinfo[i].name, (const char *)&player_names[i], MAXPLAYERNAME+1);
+#pragma GCC diagnostic pop
+		netbuffer->u.playerinfo[i].name[MAXPLAYERNAME] = '\0';
 
 		//fetch IP address
 		//No, don't do that, you fuckface.
@@ -2173,7 +2179,7 @@ static void SL_InsertServer(serverinfo_pak* info, SINT8 node)
 		if (info->subversion != SUBVERSION)
 			return; // Close, but no cigar.
 
-		if (!fastcmp(info->application, SRB2APPLICATION))
+		if (strcmp(info->application, SRB2APPLICATION))
 			return;/* that's a different mod */
 
 		i = serverlistcount++;
@@ -2218,7 +2224,7 @@ void CL_QueryServerList (msg_server_t *server_list)
 		// thwart nefarious servers who lie to the MS.
 
 		/* lol bruh, that version COMES from the servers */
-		//if (fastcmp(version, server_list[i].version))
+		//if (strcmp(version, server_list[i].version) == 0)
 		{
 			INT32 node = I_NetMakeNodewPort(server_list[i].ip, server_list[i].port);
 			if (node == -1)
@@ -3214,7 +3220,7 @@ static void Command_connect(void)
 
 	server = false;
 
-	if (fasticmp(COM_Argv(1), "self"))
+	if (!stricmp(COM_Argv(1), "self"))
 	{
 		servernode = 0;
 		server = true;
@@ -3224,7 +3230,7 @@ static void Command_connect(void)
 	else
 	{
 		// used in menu to connect to a server in the list
-		if (netgame && fasticmp(COM_Argv(1), "node"))
+		if (netgame && !stricmp(COM_Argv(1), "node"))
 		{
 			servernode = (SINT8)atoi(COM_Argv(2));
 		}
@@ -3239,7 +3245,7 @@ static void Command_connect(void)
 			netgame = true;
 			multiplayer = true;
 
-			if (fasticmp(COM_Argv(1), "any"))
+			if (!stricmp(COM_Argv(1), "any"))
 				servernode = BROADCASTADDR;
 			else if (I_NetMakeNodewPort && COM_Argc() >= 3)
 				servernode = I_NetMakeNodewPort(COM_Argv(1), COM_Argv(2));
@@ -3263,7 +3269,6 @@ static void Command_connect(void)
 		splitscreen = cv_splitplayers.value-1;
 		SplitScreen_OnChange();
 	}
-
 	botingame = false;
 	botskin = 0;
 	CL_ConnectToServer();
@@ -3756,7 +3761,7 @@ static void Command_Kick(void)
 		CONS_Printf(M_GetText("Only the server or a remote admin can use this.\n"));
 }
 
-static void Got_KickCmd(const UINT8 **p, INT32 playernum)
+static void Got_KickCmd(UINT8 **p, INT32 playernum)
 {
 	INT32 pnum, msg;
 	char buf[3 + MAX_REASONLENGTH];
@@ -4146,8 +4151,8 @@ consvar_t cv_connectawaittime = {"connectawaittime", "5", CV_SAVE, connectawaitt
 
 consvar_t cv_serverinfoscreen = {"serverinfoscreen", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 
-static void Got_AddPlayer(const UINT8 **p, INT32 playernum);
-static void Got_RemovePlayer(const UINT8 **p, INT32 playernum);
+static void Got_AddPlayer(UINT8 **p, INT32 playernum);
+static void Got_RemovePlayer(UINT8 **p, INT32 playernum);
 
 static void Joinable_OnChange(void)
 {
@@ -4399,7 +4404,7 @@ static inline void SV_AddNode(INT32 node)
 }
 
 // Xcmd XD_ADDPLAYER
-static void Got_AddPlayer(const UINT8 **p, INT32 playernum)
+static void Got_AddPlayer(UINT8 **p, INT32 playernum)
 {
 	INT16 node, newplayernum;
 	UINT8 splitscreenplayer = 0;
@@ -4486,7 +4491,7 @@ static void Got_AddPlayer(const UINT8 **p, INT32 playernum)
 }
 
 // Xcmd XD_REMOVEPLAYER
-static void Got_RemovePlayer(const UINT8 **p, INT32 playernum)
+static void Got_RemovePlayer(UINT8 **p, INT32 playernum)
 {
 	SINT8 pnum, reason;
 
@@ -4647,26 +4652,13 @@ void SV_StopServer(void)
 
 	if (gamestate == GS_INTERMISSION)
 		Y_EndIntermission();
-	else if (gamestate == GS_VOTING)
+	if (gamestate == GS_VOTING)
 		Y_EndVote();
-
-	G_SetGamestate(GS_NULL);
-	wipegamestate = GS_NULL;
+	gamestate = wipegamestate = GS_NULL;
 
 	for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
-	{
 		localtextcmd[i][0] = 0;
 
-		while (textcmdbuf[i] != NULL)
-		{
-			textcmdbuf_t *buf = textcmdbuf[i];
-			textcmdbuf[i] = textcmdbuf[i]->next;
-			Z_Free(buf);
-		}
-
-		textcmdbuf[i] = NULL;
-	}
-
 	for (i = firstticstosend; i < firstticstosend + BACKUPTICS; i++)
 		D_Clearticcmd(i);
 
@@ -5228,7 +5220,7 @@ static void PT_ServerCFG(SINT8 node)
 
 	scp = netbuffer->u.servercfg.varlengthinputs;
 	CV_LoadPlayerNames(&scp);
-	scp += CV_LoadNetVars(scp);
+	CV_LoadNetVars(&scp);
 
 	/// \note Wait. What if a Lua script uses some global custom variables synched with the NetVars hook?
 	///       Shouldn't them be downloaded even at intermission time?
@@ -5688,7 +5680,7 @@ static void PT_TextCmd(INT32 netconsole, SINT8 node)
 		DEBFILE(va("textcmd put in tic %u at position %d (player %d) ftts %u mk %u\n",
 				   tic, textcmd[0]+1, netconsole, firstticstosend, maketic));
 
-		memcpy(&textcmd[textcmd[0]+1], netbuffer->u.textcmd+1, netbuffer->u.textcmd[0]);
+		M_Memcpy(&textcmd[textcmd[0]+1], netbuffer->u.textcmd+1, netbuffer->u.textcmd[0]);
 		textcmd[0] += (UINT8)netbuffer->u.textcmd[0];
 	}
 }
@@ -5795,7 +5787,7 @@ static void PT_ServerTics(SINT8 node)
 				}
 
 				if (i >= gametic) // Don't copy old net commands
-					memcpy(D_GetTextcmd(i, playernum), txtpak, txtsize);
+					M_Memcpy(D_GetTextcmd(i, playernum), txtpak, txtsize);
 				txtpak += txtsize;
 			}
 		}
@@ -6333,7 +6325,7 @@ static void CL_SendClientCmd(void)
 						break;
 				}
 
-				memcpy(netbuffer->u.textcmd, localtextcmd[i], localtextcmd[i][0]+1);
+				M_Memcpy(netbuffer->u.textcmd, localtextcmd[i], localtextcmd[i][0]+1);
 
 				// All extra data have been sent
 				if (HSendPacket(servernode, true, 0, localtextcmd[i][0]+1)) // Send can fail...
@@ -6343,7 +6335,7 @@ static void CL_SendClientCmd(void)
 					if (textcmdbuf[i] != NULL)
 					{
 						textcmdbuf_t *buf = textcmdbuf[i];
-						memcpy(localtextcmd[i], textcmdbuf[i]->cmd, textcmdbuf[i]->cmd[0]+1);
+						M_Memcpy(localtextcmd[i], textcmdbuf[i]->cmd, textcmdbuf[i]->cmd[0]+1);
 						textcmdbuf[i] = textcmdbuf[i]->next;
 						Z_Free(buf);
 					}
@@ -6456,7 +6448,7 @@ static void SV_SendTics(void)
 				{
 					(*ntextcmd)++;
 					WRITEUINT8(bufpos, j);
-					memcpy(bufpos, textcmd, size + 1);
+					M_Memcpy(bufpos, textcmd, size + 1);
 					bufpos += size + 1;
 				}
 			}

src/d_clisrv.h

@@ -604,7 +604,7 @@ extern consvar_t cv_serverinfoscreen;
 void D_ClientServerInit(void);
 
 // Initialise the other field
-void RegisterNetXCmd(netxcmd_t id, void (*cmd_f)(const UINT8 **p, INT32 playernum));
+void RegisterNetXCmd(netxcmd_t id, void (*cmd_f)(UINT8 **p, INT32 playernum));
 void SendNetXCmdForPlayer(UINT8 playerid, netxcmd_t id, const void *param, size_t nparam);
 #define SendNetXCmd(id, param, nparam) SendNetXCmdForPlayer(0, id, param, nparam) // Shortcut for P1
 void SendKick(UINT8 playernum, UINT8 msg);

src/d_main.c

@@ -97,15 +97,15 @@
 UINT8 window_notinfocus = false;
 
 static char *startupiwadfiles[MAX_WADFILES];
-static size_t startupiwadcount = 0;
 static char *startuppwads[MAX_WADFILES];
-static size_t startuppwadcount = 0;
 
 // autoloading
 static char *autoloadwadfiles[MAX_WADFILES];
 static char *autoloadwadfilespost[MAX_WADFILES];
-static size_t autoloadcount = 0;
-static size_t postloadcount = 0;
+boolean autoloading;
+boolean autoloaded;
+boolean postautoloaded = false;
+boolean wasautoloaded = false;
 //
 
 boolean devparm = false; // started game with -devparm
@@ -113,9 +113,7 @@ boolean devparm = false; // started game with -devparm
 boolean singletics = false; // timedemo
 boolean lastdraw = false;
 
-#ifdef MOTIONBLUR
 INT32 postimgparam[MAXSPLITSCREENPLAYERS];
-#endif
 
 // These variables are only true if
 // whether the respective sound system is disabled
@@ -142,8 +140,8 @@ static char addonsdir[MAX_WADPATH];
 // Events can be discarded if no responder claims them
 // referenced from i_system.c for I_GetKey()
 
-event_t events[MAXEVENTS] = {};
-INT32 eventhead = 0, eventtail = 0;
+event_t events[MAXEVENTS];
+INT32 eventhead, eventtail;
 
 boolean dedicated = false;
 
@@ -161,17 +159,68 @@ void D_PostEvent(const event_t *ev)
 
 // modifier keys
 // Now handled in I_OsPolling
-UINT8 shiftdown = 0;   // 0x1 left, 0x2 right
-UINT8 ctrldown = 0;   // 0x1 left, 0x2 right
-UINT8 altdown = 0;    // 0x1 left, 0x2 right
-boolean capslock = 0; // gee i wonder what this does.
+UINT8 shiftdown = 0; // 0x1 left, 0x2 right
+UINT8 ctrldown = 0; // 0x1 left, 0x2 right
+UINT8 altdown = 0; // 0x1 left, 0x2 right
+boolean capslock = 0;	// gee i wonder what this does.
 
-static UINT16 curcolor[MAXSPLITSCREENPLAYERS] = {};
+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] = {0};
 
 static void D_DeviceLEDTick(void)
 {
 	UINT8 i;
-	static UINT16 color[MAXSPLITSCREENPLAYERS] = {};
+	static UINT16 color[MAXSPLITSCREENPLAYERS] = {0};
 
 	if (numcontrollers == 0)
 	{
@@ -339,7 +388,8 @@ static void D_Renderview(void)
 			}
 			else if (rendermode == render_soft)
 #endif
-				R_RenderPlayerView(&players[displayplayers[i]]);
+
+			R_RenderPlayerView(&players[displayplayers[i]]);
 		}
 
 		if (rendermode == render_soft)
@@ -347,11 +397,7 @@ static void D_Renderview(void)
 			if (i == 0)
 				R_ApplyViewMorph();
 
-#ifdef MOTIONBLUR
 			V_DoPostProcessor(i, postimgparam[i]);
-#else
-			V_DoPostProcessor(i, 0);
-#endif
 		}
 	}
 
@@ -668,7 +714,7 @@ static boolean D_Display(void)
 // D_SRB2Loop
 // =========================================================================
 
-tic_t rendergametic = 0;
+tic_t rendergametic;
 
 void D_SRB2Loop(void)
 {
@@ -793,6 +839,11 @@ void D_SRB2Loop(void)
 
 			if (!dedicated)
 			{
+				if (menuactive)
+				{
+					D_GamePadMenuScrollTicker();
+				}
+
 				D_DeviceLEDTick();
 			}
 		}
@@ -910,11 +961,8 @@ void D_ClearState(void)
 {
 	INT32 i;
 
-	demo.title = false;
-
 	// okay, stop now
 	// (otherwise the game still thinks we're playing!)
-	CURLAbortFile();
 	SV_StopServer();
 	SV_ResetServer();
 	serverlistultimatecount = 0;
@@ -923,10 +971,7 @@ void D_ClearState(void)
 		CL_ClearPlayer(i);
 
 	splitscreen = 0;
-
-	// recompute screen size
-	R_ExecuteSetViewSize();
-
+	SplitScreen_OnChange();
 	botingame = false;
 	botskin = 0;
 	cv_debug = 0;
@@ -945,6 +990,7 @@ void D_ClearState(void)
 	gameaction = ga_nothing;
 	memset(displayplayers, 0, sizeof(displayplayers));
 	consoleplayer = 0;
+	//demosequence = -1;
 	gametype = GT_RACE; // SRB2kart
 	paused = false;
 
@@ -967,11 +1013,6 @@ void D_ClearState(void)
 
 	G_SetGamestate(GS_NULL);
 	wipegamestate = GS_NULL;
-
-	M_ClearMenus(true);
-
-	// map palettes affect this
-	D_ResetDeviceLED();
 }
 
 //
@@ -979,18 +1020,25 @@ void D_ClearState(void)
 //
 void D_StartTitle(void)
 {
+	demo.title = false;
 	D_ClearState();
-	multiplayer = netgame = false; // title menu shouldnt be a netgame or multiplayer lmao
+	netgame = false; // title menu shouldnt be a netgame lmao
+	M_ClearMenus(true);
 	F_StartTitleScreen();
+	D_ResetDeviceLED();
 }
 
 //
 // D_AddFile
 //
-static void D_AddFile(const char *file, char **filearray, size_t index)
+static void D_AddFile(const char *file, char **filearray)
 {
+	size_t pnumwadfiles;
 	char *newfile;
 
+	for (pnumwadfiles = 0; filearray[pnumwadfiles]; pnumwadfiles++)
+		;
+
 	newfile = malloc(strlen(file) + 1);
 	if (!newfile)
 	{
@@ -998,17 +1046,16 @@ static void D_AddFile(const char *file, char **filearray, size_t index)
 	}
 	strcpy(newfile, file);
 
-	filearray[index] = newfile;
+	filearray[pnumwadfiles] = newfile;
 }
 
-static void D_CleanFile(char **filearray, size_t count)
+static void D_CleanFile(char **filearray)
 {
-	size_t i;
-
-	for (i = 0; i < count; i++)
+	size_t pnumwadfiles;
+	for (pnumwadfiles = 0; filearray[pnumwadfiles]; pnumwadfiles++)
 	{
-		free(filearray[i]);
-		filearray[i] = NULL;
+		free(filearray[pnumwadfiles]);
+		filearray[pnumwadfiles] = NULL;
 	}
 }
 
@@ -1021,27 +1068,28 @@ static INT32 D_DetectFileType(const char* filename)
 
 	const size_t len = strlen(filename);
 
-	if (fasticmp(&filename[len - 4], ".wad"))
+	if (!stricmp(&filename[len - 4], ".wad"))
 		return 2;
-	else if (fasticmp(&filename[len - 4], ".pk3"))
+	else if (!stricmp(&filename[len - 4], ".pk3"))
 		return 3;
-	else if (fasticmp(&filename[len - 5], ".kart"))
+	else if (!stricmp(&filename[len - 5], ".kart"))
 		return 4;
-	else if (fasticmp(&filename[len - 4], ".lua"))
+	else if (!stricmp(&filename[len - 4], ".lua"))
 		return 5;
-	else if (fasticmp(&filename[len - 4], ".soc"))
+	else if (!stricmp(&filename[len - 4], ".soc"))
 		return 6;
-	else if (fasticmp(&filename[len - 4], ".cfg"))
+	else if (!stricmp(&filename[len - 4], ".cfg"))
 		return 7;
-	else if (fasticmp(&filename[len - 4], ".txt"))
+	else if (!stricmp(&filename[len - 4], ".txt"))
 		return 8;
 
 	return 0;
 }
 
 // autoload that shit
-static void D_AutoloadFile(const char *file, char **filearray, size_t index)
+static void D_AutoloadFile(const char *file, char **filearray)
 {
+	size_t pnumwadfiles;
 	char *newfile;
 	INT32 fileType = D_DetectFileType(file);
 
@@ -1051,6 +1099,9 @@ static void D_AutoloadFile(const char *file, char **filearray, size_t index)
 		return;
 	}
 
+	for (pnumwadfiles = 0; filearray[pnumwadfiles]; pnumwadfiles++)
+		;
+
 	if (fileType <= 6)
 	{
 		newfile = malloc(strlen(file) + 1);
@@ -1058,7 +1109,7 @@ static void D_AutoloadFile(const char *file, char **filearray, size_t index)
 			I_Error("No more free memory to AutoloadFile %s",file);
 
 		strcpy(newfile, file);
-		filearray[index] = newfile;
+		filearray[pnumwadfiles] = newfile;
 	}
 	else
 	{
@@ -1088,44 +1139,42 @@ static void D_FindAddonsToAutoload(void)
 {
 	FILE *autoloadconfigfile;
 	const char *autoloadpath;
-	char *newline;
-
 	boolean postload;
 
+	INT32 i;
 	char wadsToAutoload[256] = "";
 
 	// does it exist tho
-	autoloadpath = va("%s"PATHSEP"%s", srb2home, AUTOLOADCONFIGFILENAME);
+	autoloadpath = va("%s"PATHSEP"%s",srb2home,AUTOLOADCONFIGFILENAME);
 	autoloadconfigfile = fopen(autoloadpath, "r");
 
 	// If the file is found, run our shit
 	if (!autoloadconfigfile) // nope outta here
 	{
-		autoloadcount = postloadcount = 0; // so D_AddAutoloadFiles can skip everything since nothings there to autoload
+		wasautoloaded = postautoloaded = true; // so D_AddAutoloadFiles can skip everything since nothings there to autoload
 		return;
 	}
 
-	while (fgets(wadsToAutoload, sizeof(wadsToAutoload), autoloadconfigfile) != NULL)
+	while (fgets(wadsToAutoload, sizeof wadsToAutoload, autoloadconfigfile) != NULL)
 	{
 		postload = false;
-
 		// skip if commented or empty
-		if (wadsToAutoload[0] == '\n' ||
-			wadsToAutoload[0] == '#'  ||
-			wadsToAutoload[0] == '\0')
+		if ((wadsToAutoload[1] == '\0' || wadsToAutoload[1] == '\n')
+			|| (wadsToAutoload[0] == '#'))
 			continue;
-
 		// this marks it so that it loads after loading server addons
-		if (fastncmp(wadsToAutoload, "postload ", 9))
+		else if (fastncmp(wadsToAutoload, "postload ", 9))
 		{
 			strremove(wadsToAutoload, "postload ");
 			postload = true;
 		}
 
 		// Remove Any Empty or Skipped Lines
-		newline = strchr(wadsToAutoload, '\n');
-		if (newline)
-			*newline = '\0';
+		for (i = 0; wadsToAutoload[i] != '\0'; i++)
+		{
+			if (wadsToAutoload[i] == '\n')
+				wadsToAutoload[i] = '\0';
+		}
 
 		if (!postload && W_CheckPostLoadList(wadsToAutoload))
 		{
@@ -1135,19 +1184,14 @@ static void D_FindAddonsToAutoload(void)
 
 		// LOAD IT
 		if (!postload)
-		{
-			D_AutoloadFile(wadsToAutoload, autoloadwadfiles, autoloadcount);
-			autoloadcount++;
-		}
+			D_AutoloadFile(wadsToAutoload, autoloadwadfiles);
 		else
-		{
-			D_AutoloadFile(wadsToAutoload, autoloadwadfilespost, postloadcount);
-			postloadcount++;
-		}
-	}
+			D_AutoloadFile(wadsToAutoload, autoloadwadfilespost);
 
-	autoloadwadfiles[autoloadcount] = NULL;
-	autoloadwadfilespost[postloadcount] = NULL;
+		// end it here
+		for (i = 0; wadsToAutoload[i] != '\0'; i++)
+			wadsToAutoload[i] = '\0';
+	}
 
 	// we dont want memory leaks around here do we?
 	fclose(autoloadconfigfile);
@@ -1155,47 +1199,41 @@ static void D_FindAddonsToAutoload(void)
 
 static void D_AddAutoloadFiles(void)
 {
-	// nothing to autoload
-	if (autoloadcount == 0)
+	if (wasautoloaded)
 		return;
 
 	CONS_Printf("D_AutoloadFile(): Loading autoloaded addons...\n");
-
 	if (W_AddAutoloadedLocalFiles(autoloadwadfiles) == 0)
 		CONS_Printf("D_AutoloadFile(): Are you sure you put in valid files or what?\n");
+	D_CleanFile(autoloadwadfiles);
 
-	D_CleanFile(autoloadwadfiles, autoloadcount);
-
-	autoloadcount = 0;
+	wasautoloaded = true;
 }
 
 void D_AddPostloadFiles(void)
 {
-	// nothing to postload
-	if (postloadcount == 0 || !netgame)
+	if (postautoloaded || !netgame)
 		return;
 
 	CONS_Printf("D_AddPostloadFiles(): Loading postloaded addons...\n");
-
 	if (W_AddAutoloadedLocalFiles(autoloadwadfilespost) == 0)
 		CONS_Printf("D_AddPostloadFiles(): Are you sure you put in valid files or what?\n");
+	D_CleanFile(autoloadwadfilespost);
 
-	D_CleanFile(autoloadwadfilespost, postloadcount);
-
-	postloadcount = 0;
+	postautoloaded = true;
 }
 
 // ==========================================================================
 // Identify the SRB2 version, and IWAD file to use.
 // ==========================================================================
 
-static boolean AddIWAD(const char * file, const char *dir)
+static boolean AddIWAD(void)
 {
-	char * path = va(pandf, dir, file);
+	char * path = va(pandf, srb2path, "srb2.srb");
 
 	if (FIL_ReadFileOK(path))
 	{
-		D_AddFile(path, startupiwadfiles, startupiwadcount++);
+		D_AddFile(path, startupiwadfiles);
 		return true;
 	}
 
@@ -1231,14 +1269,14 @@ static void IdentifyVersion(void)
 	}
 
 #if (1) // reduce the amount of findfile by only using full cwd in this func
-	if (!fastcmp(tempsrb2path, srb2waddir))
+	if (strcmp(tempsrb2path, srb2waddir))
 #endif
 	{
 		strlcpy(srb2path, srb2waddir, sizeof (srb2path));
 	}
 
 	// Load the IWAD
-	if (!AddIWAD("srb2.srb", srb2path)) // not sure why this uses srb2path and not srb2waddir?
+	if (!AddIWAD())
 	{
 		I_Error("SRB2.SRB not found! Expected in %s\n", srb2waddir);
 	}
@@ -1252,60 +1290,57 @@ static void IdentifyVersion(void)
 
 #ifdef USE_PATCH_DTA
 	// Add our crappy patches to fix our bugs
-	if (!AddIWAD("patch.dta", srb2waddir))
-	{
-		I_Error("patch.dta not found! Expected in %s\n", srb2waddir);
-	}
+	D_AddFile(va(pandf,srb2waddir,"patch.dta"));
 #endif
-	if (!AddIWAD("gfx.kart", srb2waddir))
-	{
-		I_Error("gfx.kart not found! Expected in %s\n", srb2waddir);
-	}
 
-	if (!AddIWAD("textures.kart", srb2waddir))
-	{
-		I_Error("textures.kart not found! Expected in %s\n", srb2waddir);
-	}
-
-	if (!AddIWAD("chars.kart", srb2waddir))
-	{
-		I_Error("chars.kart not found! Expected in %s\n", srb2waddir);
-	}
-
-	if (!AddIWAD("maps.kart", srb2waddir))
-	{
-		I_Error("maps.kart not found! Expected in %s\n", srb2waddir);
-	}
+	D_AddFile(va(pandf, srb2waddir, "gfx.kart"), startupiwadfiles);
+	D_AddFile(va(pandf, srb2waddir, "textures.kart"), startupiwadfiles);
+	D_AddFile(va(pandf, srb2waddir, "chars.kart"), startupiwadfiles);
+	D_AddFile(va(pandf, srb2waddir, "maps.kart"), startupiwadfiles);
 #ifdef USE_PATCH_KART
-	if (!AddIWAD("patch.kart", srb2waddir))
-	{
-		I_Error("patch.kart not found! Expected in %s\n", srb2waddir);
-	}
+	D_AddFile(va(pandf,srb2waddir,"patch.kart"), startupiwadfiles);
 #endif
 
+	const char *path = NULL;
+
+	path = va(pandf, srb2waddir, "extra.kart");
+
 	// completely optional
-	if (AddIWAD("extra.kart", srb2waddir))
+	if (FIL_ReadFileOK(path))
+	{
+		D_AddFile(path, startupiwadfiles);
 		found_extra_kart = true;
+	}
+
+	path = va(pandf, srb2waddir, "extra2.kart");
 
 	// completely optional 2: Back with a vengence
-	if (AddIWAD("extra2.kart", srb2waddir))
+	if (FIL_ReadFileOK(path))
+	{
+		D_AddFile(path, startupiwadfiles);
 		found_extra2_kart = true;
+	}
 
-	if (AddIWAD("extra3.kart", srb2waddir))
+	path = va(pandf, srb2waddir, "extra3.kart");
+
+	if (FIL_ReadFileOK(path))
+	{
+		D_AddFile(path, startupiwadfiles);
 		found_extra3_kart = true;
+	}
 
 #if !defined (HAVE_SDL) || defined (HAVE_MIXER)
 #define MUSICTEST(str) \
-	musicpath = va(pandf, srb2waddir, str);\
+	musicpath = va(pandf,srb2waddir,str);\
 	handle = W_OpenWadFile(&musicpath, false); \
 	if (handle) \
-	{ \
+	{\
 		int ms = W_VerifyNMUSlumps(musicpath, handle, false); \
 		fclose(handle); \
 		if (ms == 0) \
 			I_Error("File " str " has been modified with non-music/sound lumps"); \
 		if (ms == 1) \
-			D_AddFile(musicpath, startupiwadfiles, startupiwadcount++); \
+			D_AddFile(musicpath, startupiwadfiles); \
 	}
 	{
 		const char *musicpath;
@@ -1679,14 +1714,8 @@ void D_SRB2Main(void)
 		else
 		{
 			// use user specific config file
-			if (M_CheckParm("-workdir") && M_IsNextParm())
-				snprintf(srb2home, sizeof srb2home, "%s", M_GetNextParm());
-			else
 #ifdef DEFAULTDIR
-				snprintf(srb2home, sizeof srb2home, "%s" PATHSEP DEFAULTDIR, userhome);
-#else // DEFAULTDIR
-				snprintf(srb2home, sizeof srb2home, "%s", userhome);
-#endif // DEFAULTDIR
+			snprintf(srb2home, sizeof srb2home, "%s" PATHSEP DEFAULTDIR, userhome);
 			snprintf(downloaddir, sizeof downloaddir, "%s" PATHSEP "DOWNLOAD", srb2home);
 			if (dedicated)
 				snprintf(configfile, sizeof configfile, "%s" PATHSEP "d"CONFIGFILENAME, srb2home);
@@ -1695,6 +1724,17 @@ void D_SRB2Main(void)
 
 			// can't use sprintf since there is %u in savegamename
 			strcatbf(savegamename, srb2home, PATHSEP);
+#else
+			snprintf(srb2home, sizeof srb2home, "%s", userhome);
+			snprintf(downloaddir, sizeof downloaddir, "%s", userhome);
+			if (dedicated)
+				snprintf(configfile, sizeof configfile, "%s" PATHSEP "d"CONFIGFILENAME, userhome);
+			else
+				snprintf(configfile, sizeof configfile, "%s" PATHSEP CONFIGFILENAME, userhome);
+
+			// can't use sprintf since there is %u in savegamename
+			strcatbf(savegamename, userhome, PATHSEP);
+#endif
 		}
 
 		configfile[sizeof configfile - 1] = '\0';
@@ -1720,9 +1760,6 @@ void D_SRB2Main(void)
 		}
 	}
 
-	// make sure workdir exists
-	I_mkdir(srb2home, 0755);
-
 	// Create addons dir
 	snprintf(addonsdir, sizeof addonsdir, "%s%s%s", srb2home, PATHSEP, "addons");
 	I_mkdir(addonsdir, 0755);
@@ -1751,7 +1788,7 @@ void D_SRB2Main(void)
 				const char *s = M_GetNextParm();
 
 				if (s) // Check for NULL?
-					D_AddFile(s, startuppwads, startuppwadcount++);
+					D_AddFile(s, startuppwads);
 			}
 		}
 	}
@@ -1784,10 +1821,8 @@ void D_SRB2Main(void)
 	// load wad, including the main wad file
 	CONS_Printf("W_InitMultipleFiles(): Adding IWAD and main PWADs.\n");
 
-	W_InitMultipleFiles(startupiwadfiles, startupiwadcount, false);
-	//mainwads = startupiwadcount - musicwads;
-	D_CleanFile(startupiwadfiles, startupiwadcount);
-	startupiwadcount = 0;
+	W_InitMultipleFiles(startupiwadfiles, false);
+	D_CleanFile(startupiwadfiles);
 	mainwads = 0;
 
 #ifndef DEVELOP
@@ -1826,16 +1861,15 @@ void D_SRB2Main(void)
 
 	D_CheckMaps(false);
 
-	W_InitMultipleFiles(startuppwads, startuppwadcount, true);
+	W_InitMultipleFiles(startuppwads, true);
 
 	// Only search for pwad maps if we actually have a pwad added
-	if (startuppwadcount > 0)
+	if (startuppwads[0] != NULL)
 	{
 		D_CheckMaps(true);
 	}
 
-	D_CleanFile(startuppwads, startuppwadcount);
-	startuppwadcount = 0;
+	D_CleanFile(startuppwads);
 
 	cht_Init();
 
@@ -2099,14 +2133,11 @@ void D_SRB2Main(void)
 			const char *sskill = M_GetNextParm();
 
 			for (j = 0; kartspeed_cons_t[j].strvalue; j++)
-			{
-				if (fasticmp(kartspeed_cons_t[j].strvalue, sskill))
+				if (!strcasecmp(kartspeed_cons_t[j].strvalue, sskill))
 				{
 					newskill = (INT16)kartspeed_cons_t[j].value;
 					break;
 				}
-			}
-
 			if (!kartspeed_cons_t[j].strvalue) // reached end of the list with no match
 			{
 				j = atoi(sskill); // assume they gave us a skill number, which is okay too

src/d_main.h

@@ -61,6 +61,9 @@ extern boolean minilighticon;     // mkwii-style minimap headlight
 //
 
 // autoload stuff
+extern boolean autoloading;
+extern boolean autoloaded;
+extern boolean postautoloaded;
 void D_AddPostloadFiles(void);
 
 // the infinite loop of D_SRB2Loop() called from win_main for windows version

src/d_net.c

@@ -95,9 +95,9 @@ static INT32 sendackpacket = 0, getackpacket = 0;
 INT32 ticruned = 0, ticmiss = 0;
 
 // globals
-INT32 getbps = 0, sendbps = 0;
-float lostpercent = 0, duppercent = 0, gamelostpercent = 0;
-INT32 packetheaderlength = 0;
+INT32 getbps, sendbps;
+float lostpercent, duppercent, gamelostpercent;
+INT32 packetheaderlength;
 
 boolean Net_GetNetStat(void)
 {
@@ -243,7 +243,7 @@ static boolean GetFreeAcknum(UINT8 *freeack)
 			ackpak[i].length = doomcom->datalength;
 			ackpak[i].senttime = I_GetTime();
 			ackpak[i].resentnum = 0;
-			memcpy(ackpak[i].pak.raw, netbuffer, ackpak[i].length);
+			M_Memcpy(ackpak[i].pak.raw, netbuffer, ackpak[i].length);
 
 			*freeack = ackpak[i].acknum;
 
@@ -412,7 +412,7 @@ void Net_SendAcks(INT32 node)
 {
 	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
 	netbuffer->packettype = PT_NOTHING;
-	memcpy(netbuffer->u.textcmd, nodes[node].acktosend, MAXACKTOSEND);
+	M_Memcpy(netbuffer->u.textcmd, nodes[node].acktosend, MAXACKTOSEND);
 	HSendPacket(node, false, 0, MAXACKTOSEND);
 }
 
@@ -494,7 +494,7 @@ void Net_AckTicker(void)
 			}
 			DEBFILE(va("Resend ack %d, %u<%d at %u\n", ackpak[i].acknum, ackpak[i].senttime,
 				NODETIMEOUT, I_GetTime()));
-			memcpy(netbuffer, ackpak[i].pak.raw, ackpak[i].length);
+			M_Memcpy(netbuffer, ackpak[i].pak.raw, ackpak[i].length);
 			ackpak[i].senttime = I_GetTime();
 			ackpak[i].resentnum++;
 			ackpak[i].nextacknum = node->nextacknum;
@@ -1021,7 +1021,7 @@ boolean HSendPacket(INT32 node, boolean reliable, UINT8 acknum, size_t packetlen
 			return false;
 		}
 		netbuffer->ack = netbuffer->ackreturn = 0; // don't hold over values from last packet sent/received
-		memcpy(&reboundstore[rebound_head], netbuffer,
+		M_Memcpy(&reboundstore[rebound_head], netbuffer,
 			doomcom->datalength);
 		reboundsize[rebound_head] = doomcom->datalength;
 		rebound_head = (rebound_head+1) % MAXREBOUND;
@@ -1107,7 +1107,7 @@ boolean HGetPacket(void)
 	// Get a packet from self
 	if (rebound_tail != rebound_head)
 	{
-		memcpy(netbuffer, &reboundstore[rebound_tail], reboundsize[rebound_tail]);
+		M_Memcpy(netbuffer, &reboundstore[rebound_tail], reboundsize[rebound_tail]);
 		doomcom->datalength = reboundsize[rebound_tail];
 		if (netbuffer->packettype == PT_NODETIMEOUT)
 			doomcom->remotenode = netbuffer->u.textcmd[0];
@@ -1127,7 +1127,9 @@ boolean HGetPacket(void)
 
 	while (true)
 	{
-		if (!I_NetGet()) // No packets received
+		I_NetGet();
+
+		if (doomcom->remotenode == -1) // No packet received
 			return false;
 
 		getbytes += packetheaderlength + doomcom->datalength; // For stat
@@ -1163,7 +1165,6 @@ boolean HGetPacket(void)
 			GotAcks();
 			continue;
 		}
-
 		doomcom->datalength -= BASEPACKETSIZE;
 		break;
 	}

src/d_netcmd.c

@@ -68,22 +68,22 @@
 // protos
 // ------
 
-static void Got_NameAndColor(const UINT8 **cp, INT32 playernum);
-static void Got_WeaponPref(const UINT8 **cp, INT32 playernum);
-static void Got_Mapcmd(const UINT8 **cp, INT32 playernum);
-static void Got_ExitLevelcmd(const UINT8 **cp, INT32 playernum);
-static void Got_SetupVotecmd(const UINT8 **cp, INT32 playernum);
-static void Got_ModifyVotecmd(const UINT8 **cp, INT32 playernum);
-static void Got_PickVotecmd(const UINT8 **cp, INT32 playernum);
-static void Got_RequestAddfilecmd(const UINT8 **cp, INT32 playernum);
-static void Got_Addfilecmd(const UINT8 **cp, INT32 playernum);
-static void Got_Pause(const UINT8 **cp, INT32 playernum);
-static void Got_Respawn(const UINT8 **cp, INT32 playernum);
-static void Got_RandomSeed(const UINT8 **cp, INT32 playernum);
-static void Got_RunSOCcmd(const UINT8 **cp, INT32 playernum);
-static void Got_Teamchange(const UINT8 **cp, INT32 playernum);
-static void Got_Clearscores(const UINT8 **cp, INT32 playernum);
-static void Got_DiscordInfo(const UINT8 **cp, INT32 playernum);
+static void Got_NameAndColor(UINT8 **cp, INT32 playernum);
+static void Got_WeaponPref(UINT8 **cp, INT32 playernum);
+static void Got_Mapcmd(UINT8 **cp, INT32 playernum);
+static void Got_ExitLevelcmd(UINT8 **cp, INT32 playernum);
+static void Got_SetupVotecmd(UINT8 **cp, INT32 playernum);
+static void Got_ModifyVotecmd(UINT8 **cp, INT32 playernum);
+static void Got_PickVotecmd(UINT8 **cp, INT32 playernum);
+static void Got_RequestAddfilecmd(UINT8 **cp, INT32 playernum);
+static void Got_Addfilecmd(UINT8 **cp, INT32 playernum);
+static void Got_Pause(UINT8 **cp, INT32 playernum);
+static void Got_Respawn(UINT8 **cp, INT32 playernum);
+static void Got_RandomSeed(UINT8 **cp, INT32 playernum);
+static void Got_RunSOCcmd(UINT8 **cp, INT32 playernum);
+static void Got_Teamchange(UINT8 **cp, INT32 playernum);
+static void Got_Clearscores(UINT8 **cp, INT32 playernum);
+static void Got_DiscordInfo(UINT8 **cp, INT32 playernum);
 
 static void PointLimit_OnChange(void);
 static void TimeLimit_OnChange(void);
@@ -178,13 +178,13 @@ static void Command_Clearscores_f(void);
 // Remote Administration
 static void Command_Changepassword_f(void);
 static void Command_Login_f(void);
-static void Got_Login(const UINT8 **cp, INT32 playernum);
-static void Got_Verification(const UINT8 **cp, INT32 playernum);
-static void Got_Removal(const UINT8 **cp, INT32 playernum);
+static void Got_Login(UINT8 **cp, INT32 playernum);
+static void Got_Verification(UINT8 **cp, INT32 playernum);
+static void Got_Removal(UINT8 **cp, INT32 playernum);
 static void Command_Verify_f(void);
 static void Command_RemoveAdmin_f(void);
 static void Command_MotD_f(void);
-static void Got_MotD_f(const UINT8 **cp, INT32 playernum);
+static void Got_MotD_f(UINT8 **cp, INT32 playernum);
 
 static void Command_ShowScores_f(void);
 static void Command_ShowTime_f(void);
@@ -292,10 +292,6 @@ consvar_t cv_mouseturn = {"mouseturn", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL,
 // Lagless camera! Yay!
 consvar_t cv_laglesscam = {"lagless_camera", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 
-// makes the camera use the saved angleturn in replays instead of the players angle
-// more accurate to how the recording player seen things in game, but may be jittery if they encountered net issues
-consvar_t cv_demoangturn = {"useangleturninreplays", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-
 consvar_t cv_verticallook[MAXSPLITSCREENPLAYERS] = {
 	{"verticallook",  "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL},
 	{"verticallook2", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL},
@@ -1047,7 +1043,6 @@ void D_RegisterClientCommands(void)
 	CV_RegisterVar(&cv_betainterscreen);
 
 	CV_RegisterVar(&cv_laglesscam);
-	CV_RegisterVar(&cv_demoangturn);
 
 	for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
 	{
@@ -1219,7 +1214,7 @@ static boolean EnsurePlayerNameIsGood(char *name, INT32 playernum)
 	for (ix = 0; ix < MAXPLAYERS; ix++)
 	{
 		if (ix != playernum && playeringame[ix]
-			&& fasticmp(name, player_names[ix]))
+			&& strcasecmp(name, player_names[ix]) == 0)
 		{
 			// We shouldn't kick people out just because
 			// they joined the game with the same name
@@ -1336,7 +1331,7 @@ static void CleanupPlayerName(INT32 playernum, const char *newname)
 		for (i = 0; i < MAXPLAYERS; i++)
 		{
 			if (i != playernum && playeringame[i]
-				&& fasticmp(tmpname, player_names[i]))
+				&& strcasecmp(tmpname, player_names[i]) == 0)
 			{
 				break;
 			}
@@ -1386,7 +1381,7 @@ static void SetPlayerName(INT32 playernum, char *newname)
 {
 	if (EnsurePlayerNameIsGood(newname, playernum))
 	{
-		if (!fasticmp(newname, player_names[playernum]))
+		if (strcasecmp(newname, player_names[playernum]) != 0)
 		{
 			if (netgame)
 				HU_AddChatText(va("\x82*%s renamed to %s", player_names[playernum], newname), false);
@@ -1508,9 +1503,9 @@ static void SendNameAndColor(void)
 			CV_StealthSet(&cv_playercolor, cv_playercolor.defaultvalue);
 	}
 
-	if (fastcmp(cv_playername.string, player_names[consoleplayer])
+	if (!strcmp(cv_playername.string, player_names[consoleplayer])
 		&& cv_playercolor.value == players[consoleplayer].skincolor
-		&& fastcmp(cv_skin.string, skins[players[consoleplayer].skin].name))
+		&& !strcmp(cv_skin.string, skins[players[consoleplayer].skin].name))
 		return;
 
 	// We'll handle it later if we're not playing.
@@ -1913,7 +1908,7 @@ static void SendNameAndColor4(void)
 	SendNetXCmdForPlayer(3, XD_NAMEANDCOLOR, buf, p - buf);
 }
 
-static void Got_NameAndColor(const UINT8 **cp, INT32 playernum)
+static void Got_NameAndColor(UINT8 **cp, INT32 playernum)
 {
 	player_t *p = &players[playernum];
 	char name[MAXPLAYERNAME+1];
@@ -1945,7 +1940,7 @@ static void Got_NameAndColor(const UINT8 **cp, INT32 playernum)
 	// set name
 	if (player_name_changes[playernum] < MAXNAMECHANGES)
 	{
-		if (!fasticmp(player_names[playernum], name))
+		if (strcasecmp(player_names[playernum], name) != 0)
 			SetPlayerName(playernum, name);
 	}
 
@@ -2041,17 +2036,15 @@ void SendWeaponPref4(void)
 	SendNetXCmdForPlayer(3, XD_WEAPONPREF, buf, 1);
 }
 
-static void Got_WeaponPref(const UINT8 **cp, INT32 playernum)
+static void Got_WeaponPref(UINT8 **cp,INT32 playernum)
 {
-	player_t *player = &players[playernum];
-
 	UINT8 prefs = READUINT8(*cp);
 
-	player->pflags &= ~(PF_FLIPCAM|PF_ANALOGMODE);
+	players[playernum].pflags &= ~(PF_FLIPCAM|PF_ANALOGMODE);
 	if (prefs & 1)
-		player->pflags |= PF_FLIPCAM;
+		players[playernum].pflags |= PF_FLIPCAM;
 	if (prefs & 2)
-		player->pflags |= PF_ANALOGMODE;
+		players[playernum].pflags |= PF_ANALOGMODE;
 }
 
 void D_SendPlayerConfig(void)
@@ -2324,8 +2317,8 @@ static void Command_Playdemo_f(void)
 
 	CONS_Printf(M_GetText("Playing back demo '%s'.\n"), name);
 
-	demo.loadfiles = fastcmp(COM_Argv(2), "-addfiles");
-	demo.ignorefiles = fastcmp(COM_Argv(2), "-force");
+	demo.loadfiles = strcmp(COM_Argv(2), "-addfiles") == 0;
+	demo.ignorefiles = strcmp(COM_Argv(2), "-force") == 0;
 
 	// Internal if no extension, external if one exists
 	// If external, convert the file name to a path in SRB2's home directory
@@ -2494,18 +2487,15 @@ void D_SetupVote(void)
 	INT32 i;
 	UINT8 gt = (cv_kartgametypepreference.value == -1) ? gametype : cv_kartgametypepreference.value;
 	UINT8 secondgt = G_SometimesGetDifferentGametype(gt);
-	INT16 votebuffer[4] = {-1,-1,-1, 0};
+	INT16 votebuffer[4] = {-1,-1,-1,0};
 	INT16 luamaps[4] = {0, 0, 0, 0};
 
 	LUA_HookSetupVote(luamaps, sizeof(luamaps)/sizeof(luamaps[0]), gt, secondgt);
 
 	// Correct secondgt if needed
-	if (luamaps[2])
-	{
-		UINT8 typeoflevel = mapheaderinfo[luamaps[2]-1]->typeoflevel;
-		if ((typeoflevel & G_TOLFlag(secondgt&(~0x80))) == 0)
-			secondgt = ((typeoflevel & TOL_RACE) ? GT_RACE : GT_MATCH)|(secondgt&0x80);
-	}
+	UINT8 typeoflevel = mapheaderinfo[luamaps[2]-1]->typeoflevel;
+	if (luamaps[2] && (typeoflevel & G_TOLFlag(secondgt&(~0x80))) == 0)
+		secondgt = ((typeoflevel & TOL_RACE) ? GT_RACE : GT_MATCH)|(secondgt&0x80);
 
 	if (cv_kartencore.value && gt == GT_RACE)
 		WRITEUINT8(p, (gt|0x80));
@@ -2850,7 +2840,7 @@ static void Command_Map_f(void)
   *                  ::serverplayer or ::adminplayer.
   * \sa D_MapChange
   */
-static void Got_Mapcmd(const UINT8 **cp, INT32 playernum)
+static void Got_Mapcmd(UINT8 **cp, INT32 playernum)
 {
 	char mapname[MAX_WADPATH+1];
 	UINT8 flags;
@@ -2969,7 +2959,7 @@ static void Command_Pause(void)
 		CONS_Printf(M_GetText("Only the server or a remote admin can use this.\n"));
 }
 
-static void Got_Pause(const UINT8 **cp, INT32 playernum)
+static void Got_Pause(UINT8 **cp, INT32 playernum)
 {
 	UINT8 dedicatedpause = false;
 	const char *playername;
@@ -3081,7 +3071,7 @@ static void Command_Respawn(void)
 	SendNetXCmd(XD_RESPAWN, &buf, 4);
 }
 
-static void Got_Respawn(const UINT8 **cp, INT32 playernum)
+static void Got_Respawn(UINT8 **cp, INT32 playernum)
 {
 	INT32 respawnplayer = READINT32(*cp);
 
@@ -3116,7 +3106,7 @@ static void Got_Respawn(const UINT8 **cp, INT32 playernum)
   * \param playernum Player responsible for the message. Must be ::serverplayer.
   * \author Graue <graue@oceanbase.org>
   */
-static void Got_RandomSeed(const UINT8 **cp, INT32 playernum)
+static void Got_RandomSeed(UINT8 **cp, INT32 playernum)
 {
 	UINT32 seed;
 
@@ -3151,7 +3141,7 @@ static void Command_Clearscores_f(void)
   * \sa XD_CLEARSCORES, Command_Clearscores_f
   * \author SSNTails <http://www.ssntails.org>
   */
-static void Got_Clearscores(const UINT8 **cp, INT32 playernum)
+static void Got_Clearscores(UINT8 **cp, INT32 playernum)
 {
 	INT32 i;
 
@@ -3196,20 +3186,20 @@ static void Command_Teamchange_f(void)
 
 	if (G_GametypeHasTeams())
 	{
-		if (fasticmp(COM_Argv(1), "red") || fasticmp(COM_Argv(1), "1"))
+		if (!strcasecmp(COM_Argv(1), "red") || !strcasecmp(COM_Argv(1), "1"))
 			NetPacket.packet.newteam = 1;
-		else if (fasticmp(COM_Argv(1), "blue") || fasticmp(COM_Argv(1), "2"))
+		else if (!strcasecmp(COM_Argv(1), "blue") || !strcasecmp(COM_Argv(1), "2"))
 			NetPacket.packet.newteam = 2;
-		else if (fasticmp(COM_Argv(1), "spectator") || fasticmp(COM_Argv(1), "0"))
+		else if (!strcasecmp(COM_Argv(1), "spectator") || !strcasecmp(COM_Argv(1), "0"))
 			NetPacket.packet.newteam = 0;
 		else
 			error = true;
 	}
 	else if (G_GametypeHasSpectators())
 	{
-		if (fasticmp(COM_Argv(1), "spectator") || fasticmp(COM_Argv(1), "0"))
+		if (!strcasecmp(COM_Argv(1), "spectator") || !strcasecmp(COM_Argv(1), "0"))
 			NetPacket.packet.newteam = 0;
-		else if (fasticmp(COM_Argv(1), "playing") || fasticmp(COM_Argv(1), "1"))
+		else if (!strcasecmp(COM_Argv(1), "playing") || !strcasecmp(COM_Argv(1), "1"))
 			NetPacket.packet.newteam = 3;
 		else
 			error = true;
@@ -3286,20 +3276,20 @@ static void Command_Teamchange2_f(void)
 
 	if (G_GametypeHasTeams())
 	{
-		if (fasticmp(COM_Argv(1), "red") || fasticmp(COM_Argv(1), "1"))
+		if (!strcasecmp(COM_Argv(1), "red") || !strcasecmp(COM_Argv(1), "1"))
 			NetPacket.packet.newteam = 1;
-		else if (fasticmp(COM_Argv(1), "blue") || fasticmp(COM_Argv(1), "2"))
+		else if (!strcasecmp(COM_Argv(1), "blue") || !strcasecmp(COM_Argv(1), "2"))
 			NetPacket.packet.newteam = 2;
-		else if (fasticmp(COM_Argv(1), "spectator") || fasticmp(COM_Argv(1), "0"))
+		else if (!strcasecmp(COM_Argv(1), "spectator") || !strcasecmp(COM_Argv(1), "0"))
 			NetPacket.packet.newteam = 0;
 		else
 			error = true;
 	}
 	else if (G_GametypeHasSpectators())
 	{
-		if (fasticmp(COM_Argv(1), "spectator") || fasticmp(COM_Argv(1), "0"))
+		if (!strcasecmp(COM_Argv(1), "spectator") || !strcasecmp(COM_Argv(1), "0"))
 			NetPacket.packet.newteam = 0;
-		else if (fasticmp(COM_Argv(1), "playing") || fasticmp(COM_Argv(1), "1"))
+		else if (!strcasecmp(COM_Argv(1), "playing") || !strcasecmp(COM_Argv(1), "1"))
 			NetPacket.packet.newteam = 3;
 		else
 			error = true;
@@ -3377,20 +3367,20 @@ static void Command_Teamchange3_f(void)
 
 	if (G_GametypeHasTeams())
 	{
-		if (fasticmp(COM_Argv(1), "red") || fasticmp(COM_Argv(1), "1"))
+		if (!strcasecmp(COM_Argv(1), "red") || !strcasecmp(COM_Argv(1), "1"))
 			NetPacket.packet.newteam = 1;
-		else if (fasticmp(COM_Argv(1), "blue") || fasticmp(COM_Argv(1), "2"))
+		else if (!strcasecmp(COM_Argv(1), "blue") || !strcasecmp(COM_Argv(1), "2"))
 			NetPacket.packet.newteam = 2;
-		else if (fasticmp(COM_Argv(1), "spectator") || fasticmp(COM_Argv(1), "0"))
+		else if (!strcasecmp(COM_Argv(1), "spectator") || !strcasecmp(COM_Argv(1), "0"))
 			NetPacket.packet.newteam = 0;
 		else
 			error = true;
 	}
 	else if (G_GametypeHasSpectators())
 	{
-		if (fasticmp(COM_Argv(1), "spectator") || fasticmp(COM_Argv(1), "0"))
+		if (!strcasecmp(COM_Argv(1), "spectator") || !strcasecmp(COM_Argv(1), "0"))
 			NetPacket.packet.newteam = 0;
-		else if (fasticmp(COM_Argv(1), "playing") || fasticmp(COM_Argv(1), "1"))
+		else if (!strcasecmp(COM_Argv(1), "playing") || !strcasecmp(COM_Argv(1), "1"))
 			NetPacket.packet.newteam = 3;
 		else
 			error = true;
@@ -3468,20 +3458,20 @@ static void Command_Teamchange4_f(void)
 
 	if (G_GametypeHasTeams())
 	{
-		if (fasticmp(COM_Argv(1), "red") || fasticmp(COM_Argv(1), "1"))
+		if (!strcasecmp(COM_Argv(1), "red") || !strcasecmp(COM_Argv(1), "1"))
 			NetPacket.packet.newteam = 1;
-		else if (fasticmp(COM_Argv(1), "blue") || fasticmp(COM_Argv(1), "2"))
+		else if (!strcasecmp(COM_Argv(1), "blue") || !strcasecmp(COM_Argv(1), "2"))
 			NetPacket.packet.newteam = 2;
-		else if (fasticmp(COM_Argv(1), "spectator") || fasticmp(COM_Argv(1), "0"))
+		else if (!strcasecmp(COM_Argv(1), "spectator") || !strcasecmp(COM_Argv(1), "0"))
 			NetPacket.packet.newteam = 0;
 		else
 			error = true;
 	}
 	else if (G_GametypeHasSpectators())
 	{
-		if (fasticmp(COM_Argv(1), "spectator") || fasticmp(COM_Argv(1), "0"))
+		if (!strcasecmp(COM_Argv(1), "spectator") || !strcasecmp(COM_Argv(1), "0"))
 			NetPacket.packet.newteam = 0;
-		else if (fasticmp(COM_Argv(1), "playing") || fasticmp(COM_Argv(1), "1"))
+		else if (!strcasecmp(COM_Argv(1), "playing") || !strcasecmp(COM_Argv(1), "1"))
 			NetPacket.packet.newteam = 3;
 		else
 			error = true;
@@ -3567,33 +3557,33 @@ static void Command_ServerTeamChange_f(void)
 
 	if (G_TagGametype())
 	{
-		if (fasticmp(COM_Argv(2), "it") || fasticmp(COM_Argv(2), "1"))
+		if (!strcasecmp(COM_Argv(2), "it") || !strcasecmp(COM_Argv(2), "1"))
 			NetPacket.packet.newteam = 1;
-		else if (fasticmp(COM_Argv(2), "notit") || fasticmp(COM_Argv(2), "2"))
+		else if (!strcasecmp(COM_Argv(2), "notit") || !strcasecmp(COM_Argv(2), "2"))
 			NetPacket.packet.newteam = 2;
-		else if (fasticmp(COM_Argv(2), "playing") || fasticmp(COM_Argv(2), "3"))
+		else if (!strcasecmp(COM_Argv(2), "playing") || !strcasecmp(COM_Argv(2), "3"))
 			NetPacket.packet.newteam = 3;
-		else if (fasticmp(COM_Argv(2), "spectator") || fasticmp(COM_Argv(2), "0"))
+		else if (!strcasecmp(COM_Argv(2), "spectator") || !strcasecmp(COM_Argv(2), "0"))
 			NetPacket.packet.newteam = 0;
 		else
 			error = true;
 	}
 	else if (G_GametypeHasTeams())
 	{
-		if (fasticmp(COM_Argv(2), "red") || fasticmp(COM_Argv(2), "1"))
+		if (!strcasecmp(COM_Argv(2), "red") || !strcasecmp(COM_Argv(2), "1"))
 			NetPacket.packet.newteam = 1;
-		else if (fasticmp(COM_Argv(2), "blue") || fasticmp(COM_Argv(2), "2"))
+		else if (!strcasecmp(COM_Argv(2), "blue") || !strcasecmp(COM_Argv(2), "2"))
 			NetPacket.packet.newteam = 2;
-		else if (fasticmp(COM_Argv(2), "spectator") || fasticmp(COM_Argv(2), "0"))
+		else if (!strcasecmp(COM_Argv(2), "spectator") || !strcasecmp(COM_Argv(2), "0"))
 			NetPacket.packet.newteam = 0;
 		else
 			error = true;
 	}
 	else if (G_GametypeHasSpectators())
 	{
-		if (fasticmp(COM_Argv(2), "spectator") || fasticmp(COM_Argv(2), "0"))
+		if (!strcasecmp(COM_Argv(2), "spectator") || !strcasecmp(COM_Argv(2), "0"))
 			NetPacket.packet.newteam = 0;
-		else if (fasticmp(COM_Argv(2), "playing") || fasticmp(COM_Argv(2), "1"))
+		else if (!strcasecmp(COM_Argv(2), "playing") || !strcasecmp(COM_Argv(2), "1"))
 			NetPacket.packet.newteam = 3;
 		else
 			error = true;
@@ -3668,7 +3658,7 @@ static void Command_ServerTeamChange_f(void)
 }
 
 //todo: This and the other teamchange functions are getting too long and messy. Needs cleaning.
-static void Got_Teamchange(const UINT8 **cp, INT32 playernum)
+static void Got_Teamchange(UINT8 **cp, INT32 playernum)
 {
 	changeteam_union NetPacket;
 	boolean error = false, wasspectator = false;
@@ -4025,7 +4015,7 @@ static void Command_Login_f(void)
 #endif
 }
 
-static void Got_Login(const UINT8 **cp, INT32 playernum)
+static void Got_Login(UINT8 **cp, INT32 playernum)
 {
 #ifdef NOMD5
 	// If we have no MD5 support then completely disable XD_LOGIN responses for security.
@@ -4135,7 +4125,7 @@ static void Command_Verify_f(void)
 		SendNetXCmd(XD_VERIFIED, buf, 1);
 }
 
-static void Got_Verification(const UINT8 **cp, INT32 playernum)
+static void Got_Verification(UINT8 **cp, INT32 playernum)
 {
 	INT16 num = READUINT8(*cp);
 
@@ -4187,7 +4177,7 @@ static void Command_RemoveAdmin_f(void)
 		SendNetXCmd(XD_DEMOTED, buf, 1);
 }
 
-static void Got_Removal(const UINT8 **cp, INT32 playernum)
+static void Got_Removal(UINT8 **cp, INT32 playernum)
 {
 	INT16 num = READUINT8(*cp);
 
@@ -4263,7 +4253,7 @@ static void Command_MotD_f(void)
 	Z_Free(mymotd);
 }
 
-static void Got_MotD_f(const UINT8 **cp, INT32 playernum)
+static void Got_MotD_f(UINT8 **cp, INT32 playernum)
 {
 	char *mymotd = Z_Malloc(sizeof(motd), PU_STATIC, NULL);
 	INT32 i;
@@ -4330,7 +4320,7 @@ static void Command_RunSOC(void)
 	SendNetXCmd(XD_RUNSOC, buf, length);
 }
 
-static void Got_RunSOCcmd(const UINT8 **cp, INT32 playernum)
+static void Got_RunSOCcmd(UINT8 **cp, INT32 playernum)
 {
 	char filename[256];
 	filestatus_t ncs = FS_NOTCHECKED;
@@ -4608,7 +4598,7 @@ static void Command_GLocalSkin (void)
 	}
 }
 
-static void Got_RequestAddfilecmd(const UINT8 **cp, INT32 playernum)
+static void Got_RequestAddfilecmd(UINT8 **cp, INT32 playernum)
 {
 	char filename[241];
 	filestatus_t ncs = FS_NOTCHECKED;
@@ -4667,7 +4657,7 @@ static void Got_RequestAddfilecmd(const UINT8 **cp, INT32 playernum)
 	COM_BufAddText(va("addfile %s\n", filename));
 }
 
-static void Got_Addfilecmd(const UINT8 **cp, INT32 playernum)
+static void Got_Addfilecmd(UINT8 **cp, INT32 playernum)
 {
 	char filename[241];
 	filestatus_t ncs = FS_NOTCHECKED;
@@ -5211,14 +5201,14 @@ static void Ringslinger_OnChange(void)
 static void Gravity_OnChange(void)
 {
 	if (!M_SecretUnlocked(SECRET_PANDORA) && !netgame && !cv_debug
-		&& !fastcmp(cv_gravity.string, cv_gravity.defaultvalue))
+		&& strcmp(cv_gravity.string, cv_gravity.defaultvalue))
 	{
 		CONS_Printf(M_GetText("You haven't earned this yet.\n"));
 		CV_StealthSet(&cv_gravity, cv_gravity.defaultvalue);
 		return;
 	}
 #ifndef NETGAME_GRAVITY
-	if (netgame)
+	if(netgame)
 	{
 		CV_StealthSet(&cv_gravity, cv_gravity.defaultvalue);
 		return;
@@ -5467,7 +5457,7 @@ static void Command_ExitLevel_f(void)
 		SendNetXCmd(XD_EXITLEVEL, NULL, 0);
 }
 
-static void Got_ExitLevelcmd(const UINT8 **cp, INT32 playernum)
+static void Got_ExitLevelcmd(UINT8 **cp, INT32 playernum)
 {
 	(void)cp;
 
@@ -5488,7 +5478,7 @@ static void Got_ExitLevelcmd(const UINT8 **cp, INT32 playernum)
 	G_ExitLevel();
 }
 
-static void Got_SetupVotecmd(const UINT8 **cp, INT32 playernum)
+static void Got_SetupVotecmd(UINT8 **cp, INT32 playernum)
 {
 	INT32 i;
 	UINT8 gt, secondgt;
@@ -5540,7 +5530,7 @@ static void Got_SetupVotecmd(const UINT8 **cp, INT32 playernum)
 	Y_StartVote();
 }
 
-static void Got_ModifyVotecmd(const UINT8 **cp, INT32 playernum)
+static void Got_ModifyVotecmd(UINT8 **cp, INT32 playernum)
 {
 	SINT8 voted = READSINT8(*cp);
 	UINT8 p = READUINT8(*cp);
@@ -5549,7 +5539,7 @@ static void Got_ModifyVotecmd(const UINT8 **cp, INT32 playernum)
 	votes[p] = voted;
 }
 
-static void Got_PickVotecmd(const UINT8 **cp, INT32 playernum)
+static void Got_PickVotecmd(UINT8 **cp, INT32 playernum)
 {
 	SINT8 pick = READSINT8(*cp);
 	SINT8 level = READSINT8(*cp);
@@ -6189,7 +6179,7 @@ static void KartEliminateLast_OnChange(void)
 		P_CheckRacers();
 }
 
-void Got_DiscordInfo(const UINT8 **p, INT32 playernum)
+void Got_DiscordInfo(UINT8 **p, INT32 playernum)
 {
 	if (playernum != serverplayer /*&& !IsPlayerAdmin(playernum)*/)
 	{

src/d_netcmd.h

@@ -209,8 +209,6 @@ extern consvar_t cv_betainterscreen;
 
 extern consvar_t cv_laglesscam;
 
-extern consvar_t cv_demoangturn;
-
 typedef enum
 {
 	SKINMENUTYPE_SCROLL = 0,

src/d_netfil.c

@@ -110,14 +110,14 @@ static fileused_t transferFiles[UINT8_MAX + 1];
 // Write time of file: utime
 
 // Receiver structure
-INT32 fileneedednum = 0; // Number of files needed to join the server
-fileneeded_t fileneeded[MAX_WADFILES] = {}; // List of needed files
+INT32 fileneedednum; // Number of files needed to join the server
+fileneeded_t fileneeded[MAX_WADFILES]; // List of needed files
 #ifdef HAVE_THREADS
 static I_mutex downloadmutex;
 #endif
 char downloaddir[512] = "DOWNLOAD";
 
-file_download_t filedownload = {};
+file_download_t filedownload;
 
 #ifdef HAVE_CURL
 static CURL *http_handle;
@@ -131,7 +131,7 @@ static UINT32 curl_origfilesize;
 static UINT32 curl_origtotalfilesize;
 static char *curl_realname = NULL;
 fileneeded_t *curl_curfile = NULL;
-HTTP_login *curl_logins = NULL;
+HTTP_login *curl_logins;
 #endif
 
 /** Fills a serverinfo packet with information about wad files loaded.
@@ -550,8 +550,7 @@ INT32 CL_CheckFiles(void)
 		for (j = mainwads+1; j < numwadfiles; j++)
 		{
 			nameonly(strcpy(wadfilename, wadfiles[j]->filename));
-
-			if (fasticmp(wadfilename, fileneeded[i].filename) &&
+			if (!stricmp(wadfilename, fileneeded[i].filename) &&
 				!memcmp(wadfiles[j]->md5sum, fileneeded[i].md5sum, 16))
 			{
 				CONS_Debug(DBG_NETPLAY, "already loaded\n");
@@ -666,7 +665,7 @@ static boolean SV_SendFile(INT32 node, const char *filename, UINT8 fileid)
 		strlcpy(wadfilename, wadfiles[wadnum]->filename, MAX_WADPATH);
 		nameonly(wadfilename);
 
-		if (fasticmp(wadfilename, p->id.filename))
+		if (!stricmp(wadfilename, p->id.filename))
 		{
 			// Copy file name with full path
 			strlcpy(p->id.filename, wadfiles[wadnum]->filename, MAX_WADPATH);
@@ -902,7 +901,7 @@ void SV_FileSendTicker(void)
 
 		if (ram)
 		{
-			memcpy(p->data, &f->id.ram[transfer[i].position], size);
+			M_Memcpy(p->data, &f->id.ram[transfer[i].position], size);
 		}
 		else if (fread(p->data, 1, size, transferFiles[f->fileid].file) != size)
 		{
@@ -947,17 +946,17 @@ void Got_Filetxpak(void)
 	char *filename = file->filename;
 	static INT32 filetime = 0;
 
-	if ((fastcmp(filename, "srb2.srb")
-		//|| fastcmp(filename, "srb2.wad")
-		//|| fastcmp(filename, "patch.dta")
-		//|| fastcmp(filename, "music.dta")
-		|| fastcmp(filename, "gfx.kart")
-		|| fastcmp(filename, "textures.kart")
-		|| fastcmp(filename, "chars.kart")
-		|| fastcmp(filename, "maps.kart")
-		|| fastcmp(filename, "sounds.kart")
-		|| fastcmp(filename, "music.kart")
-		|| fastcmp(filename, "patch.kart")
+	if (!(strcmp(filename, "srb2.srb")
+		//&& strcmp(filename, "srb2.wad")
+		//&& strcmp(filename, "patch.dta")
+		//&& strcmp(filename, "music.dta")
+		&& strcmp(filename, "gfx.kart")
+		&& strcmp(filename, "textures.kart")
+		&& strcmp(filename, "chars.kart")
+		&& strcmp(filename, "maps.kart")
+		&& strcmp(filename, "sounds.kart")
+		&& strcmp(filename, "music.kart")
+		&& strcmp(filename, "patch.kart")
 		))
 		I_Error("Tried to download \"%s\"", filename);
 
@@ -1104,7 +1103,7 @@ void nameonly(char *s)
 			ns = &(s[j+1]);
 			len = strlen(ns);
 #if 0
-				memcpy(s, ns, len+1);
+				M_Memcpy(s, ns, len+1);
 #else
 				memmove(s, ns, len+1);
 #endif
@@ -1198,7 +1197,7 @@ filestatus_t findfile(char *filename, const UINT8 *wantedmd5sum, boolean complet
 	}
 
 	// next, check SRB2's "home" directory (if non-'.')
-	if (!fastcmp(srb2home, "."))
+	if (strcmp(srb2home, "."))
 	{
 		homecheck = filesearch(filename, srb2home, wantedmd5sum, completepath, 10);
 
@@ -1210,7 +1209,7 @@ filestatus_t findfile(char *filename, const UINT8 *wantedmd5sum, boolean complet
 	}
 
 	// next, check SRB2's "path" directory (also if non-'.')
-	if (!fastcmp(srb2path, "."))
+	if (strcmp(srb2path, "."))
 	{
 		homecheck = filesearch(filename, srb2path, wantedmd5sum, completepath, 10);
 
@@ -1555,7 +1554,7 @@ CURLGetLogin (const char *url, HTTP_login ***return_prev_next)
 			( login = (*prev_next));
 			prev_next = &login->next
 	){
-		if (fastcmp(login->url, url) != 0)
+		if (strcmp(login->url, url) == 0)
 		{
 			if (return_prev_next)
 				(*return_prev_next) = prev_next;

src/d_protocol.c

@@ -211,12 +211,12 @@ void D_SetupProtocol(void)
 
 	if (result)
 	{
-		if (!fastcmp(buffer, "no"))
+		if (strcmp(buffer, "no") == 0)
 		{
 			fclose(fp);
 			return;
 		}
-		else if (fastcmp(buffer, exe_path))
+		else if (strcmp(buffer, exe_path) != 0)
 		{
 			// overwrite
 			fclose(fp);

src/dedicated/i_system.c

@@ -1709,9 +1709,9 @@ char *I_GetUserName(void)
 		strncpy(username, p, MAXPLAYERNAME);
 	}
 
-	if (!fastcmp(username, ""))
-		return username;
 
+	if (strcmp(username, "") != 0)
+		return username;
 	return NULL; // dummy for platform independent version
 }
 

src/discord.c

@@ -277,7 +277,7 @@ static void DRPC_HandleJoinRequest(const DiscordUser *requestUser)
 		while (append != NULL)
 		{
 			// CHECK FOR DUPES!! Ignore any that already exist from the same user.
-			if (fastcmp(newRequest->userID, append->userID))
+			if (!strcmp(newRequest->userID, append->userID))
 			{
 				Discord_Respond(newRequest->userID, DISCORD_REPLY_IGNORE);
 				DRPC_RemoveRequest(newRequest);
@@ -419,7 +419,7 @@ static const char *DRPC_GetServerIP(void)
 	// If you're connected
 	if (I_GetNodeAddress && (address = I_GetNodeAddress(servernode)) != NULL)
 	{
-		if (!fastcmp(address, "self"))
+		if (strcmp(address, "self"))
 		{
 			// We're not the server, so we could successfully get the IP!
 			// No need to do anything else :)
@@ -684,7 +684,7 @@ void DRPC_UpdatePresence(void)
 		// Character image
 		while (supportedSkins[checkSkin] != NULL)
 		{
-			if (fastcmp(skins[players[consoleplayer].skin].name, supportedSkins[checkSkin]))
+			if (!strcmp(skins[players[consoleplayer].skin].name, supportedSkins[checkSkin]))
 			{
 				snprintf(charimg, 21, "char%s", supportedSkins[checkSkin]);
 				discordPresence.smallImageKey = charimg;

src/doomdef.h

@@ -69,8 +69,6 @@ extern "C" {
 #include <sys/stat.h>
 #include <ctype.h>
 
-#include "fastcmp.h"
-
 #ifdef _WIN32
 #include <io.h>
 #endif
@@ -453,6 +451,11 @@ extern char savegamename[256];
 //TODO: delet this
 #define M_GetText(x) (x)
 
+FUNCINLINE static ATTRINLINE void *M_Memcpy(void *dest, const void *src, size_t n)
+{
+	return memcpy(dest, src, n);
+}
+
 char *va(const char *format, ...) FUNCPRINTF;
 char *M_GetToken(const char *inputString);
 char *sizeu1(size_t num);
@@ -648,9 +651,7 @@ extern const char *compdate, *comptime, *comprevision, *compbranch;
 
 #if defined (HAVE_CURL)
 #define MASTERSERVER
-#ifndef NOHOLEPUNCH
 #define HOLEPUNCH
-#endif
 #else
 #undef UPDATE_ALERT
 #endif

src/doomstat.h

@@ -116,10 +116,7 @@ extern UINT8 window_notinfocus; // are we in focus? (backend independant -- hand
 extern boolean nodrawers;
 extern boolean noblit;
 extern boolean lastdraw;
-
-#ifdef MOTIONBLUR
 extern INT32 postimgparam[MAXSPLITSCREENPLAYERS];
-#endif
 
 extern INT32 viewwindowx, viewwindowy;
 extern INT32 viewwidth;

src/f_finale.c

@@ -963,7 +963,6 @@ void F_StartTitleScreen(void)
 		finalecount = 0;
 	else
 		wipegamestate = GS_TITLESCREEN;
-
 	G_SetGamestate(GS_TITLESCREEN);
 	CON_ClearHUD();
 

src/f_wipe.c

@@ -257,7 +257,7 @@ static void F_DoWipe(fademask_t *fademask)
 				// shortcut - memcpy source to work
 				while (draw_linestogo--)
 				{
-					memcpy(w_base+relativepos, s_base+relativepos, draw_rowend-draw_rowstart);
+					M_Memcpy(w_base+relativepos, s_base+relativepos, draw_rowend-draw_rowstart);
 					relativepos += vid.width;
 				}
 			}
@@ -266,7 +266,7 @@ static void F_DoWipe(fademask_t *fademask)
 				// shortcut - memcpy target to work
 				while (draw_linestogo--)
 				{
-					memcpy(w_base+relativepos, e_base+relativepos, draw_rowend-draw_rowstart);
+					M_Memcpy(w_base+relativepos, e_base+relativepos, draw_rowend-draw_rowstart);
 					relativepos += vid.width;
 				}
 			}

src/filesrch.c

@@ -198,7 +198,7 @@ filestatus_t filesearch(char *filename, const char *startpath, const UINT8 *want
 
 				for (; *path != NULL; path++)
 				{
-					if (fasticmp(*path, dent->d_name))
+					if (strcasecmp(*path, dent->d_name) == 0)
 					{
 						skipfolder = true;
 						break;
@@ -212,7 +212,7 @@ filestatus_t filesearch(char *filename, const char *startpath, const UINT8 *want
 				}
 			}
 
-			if (!fasticmp(".git", dent->d_name) // sanity if you're weird like me
+			if (strcasecmp(".git", dent->d_name) // sanity if you're weird like me
 				&& (dirhandle[depthleft-1] = opendir(searchpath)) != NULL)
 			{
 				// Got read permissions!
@@ -227,7 +227,7 @@ filestatus_t filesearch(char *filename, const char *startpath, const UINT8 *want
 
 		// I am a file!
 
-		if (!fasticmp(searchname, dent->d_name))
+		if (strcasecmp(searchname, dent->d_name))
 			continue; // Not what we're looking for!
 
 		switch (checkfilemd5(searchpath, wantedmd5sum))
@@ -353,7 +353,7 @@ void searchfilemenu(char *tempname)
 		{
 			for (i = first; i < sizedirmenu; i++)
 			{
-				if (fastcmp(dirmenu[i]+DIR_STRING, tempname))
+				if (!strcmp(dirmenu[i]+DIR_STRING, tempname))
 				{
 					dir_on[menudepthleft] = i;
 					break;
@@ -400,7 +400,7 @@ void searchfilemenu(char *tempname)
 	{
 		if (filemenucmp(coredirmenu[i]+DIR_STRING, localmenusearch))
 		{
-			if (tempname && fastcmp(coredirmenu[i]+DIR_STRING, tempname))
+			if (tempname && !strcmp(coredirmenu[i]+DIR_STRING, tempname))
 			{
 				dir_on[menudepthleft] = sizedirmenu;
 				Z_Free(tempname);
@@ -478,14 +478,14 @@ boolean preparefilemenu(boolean samedepth, boolean replayhut)
 
 				if (replayhut)
 				{
-					if (!fasticmp(".lmp", dent->d_name+len-5))
+					if (strcasecmp(".lmp", dent->d_name+len-5))
 						continue; // Not a replay
 				}
 				else if (!cv_addons_showall.value)
 				{
 					UINT8 ext;
 					for (ext = 0; ext < NUM_EXT_TABLE; ext++)
-						if (fasticmp(exttable[ext]+1, dent->d_name+len-(exttable[ext][0])))
+						if (!strcasecmp(exttable[ext]+1, dent->d_name+len-(exttable[ext][0])))
 							break; // extension comparison
 
 					if (ext == NUM_EXT_TABLE)
@@ -559,7 +559,7 @@ boolean preparefilemenu(boolean samedepth, boolean replayhut)
 
 				if (replayhut)
 				{
-					if (!fasticmp(".lmp", dent->d_name+len-5))
+					if (strcasecmp(".lmp", dent->d_name+len-5))
 						continue; // Not a replay
 
 					ext = EXT_TXT; // This isn't used anywhere but better safe than sorry for messing with this...
@@ -567,7 +567,7 @@ boolean preparefilemenu(boolean samedepth, boolean replayhut)
 				else
 				{
 					for (; ext < NUM_EXT_TABLE; ext++)
-						if (fasticmp(exttable[ext]+1, dent->d_name+len-(exttable[ext][0])))
+						if (!strcasecmp(exttable[ext]+1, dent->d_name+len-(exttable[ext][0])))
 							break; // extension comparison
 
 					if (ext == NUM_EXT_TABLE && !cv_addons_showall.value)
@@ -587,7 +587,7 @@ boolean preparefilemenu(boolean samedepth, boolean replayhut)
 								nameonly(filenamebuf[i]);
 							}
 
-							if (!fastcmp(dent->d_name, filenamebuf[i]))
+							if (strcmp(dent->d_name, filenamebuf[i]))
 								continue;
 
 							if (cv_addons_md5.value && !checkfilemd5(menupath, wadfiles[i]->md5sum))
@@ -598,11 +598,11 @@ boolean preparefilemenu(boolean samedepth, boolean replayhut)
 					}
 					else if (ext == EXT_TXT)
 					{
-						if (!strncmp(dent->d_name, "log-", 4) || fastcmp(dent->d_name, "errorlog.txt"))
+						if (!strncmp(dent->d_name, "log-", 4) || !strcmp(dent->d_name, "errorlog.txt"))
 							ext |= EXT_LOADED;
 					}
 
-					if (fastcmp(dent->d_name, configfile))
+					if (!strcmp(dent->d_name, configfile))
 						ext |= EXT_LOADED;
 				}
 

src/g_game.c

@@ -59,15 +59,15 @@
 #include "discord.h"
 #endif
 
-gameaction_t gameaction = 0;
+gameaction_t gameaction;
 gamestate_t gamestate = GS_NULL;
 UINT8 ultimatemode = false;
 
-boolean botingame = false;
-UINT8 botskin = 0;
-UINT8 botcolor = 0;
+boolean botingame;
+UINT8 botskin;
+UINT8 botcolor;
 
-JoyType_t Joystick[MAXSPLITSCREENPLAYERS] = {};
+JoyType_t Joystick[MAXSPLITSCREENPLAYERS];
 
 // 1024 bytes is plenty for a savegame
 #define SAVEGAMESIZE (1024)
@@ -83,10 +83,10 @@ static void G_DoContinued(void);
 static void G_DoWorldDone(void);
 static void G_DoStartVote(void);
 
-music_t mapmusic = {};
+music_t mapmusic;
 
 INT16 gamemap = 1;
-INT16 maptol = 0;
+INT16 maptol;
 UINT8 globalweather = 0;
 INT32 curWeather = PRECIP_NONE;
 INT32 cursaveslot = -1; // Auto-save 1p savegame slot
@@ -97,29 +97,29 @@ UINT16 mainwads = 0;
 boolean modifiedgame = false; // Set if homebrew PWAD stuff has been added.
 boolean majormods = false; // Set if Lua/Gameplay SOC/replacement map has been added.
 boolean savemoddata = false;
-UINT8 paused = 0;
+UINT8 paused;
 UINT8 modeattacking = ATTACKING_NONE;
 boolean imcontinuing = false;
 boolean runemeraldmanager = false;
 
-boolean netgame = false; // only true if packets are broadcast
-boolean multiplayer = false;
-boolean playeringame[MAXPLAYERS] = {};
-boolean addedtogame = false;
-player_t players[MAXPLAYERS] = {};
+boolean netgame; // only true if packets are broadcast
+boolean multiplayer;
+boolean playeringame[MAXPLAYERS];
+boolean addedtogame;
+player_t players[MAXPLAYERS];
 
-INT32 consoleplayer = 0; // player taking events and displaying
-INT32 displayplayers[MAXSPLITSCREENPLAYERS] = {}; // view being displayed
+INT32 consoleplayer; // player taking events and displaying
+INT32 displayplayers[MAXSPLITSCREENPLAYERS] = {0}; // view being displayed
 
-tic_t gametic = 0;
-tic_t levelstarttic = 0; // gametic at level start
-UINT32 totalrings = 0; // for intermission
-INT16 lastmap = 0; // last level you were at (returning from special stages)
-tic_t timeinmap = 0; // Ticker for time spent in level (used for levelcard display)
+tic_t gametic;
+tic_t levelstarttic; // gametic at level start
+UINT32 totalrings; // for intermission
+INT16 lastmap; // last level you were at (returning from special stages)
+tic_t timeinmap; // Ticker for time spent in level (used for levelcard display)
 
-INT16 spstage_start = 0;
-INT16 sstage_start = 0;
-INT16 sstage_end = 0;
+INT16 spstage_start;
+INT16 sstage_start;
+INT16 sstage_end;
 
 boolean looptitle = true;
 boolean useNightsSS = false;
@@ -134,42 +134,42 @@ boolean countdowntimeup = false;
 
 cutscene_t *cutscenes[128];
 
-INT16 nextmapoverride = 0;
-boolean skipstats = false;
+INT16 nextmapoverride;
+boolean skipstats;
 
 // Pointers to each CTF flag
-mobj_t *redflag = NULL;
-mobj_t *blueflag = NULL;
+mobj_t *redflag;
+mobj_t *blueflag;
 // Pointers to CTF spawn location
-mapthing_t *rflagpoint = NULL;
-mapthing_t *bflagpoint = NULL;
+mapthing_t *rflagpoint;
+mapthing_t *bflagpoint;
 
 struct quake quake;
 
 // Map Header Information
-mapheader_t* mapheaderinfo[NUMMAPS] = {};
+mapheader_t* mapheaderinfo[NUMMAPS] = {NULL};
 
 static boolean exitgame = false;
 static boolean retrying = false;
 
-UINT8 stagefailed = 0; // Used for GEMS BONUS? Also to see if you beat the stage.
+UINT8 stagefailed; // Used for GEMS BONUS? Also to see if you beat the stage.
 
-UINT16 emeralds = 0;
-UINT32 token = 0; // Number of tokens collected in a level
-UINT32 tokenlist = 0; // List of tokens collected
-INT32 tokenbits = 0; // Used for setting token bits
+UINT16 emeralds;
+UINT32 token; // Number of tokens collected in a level
+UINT32 tokenlist; // List of tokens collected
+INT32 tokenbits; // Used for setting token bits
 
 // Old Special Stage
-INT32 sstimer = 0; // Time allotted in the special stage
+INT32 sstimer; // Time allotted in the special stage
 
 boolean gamedataloaded = false;
 
 // Time attack data for levels
 // These are dynamically allocated for space reasons now
-recorddata_t *mainrecords[NUMMAPS] = {};
-UINT8 mapvisited[NUMMAPS] = {};
+recorddata_t *mainrecords[NUMMAPS]   = {NULL};
+UINT8 mapvisited[NUMMAPS];
 
-UINT32 bluescore = 0, redscore = 0; // CTF and Team Match team scores
+UINT32 bluescore, redscore; // CTF and Team Match team scores
 
 // ring count... for PERFECT!
 INT32 nummaprings = 0;
@@ -179,12 +179,12 @@ INT32 nummapboxes = 0;
 INT32 numgotboxes = 0;
 
 // Elminates unnecessary searching.
-boolean CheckForBustableBlocks = false;
-boolean CheckForBouncySector = false;
-boolean CheckForQuicksand = false;
-boolean CheckForMarioBlocks = false;
-boolean CheckForFloatBob = false;
-boolean CheckForReverseGravity = false;
+boolean CheckForBustableBlocks;
+boolean CheckForBouncySector;
+boolean CheckForQuicksand;
+boolean CheckForMarioBlocks;
+boolean CheckForFloatBob;
+boolean CheckForReverseGravity;
 
 // Powerup durations
 UINT16 invulntics = 20*TICRATE;
@@ -215,66 +215,67 @@ INT32 gameovertics = 15*TICRATE;
 UINT8 use1upSound = 0;
 UINT8 maxXtraLife = 2; // Max extra lives from rings
 
-UINT8 introtoplay = 0;
-UINT8 creditscutscene = 0;
+UINT8 introtoplay;
+UINT8 creditscutscene;
 
 // Emerald locations
-mobj_t *hunt1 = NULL;
-mobj_t *hunt2 = NULL;
-mobj_t *hunt3 = NULL;
+mobj_t *hunt1;
+mobj_t *hunt2;
+mobj_t *hunt3;
 
-tic_t racecountdown = 0, exitcountdown = 0; // for racing
+tic_t racecountdown, exitcountdown; // for racing
 
-fixed_t gravity = 0;
-fixed_t mapobjectscale = FRACUNIT;
+fixed_t gravity;
+fixed_t mapobjectscale;
 
 struct maplighting maplighting;
 
-INT16 autobalance = 0; //for CTF team balance
-INT16 teamscramble = 0; //for CTF team scramble
-INT16 scrambleplayers[MAXPLAYERS] = {}; //for CTF team scramble
-INT16 scrambleteams[MAXPLAYERS] = {}; //for CTF team scramble
-INT16 scrambletotal = 0; //for CTF team scramble
-INT16 scramblecount = 0; //for CTF team scramble
+INT16 autobalance; //for CTF team balance
+INT16 teamscramble; //for CTF team scramble
+INT16 scrambleplayers[MAXPLAYERS]; //for CTF team scramble
+INT16 scrambleteams[MAXPLAYERS]; //for CTF team scramble
+INT16 scrambletotal; //for CTF team scramble
+INT16 scramblecount; //for CTF team scramble
 
-INT32 cheats = 0; //for multiplayer cheat commands
+INT32 cheats; //for multiplayer cheat commands
 
 // SRB2Kart
 // Cvars that we don't want changed mid-game
-UINT8 gamespeed = 0; // Game's current speed (or difficulty, or cc, or etc); 0 for easy, 1 for normal, 2 for hard
+UINT8 gamespeed; // Game's current speed (or difficulty, or cc, or etc); 0 for easy, 1 for normal, 2 for hard
 boolean encoremode = false; // Encore Mode currently enabled?
-boolean prevencoremode = 0;
-boolean franticitems = 0; // Frantic items currently enabled?
-boolean comeback = 0; // Battle Mode's karma comeback is on/off
+boolean prevencoremode;
+boolean franticitems; // Frantic items currently enabled?
+boolean comeback; // Battle Mode's karma comeback is on/off
 
 // Voting system
-INT16 votelevels[4][2] = {}; // Levels that were rolled by the host
-SINT8 votes[MAXPLAYERS] = {}; // Each player's vote
-SINT8 pickedvote = 0; // What vote the host rolls
+INT16 votelevels[4][2]; // Levels that were rolled by the host
+SINT8 votes[MAXPLAYERS]; // Each player's vote
+SINT8 pickedvote; // What vote the host rolls
 
 // Server-sided, synched variables
-SINT8 battlewanted[4] = {}; // WANTED players in battle, worth x2 points
-tic_t wantedcalcdelay = 0; // Time before it recalculates WANTED
-tic_t indirectitemcooldown = 0; // Cooldown before any more Shrink, SPB, or any other item that works indirectly is awarded
-tic_t hyubgone = 0; // Cooldown before hyudoro is allowed to be rerolled
-tic_t mapreset = 0; // Map reset delay when enough players have joined an empty game
-UINT8 nospectategrief = 0; // How many players need to be in-game to eliminate last; for preventing spectate griefing
-boolean thwompsactive = 0; // Thwomps activate on lap 2
-SINT8 spbplace = 0; // SPB exists, give the person behind better items
-boolean startedInFreePlay = false; // Map was started in free play
+SINT8 battlewanted[4]; // WANTED players in battle, worth x2 points
+tic_t wantedcalcdelay; // Time before it recalculates WANTED
+tic_t indirectitemcooldown; // Cooldown before any more Shrink, SPB, or any other item that works indirectly is awarded
+tic_t hyubgone; // Cooldown before hyudoro is allowed to be rerolled
+tic_t mapreset; // Map reset delay when enough players have joined an empty game
+UINT8 nospectategrief; // How many players need to be in-game to eliminate last; for preventing spectate griefing
+boolean thwompsactive; // Thwomps activate on lap 2
+SINT8 spbplace; // SPB exists, give the person behind better items
+boolean startedInFreePlay; // Map was started in free play
 
 // Client-sided, unsynched variables (NEVER use in anything that needs to be synced with other players)
-boolean legitimateexit = 0; // Did this client actually finish the match?
-boolean comebackshowninfo = 0; // Have you already seen the "ATTACK OR PROTECT" message?
-static INT16 randmapbuffer[NUMMAPS+1] = {}; // Buffer for maps RandMap is allowed to roll
+boolean legitimateexit; // Did this client actually finish the match?
+boolean comebackshowninfo; // Have you already seen the "ATTACK OR PROTECT" message?
+static INT16 randmapbuffer[NUMMAPS+1]; // Buffer for maps RandMap is allowed to roll
 
-tic_t hidetime = 0;
+tic_t hidetime;
 
 // Grading
-UINT32 timesBeaten = 0;
-UINT32 timesBeatenWithEmeralds = 0;
+UINT32 timesBeaten;
+UINT32 timesBeatenWithEmeralds;
+//UINT32 timesBeatenUltimate;
 
-INT16 prevmap = 0, nextmap = 0;
+INT16 prevmap, nextmap;
 
 // Analog Control
 void SendWeaponPref(void);
@@ -469,7 +470,7 @@ consvar_t cv_cechotoggle = {"show_cecho", "On", CV_SAVE, cechotoggle_t, NULL, 0,
 #endif
 
 #ifdef SEENAMES
-player_t *seenplayer = NULL; // player we're aiming at right now
+player_t *seenplayer; // player we're aiming at right now
 #endif
 
 char player_names[MAXPLAYERS][MAXPLAYERNAME+1] =
@@ -492,7 +493,7 @@ char player_names[MAXPLAYERS][MAXPLAYERNAME+1] =
 	"Player 16"
 }; // SRB2kart - removed Players 17 through 32
 
-INT32 player_name_changes[MAXPLAYERS] = {};
+INT32 player_name_changes[MAXPLAYERS];
 
 INT16 rw_maximums[NUM_WEAPONS] =
 {
@@ -569,7 +570,6 @@ static void G_SetSaveGameModified(void)
 	{
 		if (!unlockables[i].conditionset)
 			continue;
-
 		if (!unlockables[i].unlocked)
 		{
 			unlockables[i].unlocked = true;
@@ -595,7 +595,7 @@ void G_SetGameModified(boolean silent, boolean major)
 	G_SetSaveGameModified();
 
 	if (!silent)
-		CONS_Alert(CONS_NOTICE, "Record Attack data will be saved to a seperate save file.\n");
+		CONS_Alert(CONS_NOTICE, M_GetText("Record Attack data will be saved to a seperate save file.\n"));
 
 	// If in record attack recording, cancel it.
 	if (modeattacking)
@@ -634,7 +634,6 @@ const char *G_BuildMapName(INT32 map)
 			map = gamemap-1;
 		else
 			map = prevmap;
-
 		map = G_RandMap(G_TOLFlag(cv_newgametype.value), map, false, 0, false, NULL)+1;
 	}
 
@@ -688,12 +687,11 @@ INT32 JoyAxis(axis_input_e axissel, UINT8 player)
 {
 	INT32 retaxis;
 	INT32 axisval;
-	INT32 deadzone;
 	boolean flp = false;
 
 	UINT8 pnum = player-1;
 
-	// find what axis to get
+	//find what axis to get
 	switch (axissel)
 	{
 		case AXISTURN:
@@ -752,33 +750,45 @@ INT32 JoyAxis(axis_input_e axissel, UINT8 player)
 	{
 		axisval /= 2;
 		retaxis = joyxmove[pnum][axisval];
-		deadzone = cv_xdeadzone[pnum].value;
+
+		if (retaxis < (-JOYAXISRANGE))
+			retaxis = -JOYAXISRANGE;
+		if (retaxis > (+JOYAXISRANGE))
+			retaxis = +JOYAXISRANGE;
+		if (!Joystick[pnum].bGamepadStyle && axissel < AXISDEAD)
+		{
+			const INT32 jdeadzone = ((JOYAXISRANGE-1) * cv_xdeadzone[pnum].value) >> FRACBITS;
+			if (abs(retaxis) <= jdeadzone)
+				return 0;
+		}
+
+		if (flp)
+			retaxis = -retaxis; // flip it around
+
+		return retaxis;
 	}
 	else
 	{
 		axisval--;
 		axisval /= 2;
 		retaxis = joyymove[pnum][axisval];
-		deadzone = cv_ydeadzone[pnum].value;
+
+		if (retaxis < (-JOYAXISRANGE))
+			retaxis = -JOYAXISRANGE;
+		if (retaxis > (+JOYAXISRANGE))
+			retaxis = +JOYAXISRANGE;
+		if (!Joystick[pnum].bGamepadStyle && axissel < AXISDEAD)
+		{
+			const INT32 jdeadzone = ((JOYAXISRANGE-1) * cv_ydeadzone[pnum].value) >> FRACBITS;
+			if (abs(retaxis) <= jdeadzone)
+				return 0;
+		}
+
+		if (flp)
+			retaxis = -retaxis; // flip it around
+
+		return retaxis;
 	}
-
-	if (retaxis < (-JOYAXISRANGE))
-		retaxis = -JOYAXISRANGE;
-	if (retaxis > (+JOYAXISRANGE))
-		retaxis = +JOYAXISRANGE;
-
-	if (!Joystick[pnum].bGamepadStyle && axissel < AXISDEAD)
-	{
-		const INT32 jdeadzone = ((JOYAXISRANGE-1) * deadzone) >> FRACBITS;
-
-		if (abs(retaxis) <= jdeadzone)
-			return 0;
-	}
-
-	if (flp)
-		retaxis = -retaxis; // flip it around
-
-	return retaxis;
 }
 
 boolean InputDown(INT32 gc, UINT8 p)
@@ -796,9 +806,9 @@ boolean InputDown(INT32 gc, UINT8 p)
 	}
 }
 
-INT32 localaiming[MAXSPLITSCREENPLAYERS] = {};
-angle_t localangle[MAXSPLITSCREENPLAYERS] = {};
-boolean camspin[MAXSPLITSCREENPLAYERS] = {};
+INT32 localaiming[MAXSPLITSCREENPLAYERS];
+angle_t localangle[MAXSPLITSCREENPLAYERS];
+boolean camspin[MAXSPLITSCREENPLAYERS];
 
 static fixed_t forwardmove[2] = {25<<FRACBITS>>16, 50<<FRACBITS>>16};
 static fixed_t sidemove[2] = {2<<FRACBITS>>16, 4<<FRACBITS>>16};
@@ -1200,7 +1210,7 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
 	if (gamestate == GS_LEVEL)
 		LUA_HookTiccmd(player, cmd, HOOK(PlayerCmd));
 
-	// Reset away view if a command is given.
+	//Reset away view if a command is given.
 	if (displayplayers[0] != consoleplayer && ssplayer == 1
 	&& (cmd->forwardmove || cmd->sidemove || cmd->buttons))
 	{
@@ -1209,12 +1219,12 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
 	}
 }
 
-ticcmd_t *G_CopyTiccmd(ticcmd_t* restrict dest, const ticcmd_t* restrict src, const size_t n)
+ticcmd_t *G_CopyTiccmd(ticcmd_t* dest, const ticcmd_t* src, const size_t n)
 {
-	return memcpy(dest, src, n*sizeof(*src));
+	return M_Memcpy(dest, src, n*sizeof(*src));
 }
 
-ticcmd_t *G_MoveTiccmd(ticcmd_t* restrict dest, const ticcmd_t* restrict src, const size_t n)
+ticcmd_t *G_MoveTiccmd(ticcmd_t* dest, const ticcmd_t* src, const size_t n)
 {
 	size_t i;
 	for (i = 0; i < n; i++)
@@ -1251,7 +1261,7 @@ static void G_DoLoadLevel(boolean resetplayer)
 
 	if (gamestate == GS_INTERMISSION)
 		Y_EndIntermission();
-	else if (gamestate == GS_VOTING)
+	if (gamestate == GS_VOTING)
 		Y_EndVote();
 
 	G_SetGamestate(GS_LEVEL);
@@ -2319,6 +2329,12 @@ void G_PlayerReborn(INT32 player)
 
 	if (gametype == GT_COOP)
 		P_FindEmerald(); // scan for emeralds to hunt for
+
+	// Reset Nights score and max link to 0 on death
+	p->maxlink = 0;
+
+	// If NiGHTS, find lowest mare to start with.
+	p->mare = 0;
 }
 
 //
@@ -2337,25 +2353,22 @@ static boolean G_CheckSpot(INT32 playernum, mapthing_t *mthing)
 	if (!mthing)
 		return false;
 
-	x = mthing->x << FRACBITS;
-	y = mthing->y << FRACBITS;
-
 	if (!players[playernum].mo)
 	{
 		// first spawn of level
 		for (i = 0; i < playernum; i++)
-		{
 			if (playeringame[i] && players[i].mo
-				&& players[i].mo->x == x
-				&& players[i].mo->y == y)
+				&& players[i].mo->x == mthing->x << FRACBITS
+				&& players[i].mo->y == mthing->y << FRACBITS)
 			{
 				return false;
 			}
-		}
-
 		return true;
 	}
 
+	x = mthing->x << FRACBITS;
+	y = mthing->y << FRACBITS;
+
 	if (!K_CheckPlayersRespawnColliding(playernum, x, y))
 		return false;
 
@@ -2755,7 +2768,7 @@ INT32 G_GetGametypeByName(const char *gametypestr)
 	INT32 i;
 
 	for (i = 0; i < NUMGAMETYPES; i++)
-		if (fasticmp(gametypestr, Gametype_Names[i]))
+		if (!stricmp(gametypestr, Gametype_Names[i]))
 			return i;
 
 	return -1; // unknown gametype
@@ -2857,23 +2870,17 @@ UINT8 G_GetGametypeColor(INT16 gt)
   */
 INT16 G_TOLFlag(INT32 pgametype)
 {
-	if (!multiplayer)         return TOL_SP;
-
-	switch (pgametype)
-	{
-		case GT_COOP:         return TOL_RACE; // SRB2kart
-		case GT_COMPETITION:  return TOL_COMPETITION;
-		case GT_RACE:         return TOL_RACE;
-		case GT_MATCH:        return TOL_MATCH;
-		case GT_TEAMMATCH:    return TOL_MATCH;
-		case GT_TAG:          return TOL_TAG;
-		case GT_HIDEANDSEEK:  return TOL_TAG;
-		case GT_CTF:          return TOL_CTF;
-		default:
-			CONS_Alert(CONS_ERROR, "Unknown gametype! %d\n", pgametype);
-			break;
-	}
+	if (!multiplayer)                 return TOL_SP;
+	if (pgametype == GT_COOP)         return TOL_RACE; // SRB2kart
+	if (pgametype == GT_COMPETITION)  return TOL_COMPETITION;
+	if (pgametype == GT_RACE)         return TOL_RACE;
+	if (pgametype == GT_MATCH)        return TOL_MATCH;
+	if (pgametype == GT_TEAMMATCH)    return TOL_MATCH;
+	if (pgametype == GT_TAG)          return TOL_TAG;
+	if (pgametype == GT_HIDEANDSEEK)  return TOL_TAG;
+	if (pgametype == GT_CTF)          return TOL_CTF;
 
+	CONS_Alert(CONS_ERROR, M_GetText("Unknown gametype! %d\n"), pgametype);
 	return INT16_MAX;
 }
 
@@ -3056,7 +3063,6 @@ static void G_DoCompleted(void)
 	K_StatRound();
 
 	for (i = 0; i < MAXPLAYERS; i++)
-	{
 		if (playeringame[i])
 		{
 			// SRB2Kart: exitlevel shouldn't get you the points
@@ -3066,10 +3072,8 @@ static void G_DoCompleted(void)
 				if (P_IsLocalPlayer(&players[i]))
 					j++;
 			}
-
 			G_PlayerFinishLevel(i); // take away cards and stuff
 		}
-	}
 
 	// play some generic music if there's no win/cool/lose music going on (for exitlevel commands)
 	if (G_RaceGametype() && ((multiplayer && demo.playback) || j == splitscreen+1) && (cv_inttime.value > 0))
@@ -3213,14 +3217,10 @@ void G_AfterIntermission(void)
 
 		return;
 	}
-
-	if (demo.recording)
-	{
-		if (modeattacking || demo.savemode != DSM_NOTSAVING)
-			G_SaveDemo();
-		else
-			G_ResetDemoRecording();
-	}
+	else if (demo.recording && (modeattacking || demo.savemode != DSM_NOTSAVING))
+		G_SaveDemo();
+	else if (demo.recording)
+		G_ResetDemoRecording();
 
 	if (modeattacking) // End the run.
 	{
@@ -3229,9 +3229,7 @@ void G_AfterIntermission(void)
 	}
 
 	if (mapheaderinfo[gamemap-1]->cutscenenum) // Start a custom cutscene.
-	{
 		F_StartCustomCutscene(mapheaderinfo[gamemap-1]->cutscenenum-1, false, false);
-	}
 	else
 	{
 		if (nextmap < 1100-1)
@@ -3368,13 +3366,10 @@ static void G_DoContinued(void)
 // when something new is added.
 void G_EndGame(void)
 {
-	if (demo.recording)
-	{
-		if (modeattacking || demo.savemode != DSM_NOTSAVING)
-			G_SaveDemo();
-		else
-			G_ResetDemoRecording();
-	}
+	if (demo.recording && (modeattacking || demo.savemode != DSM_NOTSAVING))
+		G_SaveDemo();
+	else if (demo.recording)
+		G_ResetDemoRecording();
 
 	// Only do evaluation and credits in coop games.
 	if (gametype == GT_COOP)
@@ -3384,7 +3379,6 @@ void G_EndGame(void)
 			F_StartCredits();
 			return;
 		}
-
 		if (nextmap == 1101-1) // end game with evaluation
 		{
 			F_StartGameEvaluation();
@@ -3469,8 +3463,7 @@ void G_LoadGameData(void)
 	if (READUINT32(save.p) != 0xFCAFE211)
 	{
 		const char *gdfolder = "the SRB2Kart folder";
-
-		if (!fastcmp(srb2home,"."))
+		if (strcmp(srb2home,"."))
 			gdfolder = srb2home;
 
 		Z_Free(save.buffer);
@@ -3484,8 +3477,9 @@ void G_LoadGameData(void)
 	modded = READUINT8(save.p);
 
 	// Aha! Someone's been screwing with the save file!
-	if ((modded && !savemoddata) ||
-		(modded != true && modded != false))
+	if ((modded && !savemoddata))
+		goto datacorrupt;
+	else if (modded != true && modded != false)
 		goto datacorrupt;
 
 	// TODO put another cipher on these things? meh, I don't care...
@@ -3550,11 +3544,10 @@ void G_LoadGameData(void)
 	return;
 
 	// Landing point for corrupt gamedata
-datacorrupt:
+	datacorrupt:
 	{
 		const char *gdfolder = "the SRB2Kart folder";
-
-		if (!fastcmp(srb2home,"."))
+		if (strcmp(srb2home,"."))
 			gdfolder = srb2home;
 
 		Z_Free(save.buffer);
@@ -3765,8 +3758,7 @@ void G_LoadGame(UINT32 slot, INT16 mapoverride)
 
 	memset(vcheck, 0, sizeof (vcheck));
 	sprintf(vcheck, "version %d", VERSION);
-
-	if (!fastcmp((const char *)save.p, (const char *)vcheck))
+	if (strcmp((const char *)save.p, (const char *)vcheck))
 	{
 #ifdef SAVEGAME_OTHERVERSIONS
 		M_StartMessage(M_GetText("Save game from different version.\nYou can load this savegame, but\nsaving afterwards will be disabled.\n\nDo you want to continue anyway?\n\n(Press 'Y' to confirm)\n"),
@@ -4044,7 +4036,7 @@ char *G_BuildMapTitle(INT32 mapnum)
 	if (!mapheaderinfo[mapnum-1])
 		P_AllocMapHeader(mapnum-1);
 
-	if (!fastcmp(mapheaderinfo[mapnum-1]->lvlttl, ""))
+	if (strcmp(mapheaderinfo[mapnum-1]->lvlttl, ""))
 	{
 		size_t len = 1;
 		const char *zonetext = NULL;
@@ -4271,21 +4263,18 @@ INT32 G_FindMapByNameOrCode(const char *mapname, char **realmapnamep)
 	{
 		if (mapname[0] == '*') // current map
 			return gamemap;
-
-		if (mapname[0] == '?' && mapheaderinfo[gamemap-1])
+		else if (mapname[0] == '?' && mapheaderinfo[gamemap-1])
 			return G_RandMap(G_TOLFlag(gametype), gamemap-1, false, 0, false, NULL)+1;
-
-		if (mapname[0] == '+' && mapheaderinfo[gamemap-1]) // next map
+		else if (mapname[0] == '+' && mapheaderinfo[gamemap-1]) // next map
 		{
 			newmapnum = mapheaderinfo[gamemap-1]->nextlevel;
-
 			if (newmapnum < 1 || newmapnum > NUMMAPS)
 			{
-				CONS_Alert(CONS_ERROR, "NextLevel (%d) is not a valid map.\n", newmapnum);
+				CONS_Alert(CONS_ERROR, M_GetText("NextLevel (%d) is not a valid map.\n"), newmapnum);
 				return 0;
 			}
-
-			return newmapnum;
+			else
+				return newmapnum;
 		}
 	}
 	else if (mapnamelen == 2)/* maybe two digit code */

src/g_input.c

@@ -262,6 +262,9 @@ 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));
 }
 
 //
@@ -1030,7 +1033,7 @@ INT32 G_KeyStringtoNum(const char *keystr)
 		return atoi(&keystr[3]);
 
 	for (j = 0; j < NUMKEYNAMES; j++)
-		if (fasticmp(keynames[j].name, keystr))
+		if (!stricmp(keynames[j].name, keystr))
 			return keynames[j].keynum;
 
 	return 0;
@@ -1330,15 +1333,14 @@ static void setcontrol(INT32 (*gc)[2])
 		player = 0;
 
 	namectrl = COM_Argv(1);
-	for (numctrl = 0; numctrl < num_gamecontrols && !fasticmp(namectrl, gamecontrolname[numctrl]); numctrl++)
+	for (numctrl = 0; numctrl < num_gamecontrols && stricmp(namectrl, gamecontrolname[numctrl]);
+		numctrl++)
 		;
-
 	if (numctrl == num_gamecontrols)
 	{
 		CONS_Printf(M_GetText("Control '%s' unknown\n"), namectrl);
 		return;
 	}
-
 	keynum1 = G_KeyStringtoNum(COM_Argv(2));
 	keynum2 = G_KeyStringtoNum(COM_Argv(3));
 	keynum = G_FilterKeyByVersion(numctrl, 0, player, &keynum1, &keynum2, &nestedoverride);

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_bsp.c

@@ -80,6 +80,14 @@ static poly_t *HWR_AllocPoly(INT32 numpts)
 	return p;
 }
 
+static polyvertex_t *HWR_AllocVertex(void)
+{
+	polyvertex_t *p;
+	size_t size = sizeof(polyvertex_t);
+	p = Z_Malloc(size, PU_HWRPLANE, NULL);
+	return p;
+}
+
 /// \todo polygons should be freed in reverse order for efficiency,
 /// for now don't free because it doesn't free in reverse order
 static void HWR_FreePoly(poly_t *poly)
@@ -629,7 +637,7 @@ static void WalkBSPNode(INT32 bspnum, poly_t *poly, UINT16 *leafnode, fixed_t *b
 		WalkBSPNode(bsp->children[0], frontpoly, &bsp->children[0],bsp->bbox[0]);
 
 		// copy child bbox
-		memcpy(bbox, bsp->bbox[0], 4*sizeof (fixed_t));
+		M_Memcpy(bbox, bsp->bbox[0], 4*sizeof (fixed_t));
 	}
 	else
 		I_Error("WalkBSPNode: no front poly?");
@@ -847,6 +855,100 @@ static INT32 SolveTProblem(void)
 	return numsplitpoly;
 }
 
+#define NEARDIST (0.75f)
+#define MYMAX    (10000000000000.0f)
+
+/* Adjust true segs (from the segs lump) to be exactely the same as
+ * plane polygone segs
+ * This also convert fixed_t point of segs in float (in moste case
+ * it share the same vertice
+ */
+static void AdjustSegs(void)
+{
+	size_t i, count;
+	INT32 j;
+	seg_t *lseg;
+	poly_t *p;
+	INT32 v1found = 0, v2found = 0;
+	float nearv1, nearv2;
+
+	for (i = 0; i < numsubsectors; i++)
+	{
+		count = subsectors[i].numlines;
+		lseg = &segs[subsectors[i].firstline];
+		p = extrasubsectors[i].planepoly;
+
+		if (!p)
+			continue;
+
+		for (; count--; lseg++)
+		{
+			float distv1,distv2,tmp;
+			nearv1 = nearv2 = MYMAX;
+
+			// Don't touch polyobject segs. We'll compensate
+			// for this when we go about drawing them.
+			if (lseg->polyseg)
+				continue;
+
+			for (j = 0; j < p->numpts; j++)
+			{
+				distv1 = p->pts[j].x - FIXED_TO_FLOAT(lseg->v1->x);
+				tmp    = p->pts[j].y - FIXED_TO_FLOAT(lseg->v1->y);
+				distv1 = distv1*distv1+tmp*tmp;
+
+				if (distv1 <= nearv1)
+				{
+					v1found = j;
+					nearv1 = distv1;
+				}
+
+				// the same with v2
+				distv2 = p->pts[j].x - FIXED_TO_FLOAT(lseg->v2->x);
+				tmp    = p->pts[j].y - FIXED_TO_FLOAT(lseg->v2->y);
+				distv2 = distv2*distv2+tmp*tmp;
+
+				if (distv2 <= nearv2)
+				{
+					v2found = j;
+					nearv2 = distv2;
+				}
+			}
+
+			if (nearv1 <= NEARDIST*NEARDIST)
+				// share vertice with segs
+				lseg->pv1 = &(p->pts[v1found]);
+			else
+			{
+				// BP: here we can do better, using PointInSeg and compute
+				// the right point position also split a polygone side to
+				// solve a T-intersection, but too mush work
+
+				// convert fixed vertex to float vertex
+				polyvertex_t *pv = HWR_AllocVertex();
+				pv->x = FIXED_TO_FLOAT(lseg->v1->x);
+				pv->y = FIXED_TO_FLOAT(lseg->v1->y);
+				lseg->pv1 = pv;
+			}
+
+			if (nearv2 <= NEARDIST*NEARDIST)
+				lseg->pv2 = &(p->pts[v2found]);
+			else
+			{
+				polyvertex_t *pv = HWR_AllocVertex();
+				pv->x = FIXED_TO_FLOAT(lseg->v2->x);
+				pv->y = FIXED_TO_FLOAT(lseg->v2->y);
+				lseg->pv2 = pv;
+			}
+
+			lseg->pv1->x2 = FloatToFixed(lseg->pv1->x);
+			lseg->pv1->y2 = FloatToFixed(lseg->pv1->y);
+			lseg->pv2->x2 = FloatToFixed(lseg->pv2->x);
+			lseg->pv2->y2 = FloatToFixed(lseg->pv2->y);
+		}
+	}
+}
+
 
 // call this routine after the BSP of a Doom wad file is loaded,
 // and it will generate all the convex polys for the hardware renderer
@@ -915,6 +1017,7 @@ void HWR_CreatePlanePolygons(INT32 bspnum)
 #else
 	SolveTProblem();
 #endif
+	AdjustSegs();
 
 #ifdef DEBUG_HWBSP
 	//debug debug..

src/hardware/hw_cache.c

@@ -346,7 +346,7 @@ static void HWR_GenerateTexture(INT32 texnum, GLMapTexture_t *gltex, boolean noe
 
 	gltex->mipmap.colormap = Z_Calloc(sizeof(*gltex->mipmap.colormap), PU_HWRPATCHCOLMIPMAP, NULL);
 	gltex->mipmap.colormap->source = colormap;
-	memcpy(gltex->mipmap.colormap->data, colormap, 256 * sizeof(UINT8));
+	M_Memcpy(gltex->mipmap.colormap->data, colormap, 256 * sizeof(UINT8));
 
 	blockwidth = texture->width;
 	blockheight = texture->height;
@@ -437,16 +437,8 @@ void HWR_MakePatch(const patch_t *patch, GLPatch_t *glPatch, GLMipmap_t *glMipma
 //             CACHING HANDLING
 // =================================================
 
-typedef struct
-{
-	GLMapTexture_t normal;
-#ifdef GLENCORE
-	GLMapTexture_t encore;
-#endif
-} GLMapTextureSet_t; // idk i suck at naming things
-
 static size_t gl_numtextures = 0; // Texture count
-static GLMapTextureSet_t *gl_textures; // For all textures
+static GLMapTexture_t *gl_textures; // For all textures
 
 static void HWR_FreeTextureData(patch_t *patch)
 {
@@ -586,12 +578,13 @@ void HWR_FreeMapTextures(void)
 {
 	size_t i;
 
-	for (i = 0; i < gl_numtextures; i++)
-	{
-		FreeMapTexture(&gl_textures[i].normal);
 #ifdef GLENCORE
-		FreeMapTexture(&gl_textures[i].encore);
+	for (i = 0; i < gl_numtextures*2; i++)
+#else
+	for (i = 0; i < gl_numtextures; i++)
 #endif
+	{
+		FreeMapTexture(&gl_textures[i]);
 	}
 
 	// now the heap don't have any 'user' pointing to our
@@ -610,7 +603,7 @@ static void HWR_PrecacheLevelFlats(void)
 
 	// special case for encore
 #ifdef GLENCORE
-	if (encoremap)
+	if (encoremode)
 	{
 		// go through all sectors to determine if it should be remapped for encore
 		for (i = 0; i < numsectors; i++)
@@ -685,6 +678,8 @@ static void HWR_PrecacheLevelTextures(void)
 		const line_t *line = &lines[i];
 #ifdef GLENCORE
 		const int noencoremap = ((encoremap && (line->flags & ML_TFERLINE)) ? 2 : 1);
+#else
+		const int noencoremap = 1;
 #endif
 		// two sides
 		for (j = 0; j < 2; j++)
@@ -700,14 +695,11 @@ static void HWR_PrecacheLevelTextures(void)
 			for (f = 0; f < 3; f++)
 			{
 				const INT32 texnum = sidetex[f];
-
 				if (texnum < 0 || texnum >= numtextures || texturepresent[texnum])
 					continue;
-#ifdef GLENCORE
+
 				texturepresent[texnum] = 1|noencoremap;
-#else
-				texturepresent[texnum] = 1;
-#endif
+
 				HWR_GetTexture(texnum, false);
 #ifdef GLENCORE
 				if (noencoremap & 2)
@@ -745,7 +737,7 @@ static void HWR_PrecacheLevelTextures(void)
 	free(texturepresent);
 }
 
-/*static void HWR_PrecacheLevelSprites(void)
+static void HWR_PrecacheLevelSprites(void)
 {
 	patch_t *spritepatch;
 	char *spritepresent;
@@ -808,30 +800,21 @@ static void HWR_PrecacheLevelTextures(void)
 		}
 	}
 	free(spritepresent);
-}*/
+}
 
 void HWR_PrecacheLevel(void)
 {
-	if (gamestate != GS_LEVEL || !cv_precachetextures.value)
+	if (gamestate != GS_LEVEL)
 		return;
 
 	// Precache flats.
 	HWR_PrecacheLevelFlats();
 
-	// prevent timeouts
-	NetKeepAlive();
-
 	// Precache textures.
 	HWR_PrecacheLevelTextures();
 
-	// prevent timeouts
-	NetKeepAlive();
-
 	// Precache sprites.
-	//HWR_PrecacheLevelSprites();
-
-	// prevent timeouts
-	//NetKeepAlive();
+	HWR_PrecacheLevelSprites();
 }
 
 void HWR_LoadMapTextures(size_t pnumtextures)
@@ -840,8 +823,11 @@ void HWR_LoadMapTextures(size_t pnumtextures)
 	HWR_FreeMapTextures();
 
 	gl_numtextures = pnumtextures;
-	gl_textures = calloc(gl_numtextures, sizeof(*gl_textures)); // *2 - 1 for encore-remapped texture and another for noencore texture (unused when not in encore), see: GLMapTextureSet_t
-
+#ifdef GLENCORE
+	gl_textures = calloc(gl_numtextures, sizeof (*gl_textures)*2); // *2 - 1 for encore-remapped texture and another for noencore texture (unused when not in encore)
+#else
+	gl_textures = calloc(gl_numtextures, sizeof (*gl_textures));
+#endif
 	if (gl_textures == NULL)
 		I_Error("HWR_LoadMapTextures: ran out of memory for OpenGL textures. Sad!");
 }
@@ -865,7 +851,7 @@ GLMapTexture_t *HWR_GetTexture(INT32 tex, boolean noencore)
 	// Every texture in memory, stored in the
 	// hardware renderer's bit depth format. Wow!
 #ifdef GLENCORE
-	gltex = (encoremap && !noencore) ? &gl_textures[tex].encore : &gl_textures[tex].normal;
+	gltex = &gl_textures[tex*2 + (encoremap && !noencore ? 0 : 1)];
 #else
 	gltex = &gl_textures[tex];
 #endif
@@ -979,7 +965,7 @@ void HWR_GetFlat(lumpnum_t flatlumpnum, boolean noencoremap)
 #endif
 		glMipmap->colormap = Z_Calloc(sizeof(*glMipmap->colormap), PU_HWRPATCHCOLMIPMAP, NULL);
 		glMipmap->colormap->source = colormap;
-		memcpy(glMipmap->colormap->data, colormap, 256 * sizeof(UINT8));
+		M_Memcpy(glMipmap->colormap->data, colormap, 256 * sizeof(UINT8));
 	}
 
 	if (!glMipmap->downloaded)
@@ -1077,7 +1063,7 @@ void HWR_GetMappedPatch(patch_t *patch, const UINT8 *colormap)
 		{
 			if (memcmp(glMipmap->colormap->data, colormap, 256 * sizeof(UINT8)))
 			{
-				memcpy(glMipmap->colormap->data, colormap, 256 * sizeof(UINT8));
+				M_Memcpy(glMipmap->colormap->data, colormap, 256 * sizeof(UINT8));
 				HWR_UpdatePatchMipmap(patch, glMipmap);
 			}
 			else
@@ -1100,7 +1086,7 @@ void HWR_GetMappedPatch(patch_t *patch, const UINT8 *colormap)
 
 	newMipmap->colormap = Z_Calloc(sizeof(*newMipmap->colormap), PU_HWRPATCHCOLMIPMAP, NULL);
 	newMipmap->colormap->source = colormap;
-	memcpy(newMipmap->colormap->data, colormap, 256 * sizeof(UINT8));
+	M_Memcpy(newMipmap->colormap->data, colormap, 256 * sizeof(UINT8));
 
 	HWR_LoadPatchMipmap(patch, newMipmap);
 }

src/hardware/hw_clip.c

@@ -80,13 +80,14 @@
 
 
 typedef struct clipnode_s
-{
-	struct clipnode_s *prev, *next;
-	angle_t start, end;
-} clipnode_t;
+	{
+		struct clipnode_s *prev, *next;
+		angle_t start, end;
+	} clipnode_t;
 
-static clipnode_t *freelist;
-static clipnode_t *cliphead;
+clipnode_t *freelist;
+clipnode_t *clipnodes;
+clipnode_t *cliphead;
 
 static clipnode_t * gld_clipnode_GetNew(void);
 static clipnode_t * gld_clipnode_NewRange(angle_t start, angle_t end);

src/hardware/hw_defs.h

@@ -117,7 +117,7 @@ typedef struct
 
 typedef struct
 {
-	FLOAT       x, y, z;           // position
+	FLOAT       x,y,z;           // position
 	FLOAT       anglex, angley, anglez;   // aimingangle / viewangle
 	FLOAT       scalex, scaley, scalez;
 	FLOAT       fovangle;

src/hardware/hw_draw.c

@@ -46,9 +46,9 @@ typedef struct
 	UINT8 image_descriptor; //18
 } ATTRPACK TGAHeader; // sizeof is 18
 
-static const UINT8 softwaretranstogl[11]    = {  0, 25, 51, 76,102,127,153,178,204,229,255};
-static const UINT8 softwaretranstogl_hi[11] = {  0, 51,102,153,204,255,255,255,255,255,255};
-static const UINT8 softwaretranstogl_lo[11] = {  0, 12, 24, 36, 48, 60, 71, 83, 95,111,127};
+static UINT8 softwaretranstogl[11]    = {  0, 25, 51, 76,102,127,153,178,204,229,255};
+static UINT8 softwaretranstogl_hi[11] = {  0, 51,102,153,204,255,255,255,255,255,255};
+static UINT8 softwaretranstogl_lo[11] = {  0, 12, 24, 36, 48, 60, 71, 83, 95,111,127};
 
 static const float FLOATBASEVIDWIDTH  = (float)BASEVIDWIDTH;
 static const float FLOATBASEVIDHEIGHT = (float)BASEVIDHEIGHT;
@@ -87,15 +87,15 @@ void HWR_DrawStretchyFixedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t p
 
 	switch (option & V_SCALEPATCHMASK)
 	{
-		case V_NOSCALEPATCH:
-			dup = 1.0f;
-			break;
-		case V_SMALLSCALEPATCH:
-			dup = (float)vid.smalldup;
-			break;
-		case V_MEDSCALEPATCH:
-			dup = (float)vid.meddup;
-			break;
+	case V_NOSCALEPATCH:
+		dup = 1.0f;
+		break;
+	case V_SMALLSCALEPATCH:
+		dup = (float)vid.smalldup;
+		break;
+	case V_MEDSCALEPATCH:
+		dup = (float)vid.meddup;
+		break;
 	}
 
 	fscalew = fscaleh = FIXED_TO_FLOAT(pscale);
@@ -269,15 +269,15 @@ void HWR_DrawCroppedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale,
 
 	switch (option & V_SCALEPATCHMASK)
 	{
-		case V_NOSCALEPATCH:
-			dup = 1.0f;
-			break;
-		case V_SMALLSCALEPATCH:
-			dup = (float)vid.smalldup;
-			break;
-		case V_MEDSCALEPATCH:
-			dup = (float)vid.meddup;
-			break;
+	case V_NOSCALEPATCH:
+		dup = 1.0f;
+		break;
+	case V_SMALLSCALEPATCH:
+		dup = (float)vid.smalldup;
+		break;
+	case V_MEDSCALEPATCH:
+		dup = (float)vid.meddup;
+		break;
 	}
 
 	fscale = FIXED_TO_FLOAT(pscale);
@@ -506,7 +506,7 @@ void HWR_FadeScreenMenuBack(UINT16 color, UINT8 strength)
 
 	if (color & 0xFF00) // Do COLORMAP fade.
 	{
-		if (cv_glscreentextures.value && HWR_ShouldUsePaletteRendering())
+		if (HWR_ShouldUsePaletteRendering() && cv_glscreentextures.value)
 		{
 			const hwdscreentexture_t scr_tex = HWD_SCREENTEXTURE_GENERIC2;
 
@@ -518,10 +518,12 @@ void HWR_FadeScreenMenuBack(UINT16 color, UINT8 strength)
 			GL_UnSetShader();
 			return;
 		}
-
-		Surf.PolyColor.rgba = UINT2RGBA(0x01010160);
-		Surf.PolyColor.s.alpha = (strength*8);
-		poly_flags |= PF_Translucent;
+		else
+		{
+			Surf.PolyColor.rgba = UINT2RGBA(0x01010160);
+			Surf.PolyColor.s.alpha = (strength*8);
+			poly_flags |= PF_Translucent;
+		}
 	}
 	else // Do TRANSMAP** fade.
 	{
@@ -888,13 +890,11 @@ void HWR_DrawFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 color)
 
 	if (fx >= vid.width || fy >= vid.height)
 		return;
-
 	if (fx < 0)
 	{
 		fw += fx;
 		fx = 0;
 	}
-
 	if (fy < 0)
 	{
 		fh += fy;
@@ -906,7 +906,6 @@ void HWR_DrawFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 color)
 
 	if (fx + fw > vid.width)
 		fw = fvw - fx;
-
 	if (fy + fh > vid.height)
 		fh = fvh - fy;
 

src/hardware/hw_main.cpp

@@ -75,19 +75,19 @@ boolean gl_drawing_stencil = false;
 
 static INT32 current_bsp_culling_distance = 0;
 
-FTransform atransform = {};
+FTransform atransform;
 
 // Float variants of viewx, viewy, viewz, etc.
 static float gl_viewx, gl_viewy, gl_viewz;
-float gl_viewsin = 0.0f, gl_viewcos = 0.0f;
+float gl_viewsin, gl_viewcos;
 static float gl_viewludsin, gl_viewludcos;
 static angle_t gl_aimingangle;
 
-seg_t    *gl_curline = NULL;
-side_t   *gl_sidedef = NULL;
-line_t   *gl_linedef = NULL;
-sector_t *gl_frontsector = NULL;
-sector_t *gl_backsector = NULL;
+seg_t *gl_curline;
+side_t *gl_sidedef;
+line_t *gl_linedef;
+sector_t *gl_frontsector;
+sector_t *gl_backsector;
 
 // values for the far clipping plane
 static constexpr float clipping_distances[] = {1024.0f, 2048.0f, 4096.0f, 6144.0f, 8192.0f, 12288.0f, 16384.0f};
@@ -458,8 +458,8 @@ void HWR_Lighting(FSurfaceInfo *Surface, INT32 light_level, extracolormap_t *col
 	// in palette rendering mode, this is not needed since it properly takes the changes to the palette itself
 	if (!HWR_ShouldUsePaletteRendering())
 	{
-		V_CubeApply(&tint_color);
-		V_CubeApply(&fade_color);
+		V_CubeApply(&tint_color.s.red, &tint_color.s.green, &tint_color.s.blue);
+		V_CubeApply(&fade_color.s.red, &fade_color.s.green, &fade_color.s.blue);
 	}
 
 	Surface->PolyColor.rgba = poly_color.rgba;
@@ -728,9 +728,6 @@ static void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, bool
 
 		for (i = 0; i < subsector->numlines; i++, line++)
 		{
-			if (line->polyseg)
-				continue;
-
 			line_t* ld = line->linedef;
 
 			// this check sucks and is a hotspot lel
@@ -743,11 +740,27 @@ static void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, bool
 			P_ClosestPointOnLine(viewx, viewy, ld, &v);
 			dist = FixedToFloat(R_PointToDist(v.x, v.y));
 
-			x1 = (line->fv1.x);
-			y1 = (line->fv1.y);
+			if (line->pv1)
+			{
+				x1 = line->pv1->x;
+				y1 = line->pv1->y;
+			}
+			else
+			{
+				x1 = FixedToFloat(line->v1->x);
+				y1 = FixedToFloat(line->v1->y);
+			}
 
-			xd = (line->fv2.x) - x1;
-			yd = (line->fv2.y) - y1;
+			if (line->pv2)
+			{
+				xd = line->pv2->x - x1;
+				yd = line->pv2->y - y1;
+			}
+			else
+			{
+				xd = FixedToFloat(line->v2->x) - x1;
+				yd = FixedToFloat(line->v2->y) - y1;
+			}
 
 			// Based on the seg length and the distance from the line, split horizon into multiple poly sets to reduce distortion
 			dist = sqrtf((xd*xd) + (yd*yd)) / dist / 16.0f;
@@ -811,11 +824,11 @@ static void HWR_DrawSegsSplats(FSurfaceInfo * pSurf)
 
 	M_ClearBox(segbbox);
 	M_AddToBox(segbbox,
-		FloatToFixed(gl_curline->fv1.x),
-		FloatToFixed(gl_curline->fv1.y));
+		FloatToFixed(gl_curline->pv1->x),
+		FloatToFixed(gl_curline->pv1->y));
 	M_AddToBox(segbbox,
-		FloatToFixed(gl_curline->fv2.x),
-		FloatToFixed(gl_curline->fv2.y));
+		FloatToFixed(gl_curline->pv2->x),
+		FloatToFixed(gl_curline->pv2->y));
 
 	splat = (wallsplat_t *)gl_curline->linedef->splats;
 	for (; splat; splat = splat->next)
@@ -1224,7 +1237,7 @@ static void HWR_DrawSkyWall(FOutVector *wallVerts, FSurfaceInfo *Surf)
 // Returns true if the midtexture is visible, and false if... it isn't...
 static inline boolean HWR_BlendMidtextureSurface(FSurfaceInfo *pSurf)
 {
-	FUINT blendmode = PF_Masked | PF_Translucent;
+	FUINT blendmode = PF_Masked;
 
 	pSurf->PolyColor.s.alpha = 0xFF;
 
@@ -1246,6 +1259,8 @@ static inline boolean HWR_BlendMidtextureSurface(FSurfaceInfo *pSurf)
 			case 256:
 				if (gl_linedef->blendmode)
 					blendmode = HWR_SurfaceBlend(gl_linedef->blendmode, R_GetLinedefTransTable(gl_linedef->alpha), pSurf);
+				else
+					blendmode = PF_Translucent;
 				break;
 			default:
 				if (gl_linedef->blendmode)
@@ -1257,6 +1272,8 @@ static inline boolean HWR_BlendMidtextureSurface(FSurfaceInfo *pSurf)
 				}
 				else if (gl_linedef->alpha >= 0 && gl_linedef->alpha < FRACUNIT)
 					blendmode = HWR_TranstableToAlpha(R_GetLinedefTransTable(gl_linedef->alpha), pSurf);
+				else
+					blendmode = PF_Masked;
 				break;
 		}
 	}
@@ -1306,24 +1323,34 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
 
 	const boolean noencore = (gl_linedef->flags & ML_TFERLINE);
 
-	v1x = gl_curline->v1->x;
-	v1y = gl_curline->v1->y;
-	v2x = gl_curline->v2->x;
-	v2y = gl_curline->v2->y;
-
-	if (gl_curline->polyseg)
+	if (LIKELY(gl_curline->pv1))
 	{
-		vs.x = FixedToFloat(v1x);
-		vs.y = FixedToFloat(v1y);
-		ve.x = FixedToFloat(v2x);
-		ve.y = FixedToFloat(v2y);
+		vs.x = gl_curline->pv1->x;
+		vs.y = gl_curline->pv1->y;
+		v1x = gl_curline->pv1->x2;
+		v1y = gl_curline->pv1->y2;
 	}
 	else
 	{
-		vs.x = gl_curline->fv1.x;
-		vs.y = gl_curline->fv1.y;
-		ve.x = gl_curline->fv2.x;
-		ve.y = gl_curline->fv2.y;
+		vs.x = FixedToFloat(gl_curline->v1->x);
+		vs.y = FixedToFloat(gl_curline->v1->y);
+		v1x = gl_curline->v1->x;
+		v1y = gl_curline->v1->y;
+	}
+
+	if (LIKELY(gl_curline->pv2))
+	{
+		ve.x = gl_curline->pv2->x;
+		ve.y = gl_curline->pv2->y;
+		v2x = gl_curline->pv2->x2;
+		v2y = gl_curline->pv2->y2;
+	}
+	else
+	{
+		ve.x = FixedToFloat(gl_curline->v2->x);
+		ve.y = FixedToFloat(gl_curline->v2->y);
+		v2x = gl_curline->v2->x;
+		v2y = gl_curline->v2->y;
 	}
 
 #define SLOPEPARAMS(slope, end1, end2, normalheight) \
@@ -2175,11 +2202,27 @@ static boolean CheckClip(sector_t * afrontsector, sector_t * abacksector)
 	{
 		fixed_t v1x, v1y, v2x, v2y; // the seg's vertexes as fixed_t
 
-		v1x = gl_curline->v1->x;
-		v1y = gl_curline->v1->y;
+		if (LIKELY(gl_curline->pv1))
+		{
+			v1x = gl_curline->pv1->x2;
+			v1y = gl_curline->pv1->y2;
+		}
+		else
+		{
+			v1x = gl_curline->v1->x;
+			v1y = gl_curline->v1->y;
+		}
 
-		v2x = gl_curline->v2->x;
-		v2y = gl_curline->v2->y;
+		if (LIKELY(gl_curline->pv2))
+		{
+			v2x = gl_curline->pv2->x2;
+			v2y = gl_curline->pv2->y2;
+		}
+		else
+		{
+			v2x = gl_curline->v2->x;
+			v2y = gl_curline->v2->y;
+		}
 
 #define SLOPEPARAMS(slope, end1, end2, normalheight) \
 		end1 = P_GetZAt(slope, v1x, v1y, normalheight); \
@@ -2384,11 +2427,27 @@ static void HWR_AddLine(seg_t *line)
 
 	gl_curline = line;
 
-	v1x = gl_curline->v1->x;
-	v1y = gl_curline->v1->y;
+	if (LIKELY(gl_curline->pv1))
+	{
+		v1x = gl_curline->pv1->x2;
+		v1y = gl_curline->pv1->y2;
+	}
+	else
+	{
+		v1x = gl_curline->v1->x;
+		v1y = gl_curline->v1->y;
+	}
 
-	v2x = gl_curline->v2->x;
-	v2y = gl_curline->v2->y;
+	if (LIKELY(gl_curline->pv2))
+	{
+		v2x = gl_curline->pv2->x2;
+		v2y = gl_curline->pv2->y2;
+	}
+	else
+	{
+		v2x = gl_curline->v2->x;
+		v2y = gl_curline->v2->y;
+	}
 
 	// OPTIMIZE: quickly reject orthogonal back sides.
 	angle1 = R_PointToAngle64(v1x, v1y);
@@ -3474,7 +3533,7 @@ static void HWR_DrawSpriteShadow(gl_vissprite_t *spr, patch_t *gpatch, GLPatch_t
 // This is expecting a pointer to an array containing 4 wallVerts for a sprite
 static void HWR_RotateSpritePolyToAim(gl_vissprite_t *spr, FOutVector *wallVerts, const boolean precip, const boolean papersprite)
 {
-	if (!cv_glspritebillboarding.value || cv_glshearing.value || papersprite)
+	if (!cv_glspritebillboarding.value || papersprite)
 	{
 		return;
 	}
@@ -4221,8 +4280,8 @@ static void HWR_AddTransparentWall(FOutVector *wallVerts, FSurfaceInfo *pSurf, I
 {
 	wallinfo_t *wallinfo = static_cast<wallinfo_t*>(HWR_CreateDrawNode(DRAWNODE_WALL));
 
-	memcpy(wallinfo->wallVerts, wallVerts, sizeof (wallinfo->wallVerts));
-	memcpy(&wallinfo->Surf, pSurf, sizeof (FSurfaceInfo));
+	M_Memcpy(wallinfo->wallVerts, wallVerts, sizeof (wallinfo->wallVerts));
+	M_Memcpy(&wallinfo->Surf, pSurf, sizeof (FSurfaceInfo));
 	wallinfo->texnum = texnum;
 	wallinfo->noencore = noencore;
 	wallinfo->blend = blend;
@@ -5310,12 +5369,8 @@ void HWR_SetTransform(float fpov)
 	HWR_SetTransformAiming(&atransform);
 	atransform.angley = (float)(viewangle>>ANGLETOFINESHIFT)*(FINEDEGREE);
 
-	// only needed for sprite billboarding
-	if (cv_glspritebillboarding.value && !cv_glshearing.value)
-	{
-		gl_viewludsin = FixedToFloat(FINECOSINE(gl_aimingangle>>ANGLETOFINESHIFT));
-		gl_viewludcos = FixedToFloat(-FINESINE(gl_aimingangle>>ANGLETOFINESHIFT));
-	}
+	gl_viewludsin = FixedToFloat(FINECOSINE(gl_aimingangle>>ANGLETOFINESHIFT));
+	gl_viewludcos = FixedToFloat(-FINESINE(gl_aimingangle>>ANGLETOFINESHIFT));
 
 	atransform.fovangle = fpov; // Tails
 	HWR_RollTransform(&atransform, viewroll);
@@ -5331,9 +5386,7 @@ void HWR_SetTransform(float fpov)
 			atransform.fliptype = TRANSFORM_FLIP;
 	}
 	else if (postimg & POSTIMG_MIRROR)
-	{
 		atransform.fliptype = TRANSFORM_MIRROR;
-	}
 
 	// Set transform.
 	GL_SetTransform(&atransform);
@@ -5787,7 +5840,7 @@ static void COM_HWR_glinfo(void)
 	{
 		argv = COM_Argv(i);
 
-		if (fastcmp(argv, "--list-extensions")|| fastcmp(argv, "-l"))
+		if (strcmp(argv, "--list-extensions") == 0 || strcmp(argv, "-l") == 0)
 		{
 			list_extensions = 1;
 		}
@@ -5909,7 +5962,7 @@ static void HWR_DoPostProcessor(player_t *player)
 
 		Surf.PolyColor.s.alpha = 0xc0; // match software mode
 
-		V_CubeApply(&Surf.PolyColor);
+		V_CubeApply(&Surf.PolyColor.s.red, &Surf.PolyColor.s.green, &Surf.PolyColor.s.blue);
 
 		GL_DrawPolygon(&Surf, v, 4, PF_Modulated|PF_Translucent|PF_NoTexture|PF_NoDepthTest);
 	}

src/hardware/hw_md2.c

@@ -72,9 +72,10 @@
 #include <errno.h>
 #endif
 
-md2_t md2_models[NUMSPRITES] = {};
-md2_t md2_playermodels[MAXSKINS] = {};
-md2_t md2_localplayermodels[MAXLOCALSKINS] = {};
+md2_t md2_models[NUMSPRITES];
+md2_t md2_playermodels[MAXSKINS];
+md2_t md2_localplayermodels[MAXLOCALSKINS];
+
 
 /*
  * free model
@@ -416,7 +417,7 @@ static void md2_loadTexture(md2_t *model)
 			size = w*h;
 			while (size--)
 			{
-				V_CubeApply(image);
+				V_CubeApply(&image->s.red, &image->s.green, &image->s.blue);
 				image++;
 			}
 		}
@@ -548,7 +549,7 @@ void HWR_InitMD2(void)
 	{
 		for (i = 0; i < NUMSPRITES; i++)
 		{
-			if (fasticmp(name, sprnames[i]))
+			if (stricmp(name, sprnames[i]) == 0)
 			{
 				md2_models[i].scale = scale;
 				md2_models[i].offset = offset;
@@ -560,7 +561,7 @@ void HWR_InitMD2(void)
 
 		for (s = 0; s < MAXSKINS; s++)
 		{
-			if (fasticmp(name, skins[s].name))
+			if (stricmp(name, skins[s].name) == 0)
 			{
 				md2_playermodels[s].skin = s;
 				md2_playermodels[s].scale = scale;
@@ -606,12 +607,11 @@ void HWR_AddPlayerMD2(int skin, boolean local) // For MD2's that were added afte
 		}
 	}
 
-	md2s = (local ? md2_localplayermodels : md2_playermodels);
-
+	md2s = ( (local) ? md2_localplayermodels : md2_playermodels );
 	// Check for any MD2s that match the names of player skins!
 	while (fscanf(f, "%19s %31s %f %f", name, filename, &scale, &offset) == 4)
 	{
-		if (fasticmp(name, K_GetSkinArray(local)[skin].name))
+		if (stricmp(name, K_GetSkinArray(local)[skin].name) == 0)
 		{
 			md2s[skin].skin = skin;
 			md2s[skin].scale = scale;
@@ -650,7 +650,6 @@ void HWR_AddSpriteMD2(size_t spritenum) // For MD2s that were added after startu
 	if (!f)
 	{
 		f = fopen(va("%s"PATHSEP"%s", srb2path, "mdls.dat"), "rt");
-
 		if (!f)
 		{
 			CONS_Printf("%s %s\n", M_GetText("Error while loading mdls.dat:"), strerror(errno));
@@ -662,7 +661,7 @@ void HWR_AddSpriteMD2(size_t spritenum) // For MD2s that were added after startu
 	// Check for any MD2s that match the names of sprite names!
 	while (fscanf(f, "%19s %31s %f %f", name, filename, &scale, &offset) == 4)
 	{
-		if (fasticmp(name, sprnames[spritenum]))
+		if (stricmp(name, sprnames[spritenum]) == 0)
 		{
 			md2_models[spritenum].scale = scale;
 			md2_models[spritenum].offset = offset;
@@ -1057,7 +1056,7 @@ static void HWR_GetBlendedTexture(patch_t *patch, patch_t *blendgpatch, INT32 sk
 			{
 				if (memcmp(glMipmap->colormap->data, colormap, 256 * sizeof(UINT8)))
 				{
-					memcpy(glMipmap->colormap->data, colormap, 256 * sizeof(UINT8));
+					M_Memcpy(glMipmap->colormap->data, colormap, 256 * sizeof(UINT8));
 					HWR_CreateBlendedTexture(patch, blendgpatch, glMipmap, skinnum, color);
 					GL_UpdateTexture(glMipmap);
 				}
@@ -1084,7 +1083,7 @@ static void HWR_GetBlendedTexture(patch_t *patch, patch_t *blendgpatch, INT32 sk
 
 	newMipmap->colormap = Z_Calloc(sizeof(*newMipmap->colormap), PU_HWRPATCHCOLMIPMAP, NULL);
 	newMipmap->colormap->source = colormap;
-	memcpy(newMipmap->colormap->data, colormap, 256 * sizeof(UINT8));
+	M_Memcpy(newMipmap->colormap->data, colormap, 256 * sizeof(UINT8));
 
 	HWR_CreateBlendedTexture(patch, blendgpatch, newMipmap, skinnum, color);
 

src/hardware/hw_model.c

@@ -126,7 +126,7 @@ tag_t *GetTagByName(model_t *model, char *name, int frame)
 		int i;
 		for (i = 0; i < model->numTags; i++)
 		{
-			if (fasticmp(iterator[i].name, name))
+			if (!stricmp(iterator[i].name, name))
 				return &iterator[i];
 		}
 	}
@@ -163,22 +163,22 @@ model_t *LoadModel(const char *filename, int ztag)
 		return NULL;
 	}
 
-	if (fastcmp(extension, ".md3"))
+	if (!strcmp(extension, ".md3"))
 	{
 		if (!(model = MD3_LoadModel(filename, ztag, false)))
 			return NULL;
 	}
-	else if (fastcmp(extension, ".md3s")) // MD3 that will be converted in memory to use full floats
+	else if (!strcmp(extension, ".md3s")) // MD3 that will be converted in memory to use full floats
 	{
 		if (!(model = MD3_LoadModel(filename, ztag, true)))
 			return NULL;
 	}
-	else if (fastcmp(extension, ".md2"))
+	else if (!strcmp(extension, ".md2"))
 	{
 		if (!(model = MD2_LoadModel(filename, ztag, false)))
 			return NULL;
 	}
-	else if (fastcmp(extension, ".md2s"))
+	else if (!strcmp(extension, ".md2s"))
 	{
 		if (!(model = MD2_LoadModel(filename, ztag, true)))
 			return NULL;
@@ -242,7 +242,7 @@ void GenerateVertexNormals(model_t *model)
 			float *vertPtr = frame->vertices;
 			float *oldNormals;
 
-			memcpy(newNormals, frame->normals, sizeof(float)*3*mesh->numTriangles*3);
+			M_Memcpy(newNormals, frame->normals, sizeof(float)*3*mesh->numTriangles*3);
 
 			for (k = 0; k < mesh->numVertices; k++)
 			{
@@ -402,7 +402,7 @@ void Optimize(model_t *model)
 				char *destByte;
 				char *srcByte;
 
-				memcpy(&newMesh->uvs[uvCount],
+				M_Memcpy(&newMesh->uvs[uvCount],
 					curMesh->uvs,
 					sizeof(float)*2*curMesh->numTriangles*3);
 
@@ -410,13 +410,13 @@ void Optimize(model_t *model)
 
 				dest = (float*)newMesh->frames[0].vertices;
 				src = (float*)curMesh->frames[0].vertices;
-				memcpy(&dest[vertCount],
+				M_Memcpy(&dest[vertCount],
 					src,
 					sizeof(float)*3*curMesh->numTriangles*3);
 
 				dest = (float*)newMesh->frames[0].normals;
 				src = (float*)curMesh->frames[0].normals;
-				memcpy(&dest[vertCount],
+				M_Memcpy(&dest[vertCount],
 					src,
 					sizeof(float)*3*curMesh->numTriangles*3);
 
@@ -427,7 +427,7 @@ void Optimize(model_t *model)
 
 				if (srcByte)
 				{
-					memcpy(&destByte[colorCount],
+					M_Memcpy(&destByte[colorCount],
 						srcByte,
 						sizeof(char)*4*curMesh->numTriangles*3);
 				}

src/hardware/hw_portal.c

@@ -30,7 +30,7 @@
 
 SINT8 gl_portal_state = GLPORTAL_OFF;
 
-gl_portallist_t *currentportallist = NULL;
+gl_portallist_t *currentportallist;
 
 // clip the area outside the portal destination window
 void HWR_PortalClipping(gl_portal_t *portal)
@@ -168,10 +168,8 @@ void HWR_RenderPortal(gl_portal_t* portal, gl_portal_t* rootportal, const float
 
 	// go to portal frame lmao
 	HWR_PortalFrame(portal);
-
 	// call HWR_RenderViewpoint
 	HWR_RenderPortalViewpoint(portal, player, stencil_level + 1, true);
-
 	// return to current frame
 	if (rootportal)
 		HWR_PortalFrame(rootportal);

src/hardware/hw_shaders.c

@@ -201,7 +201,7 @@ static char *HWR_PreprocessShader(char *original)
 				CONS_Alert(CONS_ERROR, "HWR_PreprocessShader: Syntax error in #version. Expected version with 3 digits, but got %d digits.\n", version_number_len);
 				return NULL;
 			}
-			memcpy(shader_glsl_version, read_pos, 3);
+			M_Memcpy(shader_glsl_version, read_pos, 3);
 			ADVANCE(version_number_len)
 			version_len = (read_pos - original) - version_pos;
 			whitespace_len = strspn(read_pos, WHITESPACE_CHARS);
@@ -304,7 +304,7 @@ static char *HWR_PreprocessShader(char *original)
 	{
 		strcpy(write_pos, VERSION_PART);
 		write_pos += sizeof(VERSION_PART) - 1;
-		memcpy(write_pos, shader_glsl_version, 3);
+		M_Memcpy(write_pos, shader_glsl_version, 3);
 		write_pos += 3;
 		strcpy(write_pos, line_ending);
 		write_pos += line_ending_len;
@@ -344,7 +344,7 @@ static char *HWR_PreprocessShader(char *original)
 	}
 
 	// Copy the original shader.
-	memcpy(write_pos, read_pos, original_len);
+	M_Memcpy(write_pos, read_pos, original_len);
 
 	// Erase the original #version directive, if it exists and was copied.
 	if (new_len != original_len && version_pos != -1)
@@ -573,7 +573,7 @@ void HWR_LoadCustomShadersFromFile(UINT16 wadnum, boolean PK3)
 	size = W_LumpLengthPwad(wadnum, lump);
 
 	line = Z_Malloc(size+1, PU_STATIC, NULL);
-	memcpy(line, shaderdef, size);
+	M_Memcpy(line, shaderdef, size);
 	line[size] = '\0';
 
 	stoken = strtok(line, "\r\n ");
@@ -586,7 +586,7 @@ void HWR_LoadCustomShadersFromFile(UINT16 wadnum, boolean PK3)
 			goto skip_field;
 		}
 
-		if (fasticmp(stoken, "GLSL"))
+		if (!stricmp(stoken, "GLSL"))
 		{
 			value = strtok(NULL, "\r\n ");
 			if (!value)
@@ -596,9 +596,9 @@ void HWR_LoadCustomShadersFromFile(UINT16 wadnum, boolean PK3)
 				goto skip_lump;
 			}
 
-			if (fasticmp(value, "VERTEX"))
+			if (!stricmp(value, "VERTEX"))
 				shadertype = 1;
-			else if (fasticmp(value, "FRAGMENT"))
+			else if (!stricmp(value, "FRAGMENT"))
 				shadertype = 2;
 
 skip_lump:
@@ -624,7 +624,7 @@ skip_lump:
 
 			for (i = 0; shaderxlat[i].type; i++)
 			{
-				if (fasticmp(shaderxlat[i].type, stoken))
+				if (!stricmp(shaderxlat[i].type, stoken))
 				{
 					size_t shader_string_length;
 					char *shader_source;

src/hardware/r_opengl/r_opengl.c

@@ -110,7 +110,6 @@ GLint   screen_texsizew  = 512; // Power-of-two screen texture render resolution
 GLint   screen_texsizeh  = 512; // Power-of-two screen texture render resolution
 GLbyte  screen_depth     = 0;
 GLint maximumAnisotropy  = 0;
-boolean supportNPO2tex   = false;
 static GLboolean MipMap  = GL_FALSE;
 static GLint min_filter  = GL_LINEAR;
 static GLint mag_filter  = GL_LINEAR;
@@ -1177,20 +1176,12 @@ void GL_SetModelView(GLint w, GLint h)
 
 	screen_texsizew = screen_texsizeh = 512;
 
-	if (supportNPO2tex)
-	{
-		screen_texsizew = screen_width;
-		screen_texsizeh = screen_height;
-	}
-	else
-	{
-		// look for power of two that is large enough for the screen
-		while (screen_texsizew < w)
-			screen_texsizew <<= 1;
+	// look for power of two that is large enough for the screen
+	while (screen_texsizew < w)
+		screen_texsizew <<= 1;
 
-		while (screen_texsizeh < h)
-			screen_texsizeh <<= 1;
-	}
+	while (screen_texsizeh < h)
+		screen_texsizeh <<= 1;
 
 	pglGetIntegerv(GL_MAX_TEXTURE_SIZE, &maxtexsize); // Get the maximum supported texture size
 	if ((screen_texsizew > maxtexsize || screen_texsizeh > maxtexsize) && maxtexsize > 0)
@@ -1823,72 +1814,47 @@ static void GL_AllocTextureBuffer(GLMipmap_t *pTexInfo)
 	}
 }
 
-static void PadRGBABitmap(RGBA_t *tex, UINT16 w, UINT16 h, UINT32 flags)
+#define PADDING_CHECK(offset, alphaCheck) { from = to + (offset); if ((alphaCheck)) from = NULL; else goto foundFrom; }
+
+static void PadRGBABitmap(RGBA_t *tex, UINT16 w, UINT16 h)
 {
-	INT32 i, c1, c2, idxAdd;
-	UINT16 c1size, c2size;
-	RGBA_t *current, *prev, *next, *first;
-	boolean ignorePrev, wrap;
+	INT32 i;
+	boolean notLeft, notRight, notTop, notBottom;
+	RGBA_t *to = tex - 1, *from;
 
-	for (i = 0; i < 2; i++)
+	for (i = 0; i < w * h; i++)
 	{
-		c1size = i ? h : w;
-		c2size = i ? w : h;
-		idxAdd = i ? 1 : w;
-		wrap = i ? flags & TF_WRAPX : flags & TF_WRAPY;
+		to++;
+		if (to->rgba != 0)
+			continue;
+		from = NULL;
 
-		for (c1 = 0; c1 < c1size; c1++)
+		notLeft = i % w != 0;
+		notRight = i % w != w - 1;
+		notTop = i / w != 0;
+		notBottom = i / w != h - 1;
+
+		if (notRight) PADDING_CHECK(1, from->s.alpha == 0) // Check +X
+		if (notBottom) PADDING_CHECK(w, from->s.alpha == 0) // Check +Y
+		if (notLeft) PADDING_CHECK(-1, from->s.alpha == 0) // Check -X
+		if (notTop) PADDING_CHECK(-w, from->s.alpha == 0) // Check -Y
+		if (notRight && notBottom) PADDING_CHECK(1 + w, from->s.alpha == 0) // Check +X+Y
+		if (notLeft && notBottom) PADDING_CHECK(-1 + w, from->s.alpha == 0) // Check -X+Y
+		if (notLeft && notTop) PADDING_CHECK(-1 - w, from->s.alpha == 0) // Check -X-Y
+		if (notRight && notTop) PADDING_CHECK(1 - w, from->s.alpha == 0) // Check +X-Y
+
+foundFrom:
+		if (from != NULL)
 		{
-			if (i)
-			{
-				first = current = tex + (c1 * w);
-				prev = wrap ? tex + (w - 1 + c1 * w) : current;
-				next = tex + (1 + c1 * w);
-			}
-			else
-			{
-				first = current = tex + c1;
-				prev = wrap ? tex + (c1 + (h - 1) * w) : current;
-				next = tex + (c1 + w);
-			}
-
-			ignorePrev = false;
-
-			for (c2 = 0; c2 < c2size; c2++)
-			{
-				if (c2 == c2size - 1)
-					next = wrap ? first : current;
-
-				if (current->rgba)
-				{
-					ignorePrev = false;
-				}
-				else if (prev->rgba && !ignorePrev)
-				{
-					*current = *prev;
-					current->s.alpha = 0;
-					ignorePrev = true;
-				}
-				else if (next->rgba)
-				{
-					*current = *next;
-					current->s.alpha = 0;
-					ignorePrev = false;
-				}
-				else
-				{
-					ignorePrev = false;
-				}
-
-				prev = current;
-				current = next;
-				next += idxAdd;
-			}
+			*to = *from;
+			to->s.alpha = 0;
 		}
 	}
 }
 
-static void GenerateMipmaps(INT32 w, INT32 h, RGBA_t *tex, INT32 maxLOD, UINT32 flags)
+#undef PADDING_CHECK
+
+static void GenerateMipmaps(INT32 w, INT32 h, RGBA_t *tex, INT32 maxLOD)
 {
 	if (tex == NULL)
 	{
@@ -1950,7 +1916,7 @@ static void GenerateMipmaps(INT32 w, INT32 h, RGBA_t *tex, INT32 maxLOD, UINT32
 		h /= 2;
 
 		if (padTexture)
-			PadRGBABitmap(tex, w, h, flags);
+			PadRGBABitmap(tex, w, h);
 
 		pglTexSubImage2D(GL_TEXTURE_2D, m + 1, 0, 0, w, h, GL_RGBA, GL_UNSIGNED_BYTE, tex);
 	}
@@ -2025,7 +1991,7 @@ void GL_UpdateTexture(GLMipmap_t *pTexInfo)
 			}
 
 			if (applyPadding)
-				PadRGBABitmap(tex, w, h, pTexInfo->flags);
+				PadRGBABitmap(tex, w, h);
 
 			break;
 		case GL_TEXFMT_RGBA:
@@ -2041,7 +2007,7 @@ void GL_UpdateTexture(GLMipmap_t *pTexInfo)
 				ptex = tex;
 
 				if (applyPadding)
-					PadRGBABitmap(tex, w, h, pTexInfo->flags);
+					PadRGBABitmap(tex, w, h);
 			}
 
 			break;
@@ -2086,10 +2052,21 @@ void GL_UpdateTexture(GLMipmap_t *pTexInfo)
 	pglBindTexture(GL_TEXTURE_2D, num);
 	tex_downloaded = num;
 
-	pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, mag_filter);
-	pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, min_filter);
+	const int transparent = (pTexInfo->flags & TF_TRANSPARENT);
 
-	if (MipMap)
+	// disable texture filtering on any texture that has holes so there's no dumb borders or blending issues
+	if (transparent)
+	{
+		pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+		pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+	}
+	else
+	{
+		pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, mag_filter);
+		pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, min_filter);
+	}
+
+	if (MipMap && !transparent) // No mipmaps on transparent stuff
 	{
 		pglTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE);
 
@@ -2100,16 +2077,8 @@ void GL_UpdateTexture(GLMipmap_t *pTexInfo)
 
 		// Control the mipmap level of detail
 		pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_LOD, 0);
-
-		if (pTexInfo->flags & TF_TRANSPARENT)
-		{
-			pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LOD, 0); // No mipmaps on transparent stuff
-		}
-		else
-		{
-			pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LOD, 4);
-			GenerateMipmaps(w, h, tex, 4, pTexInfo->flags);
-		}
+		pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LOD, 5);
+		GenerateMipmaps(w, h, tex, 5);
 	}
 	else
 	{
@@ -2490,10 +2459,12 @@ void GL_DrawIndexedTriangles(FSurfaceInfo *pSurf, FOutVector *pOutVerts, FUINT i
 	// the DrawPolygon variant of this has some code about polyflags and wrapping here but havent noticed any problems from omitting it?
 }
 
-//#define NULL_VBO_VERTEX ((gl_skyvertex_t*)NULL)
-#define sky_vbo_x ((void*)offsetof(gl_skyvertex_t, x))
-#define sky_vbo_u ((void*)offsetof(gl_skyvertex_t, u))
-#define sky_vbo_r ((void*)offsetof(gl_skyvertex_t, r))
+static const boolean gl_ext_arb_vertex_buffer_object = true;
+
+#define NULL_VBO_VERTEX ((gl_skyvertex_t*)NULL)
+#define sky_vbo_x (gl_ext_arb_vertex_buffer_object ? &NULL_VBO_VERTEX->x : &sky->data[0].x)
+#define sky_vbo_u (gl_ext_arb_vertex_buffer_object ? &NULL_VBO_VERTEX->u : &sky->data[0].u)
+#define sky_vbo_r (gl_ext_arb_vertex_buffer_object ? &NULL_VBO_VERTEX->r : &sky->data[0].r)
 
 void GL_RenderSkyDome(gl_sky_t *sky)
 {
@@ -2505,23 +2476,30 @@ void GL_RenderSkyDome(gl_sky_t *sky)
 	if (sky->rebuild)
 	{
 		// delete VBO when already exists
-		if (sky->vbo)
-			pglDeleteBuffers(1, &sky->vbo);
+		if (gl_ext_arb_vertex_buffer_object)
+		{
+			if (sky->vbo)
+				pglDeleteBuffers(1, &sky->vbo);
+		}
 
-		// generate a new VBO and get the associated ID
-		pglGenBuffers(1, &sky->vbo);
+		if (gl_ext_arb_vertex_buffer_object)
+		{
+			// generate a new VBO and get the associated ID
+			pglGenBuffers(1, &sky->vbo);
 
-		// bind VBO in order to use
-		pglBindBuffer(GL_ARRAY_BUFFER, sky->vbo);
+			// bind VBO in order to use
+			pglBindBuffer(GL_ARRAY_BUFFER, sky->vbo);
 
-		// upload data to VBO
-		pglBufferData(GL_ARRAY_BUFFER, sky->vertex_count * sizeof(sky->data[0]), sky->data, GL_STATIC_DRAW);
+			// upload data to VBO
+			pglBufferData(GL_ARRAY_BUFFER, sky->vertex_count * sizeof(sky->data[0]), sky->data, GL_STATIC_DRAW);
+		}
 
 		sky->rebuild = false;
 	}
 
 	// bind VBO in order to use
-	pglBindBuffer(GL_ARRAY_BUFFER, sky->vbo);
+	if (gl_ext_arb_vertex_buffer_object)
+		pglBindBuffer(GL_ARRAY_BUFFER, sky->vbo);
 
 	// activate and specify pointers to arrays
 	pglVertexPointer(3, GL_FLOAT, sizeof(sky->data[0]), sky_vbo_x);
@@ -2565,7 +2543,8 @@ void GL_RenderSkyDome(gl_sky_t *sky)
 	pglColor4ubv(white);
 
 	// bind with 0, so, switch back to normal pointer operation
-	pglBindBuffer(GL_ARRAY_BUFFER, 0);
+	if (gl_ext_arb_vertex_buffer_object)
+		pglBindBuffer(GL_ARRAY_BUFFER, 0);
 
 	// deactivate color array
 	pglDisableClientState(GL_COLOR_ARRAY);
@@ -3713,6 +3692,7 @@ void GL_DrawScreenFinalTexture(int tex, INT32 width, INT32 height, boolean usesh
 	float xfix, yfix;
 	float origaspect, newaspect;
 	float xoff = 1, yoff = 1; // xoffset and yoffset for the polygon to have black bars around the screen
+	FRGBAFloat clearColour;
 
 	static float off[12];
 	static float fix[8];
@@ -3763,7 +3743,8 @@ void GL_DrawScreenFinalTexture(int tex, INT32 width, INT32 height, boolean usesh
 
 	pglViewport(0, 0, width, height);
 
-	FRGBAFloat clearColour = {0, 0, 0, 1};
+	clearColour.red = clearColour.green = clearColour.blue = 0;
+	clearColour.alpha = 1;
 	GL_ClearBuffer(true, false, false, &clearColour);
 	GL_SetBlend(PF_NoDepthTest);