diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2020-07-09 19:40:15 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2020-07-09 19:40:15 +0200 |
| commit | c012e5a7ffa4a1d2d4a0d67a7aeacf973d9f8db4 (patch) | |
| tree | bf77470297a3832563e01d021d3776dd6d58ba07 | |
| parent | Remove island loading (diff) | |
| download | re3-c012e5a7ffa4a1d2d4a0d67a7aeacf973d9f8db4.tar re3-c012e5a7ffa4a1d2d4a0d67a7aeacf973d9f8db4.tar.gz re3-c012e5a7ffa4a1d2d4a0d67a7aeacf973d9f8db4.tar.bz2 re3-c012e5a7ffa4a1d2d4a0d67a7aeacf973d9f8db4.tar.lz re3-c012e5a7ffa4a1d2d4a0d67a7aeacf973d9f8db4.tar.xz re3-c012e5a7ffa4a1d2d4a0d67a7aeacf973d9f8db4.tar.zst re3-c012e5a7ffa4a1d2d4a0d67a7aeacf973d9f8db4.zip | |
| -rw-r--r-- | src/core/config.h | 3 | ||||
| -rw-r--r-- | src/core/main.cpp | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/core/config.h b/src/core/config.h index 5010ed3d..b43fc90b 100644 --- a/src/core/config.h +++ b/src/core/config.h @@ -198,7 +198,8 @@ enum Config { #define DEFAULT_NATIVE_RESOLUTION // Set default video mode to your native resolution (fixes Windows 10 launch) #define USE_TXD_CDIMAGE // generate and load textures from txd.img #define IMPROVED_VIDEOMODE // save and load videomode parameters instead of a magic number -#define NO_ISLAND_LOADING // disable loadscreen between islands via loading all island data at once, consumes more memory and CPU +#define DISABLE_LOADING_SCREEN // disable the loading screen which vastly improves the loading time +#define NO_ISLAND_LOADING // disable loadscreen between islands via loading all island data at once, consumes more memory and CPU //#define USE_TEXTURE_POOL // Particle diff --git a/src/core/main.cpp b/src/core/main.cpp index 1e26381a..2608612a 100644 --- a/src/core/main.cpp +++ b/src/core/main.cpp @@ -471,6 +471,7 @@ ResetLoadingScreenBar() void LoadingScreen(const char *str1, const char *str2, const char *splashscreen) { +#ifndef DISABLE_LOADING_SCREEN CSprite2d *splash; #ifndef RANDOMSPLASH @@ -534,6 +535,7 @@ LoadingScreen(const char *str1, const char *str2, const char *splashscreen) CFont::DrawFonts(); DoRWStuffEndOfFrame(); } +#endif } void |