Merge branch 'master' of https://github.com/ZDoom/gzdoom

2024-03-10 03:34:37 +08:00 · 2024-03-10 03:34:37 +08:00 · 74a27be3fd
commit 74a27be3fd
parent 192cdcd9cb 0ef042562e
114 changed files with 3366 additions and 1677 deletions
--- a/src/common/engine/namedef.h
+++ b/src/common/engine/namedef.h
@ -80,7 +80,6 @@ xx(__decorate_internal_float__)
 // Per-actor sound channels (for deprecated PlaySoundEx function) Do not separate this block!!!
 xx(Auto)
 xx(Weapon)
-xx(BobPivot3D)
 xx(Voice)
 xx(Item)
 xx(Body)
--- a/src/common/engine/palettecontainer.cpp
+++ b/src/common/engine/palettecontainer.cpp
@ -32,6 +32,7 @@
 **
 */

+#include <cmath>
 #include "palutil.h"
 #include "sc_man.h"
 #include "m_crc32.h"