Merge remote-tracking branch 'origin/master' into texture_rework

2024-11-28 23:11:58 +00:00 · 2020-05-23 08:53:11 -04:00 · 2020-05-23 08:53:11 -04:00 · 00acbac04e
commit 00acbac04e
parent 58b3cb0971 3dfb417f07
3 changed files with 573 additions and 370 deletions
--- a/src/common/audio/music/music.cpp
+++ b/src/common/audio/music/music.cpp
@ -37,7 +37,7 @@

 #include <stdio.h>
 #include <stdlib.h>
-
+#include <stdexcept>

 #include "i_sound.h"
 #include "i_music.h"
--- a/src/common/utility/files_decompress.cpp
+++ b/src/common/utility/files_decompress.cpp
@ -39,6 +39,7 @@
 #include <zlib.h>
 #include <bzlib.h>
 #include <algorithm>
+#include <stdexcept>

 #include "files.h"
 #include "templates.h"
--- a/wadsrc_lights/static/filter/strife/gldefs.txt
+++ b/wadsrc_lights/static/filter/strife/gldefs.txt