summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-07-17 12:53:11 +0200
committerSergeanur <s.anureev@yandex.ua>2020-07-17 12:53:11 +0200
commitde8759eabde158d345dea3aed80a1a50ab319fcb (patch)
treee448200e4ac1045c8951296c8f90ce9974c72cd5 /src/core
parentMerge branch 'master' into miami (diff)
parentAdd audio cache for faster initialization (diff)
downloadre3-de8759eabde158d345dea3aed80a1a50ab319fcb.tar
re3-de8759eabde158d345dea3aed80a1a50ab319fcb.tar.gz
re3-de8759eabde158d345dea3aed80a1a50ab319fcb.tar.bz2
re3-de8759eabde158d345dea3aed80a1a50ab319fcb.tar.lz
re3-de8759eabde158d345dea3aed80a1a50ab319fcb.tar.xz
re3-de8759eabde158d345dea3aed80a1a50ab319fcb.tar.zst
re3-de8759eabde158d345dea3aed80a1a50ab319fcb.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/FileLoader.cpp2
-rw-r--r--src/core/config.h3
2 files changed, 5 insertions, 0 deletions
diff --git a/src/core/FileLoader.cpp b/src/core/FileLoader.cpp
index a7ab365c..a29d26fa 100644
--- a/src/core/FileLoader.cpp
+++ b/src/core/FileLoader.cpp
@@ -106,7 +106,9 @@ CFileLoader::LoadLevel(const char *filename)
LoadingScreenLoadingFile(line + 4);
LoadScene(line + 4);
}else if(strncmp(line, "SPLASH", 6) == 0){
+#ifndef DISABLE_LOADING_SCREEN
LoadSplash(GetRandomSplashScreen());
+#endif
}else if(strncmp(line, "CDIMAGE", 7) == 0){
CdStreamAddImage(line + 8);
}
diff --git a/src/core/config.h b/src/core/config.h
index 95550dd6..c63ce4c8 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -289,3 +289,6 @@ enum Config {
// Camera
#define IMPROVED_CAMERA // Better Debug cam, and maybe more in the future
#define FREE_CAM // Rotating cam
+
+// Audio
+#define AUDIO_CACHE // cache sound lengths to speed up the cold boot