From 306c8e0c30633cb3797e600b039a3fefc74ca48c Mon Sep 17 00:00:00 2001 From: past-due <30942300+past-due@users.noreply.github.com> Date: Wed, 14 Feb 2024 15:16:20 -0500 Subject: [PATCH] warzoneconfig.cpp: Default Emscripten FMVmode to 2x --- src/configuration.cpp | 2 +- src/warzoneconfig.cpp | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/configuration.cpp b/src/configuration.cpp index 8955a289004..cbd7e3d9dc0 100644 --- a/src/configuration.cpp +++ b/src/configuration.cpp @@ -425,7 +425,7 @@ bool loadConfig() NETsetDefaultMPHostFreeChatPreference(iniGetBool("hostingChatDefault", NETgetDefaultMPHostFreeChatPreference()).value()); setPublicIPv4LookupService(iniGetString("publicIPv4LookupService_Url", WZ_DEFAULT_PUBLIC_IPv4_LOOKUP_SERVICE_URL).value(), iniGetString("publicIPv4LookupService_JSONKey", WZ_DEFAULT_PUBLIC_IPv4_LOOKUP_SERVICE_JSONKEY).value()); setPublicIPv6LookupService(iniGetString("publicIPv6LookupService_Url", WZ_DEFAULT_PUBLIC_IPv6_LOOKUP_SERVICE_URL).value(), iniGetString("publicIPv6LookupService_JSONKey", WZ_DEFAULT_PUBLIC_IPv6_LOOKUP_SERVICE_JSONKEY).value()); - war_SetFMVmode((FMV_MODE)iniGetInteger("FMVmode", FMV_FULLSCREEN).value()); + war_SetFMVmode((FMV_MODE)iniGetInteger("FMVmode", war_GetFMVmode()).value()); war_setScanlineMode((SCANLINE_MODE)iniGetInteger("scanlines", SCANLINES_OFF).value()); seq_SetSubtitles(iniGetBool("subtitles", true).value()); setDifficultyLevel((DIFFICULTY_LEVEL)iniGetInteger("difficulty", DL_NORMAL).value()); diff --git a/src/warzoneconfig.cpp b/src/warzoneconfig.cpp index b1fe8074c1a..779cae71373 100644 --- a/src/warzoneconfig.cpp +++ b/src/warzoneconfig.cpp @@ -40,9 +40,15 @@ constexpr int MAX_OLD_LOGS = 50; /***************************************************************************/ +#if !defined(__EMSCRIPTEN__) +#define WZ_DEFAULT_FMV_MODE FMV_FULLSCREEN +#else +#define WZ_DEFAULT_FMV_MODE FMV_2X +#endif + struct WARZONE_GLOBALS { - FMV_MODE FMVmode = FMV_FULLSCREEN; + FMV_MODE FMVmode = WZ_DEFAULT_FMV_MODE; UDWORD width = 1024; UDWORD height = 768; UDWORD videoBufferDepth = 32;