From 130649b01796bbedab2838ba287d06c24fb7f5a2 Mon Sep 17 00:00:00 2001 From: terminx Date: Sat, 6 Jul 2019 16:30:30 +0000 Subject: [PATCH] Move cacheAllSounds() out of G_CacheMapData() and into G_Startup() git-svn-id: https://svn.eduke32.com/eduke32@7758 1a8010ca-5511-0410-912e-c29ae57300e0 --- source/duke3d/src/game.cpp | 2 ++ source/duke3d/src/premap.cpp | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/source/duke3d/src/game.cpp b/source/duke3d/src/game.cpp index 0e0379bd9..cfd2e1223 100644 --- a/source/duke3d/src/game.cpp +++ b/source/duke3d/src/game.cpp @@ -6013,6 +6013,8 @@ static void G_Startup(void) else if (artLoadFiles("tiles%03d.art",MAXCACHE1DSIZE) < 0) G_GameExit("Failed loading art."); + cacheAllSounds(); + // Make the fullscreen nuke logo background non-fullbright. Has to be // after dynamic tile remapping (from C_Compile) and loading tiles. picanm[LOADSCREEN].sf |= PICANM_NOFULLBRIGHT_BIT; diff --git a/source/duke3d/src/premap.cpp b/source/duke3d/src/premap.cpp index 0e5a45a08..d6f2559eb 100644 --- a/source/duke3d/src/premap.cpp +++ b/source/duke3d/src/premap.cpp @@ -469,7 +469,6 @@ void G_CacheMapData(void) uint32_t const cacheStartTime = timerGetTicks(); - cacheAllSounds(); cacheFlaggedTiles(); for (int i=0; i