diff --git a/source/build/src/texcache.cpp b/source/build/src/texcache.cpp index 1a9045922..3b5ba76e4 100644 --- a/source/build/src/texcache.cpp +++ b/source/build/src/texcache.cpp @@ -164,7 +164,7 @@ pthtyp *texcache_fetch(int32_t dapicnum, int32_t dapalnum, int32_t dashade, int3 pthtyp *pth = (pthtyp *)Xcalloc(1, sizeof(pthtyp)); // possibly fetch an already loaded multitexture :_) - if (!drawingskybox && texcache_fetchmulti(pth, si, dapicnum, dameth)) + if (dapalnum == DETAILPAL && texcache_fetchmulti(pth, si, dapicnum, dameth)) return pth; int32_t tilestat = diff --git a/source/duke3d/src/m32common.cpp b/source/duke3d/src/m32common.cpp index b676ab1b2..1f46eb72f 100644 --- a/source/duke3d/src/m32common.cpp +++ b/source/duke3d/src/m32common.cpp @@ -1,3 +1,4 @@ +// This object is shared by the editors of *all* Build games! #include "compat.h" #include "keys.h" @@ -15,6 +16,7 @@ #include "lz4.h" #include "xxhash.h" +// XXX: This breaks editors for games other than Duke. The OSD needs a way to specify colors in abstract instead of concatenating palswap escape sequences. #include "common_game.h" //////////////////// Key stuff //////////////////// diff --git a/source/duke3d/src/m32def.cpp b/source/duke3d/src/m32def.cpp index db856b10a..7dcd278b8 100644 --- a/source/duke3d/src/m32def.cpp +++ b/source/duke3d/src/m32def.cpp @@ -20,6 +20,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ //------------------------------------------------------------------------- +// This object is shared by the editors of *all* Build games! + #include "m32script.h" #include "m32def.h" #include "cache1d.h" diff --git a/source/duke3d/src/m32exec.cpp b/source/duke3d/src/m32exec.cpp index cae910b9b..84ad1622f 100644 --- a/source/duke3d/src/m32exec.cpp +++ b/source/duke3d/src/m32exec.cpp @@ -20,6 +20,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ //------------------------------------------------------------------------- +// This object is shared by the editors of *all* Build games! + #include "compat.h" #include "m32script.h" diff --git a/source/duke3d/src/m32vars.cpp b/source/duke3d/src/m32vars.cpp index 70ffa62c2..0773eb743 100644 --- a/source/duke3d/src/m32vars.cpp +++ b/source/duke3d/src/m32vars.cpp @@ -20,6 +20,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ //------------------------------------------------------------------------- +// This object is shared by the editors of *all* Build games! + #include "m32script.h" #include "m32def.h" #include "osd.h" diff --git a/source/duke3d/src/midi.cpp b/source/duke3d/src/midi.cpp index 039f174e3..bc843191e 100644 --- a/source/duke3d/src/midi.cpp +++ b/source/duke3d/src/midi.cpp @@ -31,6 +31,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. (c) Copyright 1994 James R. Dose. All Rights Reserved. **********************************************************************/ +// This object is shared by all Build games with MIDI playback! + #include "compat.h" #include "music.h" #include "_midi.h" diff --git a/source/duke3d/src/mpu401.cpp b/source/duke3d/src/mpu401.cpp index a94a5b64d..8ffd2f620 100644 --- a/source/duke3d/src/mpu401.cpp +++ b/source/duke3d/src/mpu401.cpp @@ -32,6 +32,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. (c) Copyright 1994 James R. Dose. All Rights Reserved. **********************************************************************/ +// This object is shared by all Build games with MIDI playback! + #include "mpu401.h" #include "compat.h" #include "pragmas.h" diff --git a/source/duke3d/src/music.cpp b/source/duke3d/src/music.cpp index 2692560e9..1cd83d200 100644 --- a/source/duke3d/src/music.cpp +++ b/source/duke3d/src/music.cpp @@ -20,6 +20,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ //------------------------------------------------------------------------- +// This object is shared by all Build games with MIDI playback! + #include "compat.h" #include "music.h" #include "midi.h" diff --git a/source/duke3d/src/sdlmusic.cpp b/source/duke3d/src/sdlmusic.cpp index 00c5f163a..5077b723b 100644 --- a/source/duke3d/src/sdlmusic.cpp +++ b/source/duke3d/src/sdlmusic.cpp @@ -26,6 +26,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * short. How strangely appropriate that seems. */ +// This object is shared by all Build games with MIDI playback! + #define _NEED_SDLMIXER 1 #include "compat.h"