diff --git a/data/update/TBoGT/common/data/frontend_menus.xml b/data/update/TBoGT/common/data/frontend_menus.xml index b1a4c41e..47a8b54b 100644 --- a/data/update/TBoGT/common/data/frontend_menus.xml +++ b/data/update/TBoGT/common/data/frontend_menus.xml @@ -1116,7 +1116,6 @@ <optionspc action="MENUOPT_ADJUST" label="FPS Limiter" value="PREF_FPS_LIMIT_PRESET" scaler="15" displayValue="MENU_DISPLAY_FRAMELIMIT" /> <optionspc action="MENUOPT_ADJUST" label="MO_FOV" value="PREF_EPISODIC_RACECLASS_RACE_3" scaler="10" displayValue="MENU_DISPLAY_SLIDERBAR" /> <optionspc action="MENUOPT_ADJUST" label="LamppostShadows" value="PREF_LAMPPOSTSHADOWS" scaler="2" displayValue="MENU_DISPLAY_ON_OFF" /> - <optionspc action="MENUOPT_ADJUST" label="HeadlightShadow" value="PREF_HEADLIGHTSHADOWS" scaler="2" displayValue="MENU_DISPLAY_ON_OFF" /> <options action="MENUOPT_NONE" label="" value="PREF_NULL" scaler="0" displayValue="MENU_DISPLAY_NONE" /> <optionspc action="MENUOPT_GRAPHICS_ANALYZER" label="MO_ANALYZER" value="PREF_NULL" scaler="1" @@ -1171,7 +1170,6 @@ <optionspc action="MENUOPT_ADJUST" label="FPS Limiter" value="PREF_FPS_LIMIT_PRESET" scaler="15" displayValue="MENU_DISPLAY_FRAMELIMIT" /> <optionspc action="MENUOPT_ADJUST" label="MO_FOV" value="PREF_EPISODIC_RACECLASS_RACE_3" scaler="10" displayValue="MENU_DISPLAY_SLIDERBAR" /> <optionspc action="MENUOPT_ADJUST" label="LamppostShadows" value="PREF_LAMPPOSTSHADOWS" scaler="2" displayValue="MENU_DISPLAY_ON_OFF" /> - <optionspc action="MENUOPT_ADJUST" label="HeadlightShadow" value="PREF_HEADLIGHTSHADOWS" scaler="2" displayValue="MENU_DISPLAY_ON_OFF" /> <options action="MENUOPT_NONE" label="" value="PREF_NULL" scaler="0" displayValue="MENU_DISPLAY_NONE" /> <optionspc action="MENUOPT_GRAPHICS_ANALYZER" label="MO_ANALYZER" value="PREF_NULL" scaler="1" diff --git a/data/update/TLAD/common/data/frontend_menus.xml b/data/update/TLAD/common/data/frontend_menus.xml index bf3c7b1e..6bd9d5d3 100644 --- a/data/update/TLAD/common/data/frontend_menus.xml +++ b/data/update/TLAD/common/data/frontend_menus.xml @@ -1189,7 +1189,6 @@ <optionspc action="MENUOPT_ADJUST" label="FPS Limiter" value="PREF_FPS_LIMIT_PRESET" scaler="15" displayValue="MENU_DISPLAY_FRAMELIMIT" /> <optionspc action="MENUOPT_ADJUST" label="MO_FOV" value="PREF_EPISODIC_RACECLASS_RACE_3" scaler="10" displayValue="MENU_DISPLAY_SLIDERBAR" /> <optionspc action="MENUOPT_ADJUST" label="LamppostShadows" value="PREF_LAMPPOSTSHADOWS" scaler="2" displayValue="MENU_DISPLAY_ON_OFF" /> - <optionspc action="MENUOPT_ADJUST" label="HeadlightShadow" value="PREF_HEADLIGHTSHADOWS" scaler="2" displayValue="MENU_DISPLAY_ON_OFF" /> <options action="MENUOPT_NONE" label="" value="PREF_NULL" scaler="0" displayValue="MENU_DISPLAY_NONE" /> <optionspc action="MENUOPT_GRAPHICS_ANALYZER" label="MO_ANALYZER" value="PREF_NULL" scaler="1" displayValue="MENU_DISPLAY_NONE" /> <optionspc action="MENUOPT_BENCHMARK" label="MO_BENCHMARK" value="PREF_NULL" scaler="1" displayValue="MENU_DISPLAY_NONE" /> @@ -1217,7 +1216,6 @@ <optionspc action="MENUOPT_ADJUST" label="FPS Limiter" value="PREF_FPS_LIMIT_PRESET" scaler="15" displayValue="MENU_DISPLAY_FRAMELIMIT" /> <optionspc action="MENUOPT_ADJUST" label="MO_FOV" value="PREF_EPISODIC_RACECLASS_RACE_3" scaler="10" displayValue="MENU_DISPLAY_SLIDERBAR" /> <optionspc action="MENUOPT_ADJUST" label="LamppostShadows" value="PREF_LAMPPOSTSHADOWS" scaler="2" displayValue="MENU_DISPLAY_ON_OFF" /> - <optionspc action="MENUOPT_ADJUST" label="HeadlightShadow" value="PREF_HEADLIGHTSHADOWS" scaler="2" displayValue="MENU_DISPLAY_ON_OFF" /> <options action="MENUOPT_NONE" label="" value="PREF_NULL" scaler="0" displayValue="MENU_DISPLAY_NONE" /> <optionspc action="MENUOPT_GRAPHICS_ANALYZER" label="MO_ANALYZER" value="PREF_NULL" scaler="1" displayValue="MENU_DISPLAY_NONE" /> <optionspc action="MENUOPT_BENCHMARK" label="MO_BENCHMARK" value="PREF_NULL" scaler="1" displayValue="MENU_DISPLAY_NONE" /> diff --git a/data/update/common/data/frontend_menus.xml b/data/update/common/data/frontend_menus.xml index f5dc9bb8..735a109e 100644 --- a/data/update/common/data/frontend_menus.xml +++ b/data/update/common/data/frontend_menus.xml @@ -786,7 +786,6 @@ <optionspc action="MENUOPT_ADJUST" label="FPS Limiter" value="PREF_FPS_LIMIT_PRESET" scaler="15" displayValue="MENU_DISPLAY_FRAMELIMIT" /> <optionspc action="MENUOPT_ADJUST" label="MO_FOV" value="PREF_EPISODIC_RACECLASS_RACE_3" scaler="10" displayValue="MENU_DISPLAY_SLIDERBAR" /> <optionspc action="MENUOPT_ADJUST" label="LamppostShadows" value="PREF_LAMPPOSTSHADOWS" scaler="2" displayValue="MENU_DISPLAY_ON_OFF" /> - <optionspc action="MENUOPT_ADJUST" label="HeadlightShadow" value="PREF_HEADLIGHTSHADOWS" scaler="2" displayValue="MENU_DISPLAY_ON_OFF" /> <options action="MENUOPT_NONE" label="" value="PREF_NULL" scaler="0" displayValue="MENU_DISPLAY_NONE" /> <optionspc action="MENUOPT_GRAPHICS_ANALYZER" label="MO_ANALYZER" value="PREF_NULL" scaler="1" displayValue="MENU_DISPLAY_NONE" /> <optionspc action="MENUOPT_BENCHMARK" label="MO_BENCHMARK" value="PREF_NULL" scaler="1" displayValue="MENU_DISPLAY_NONE" /> @@ -815,7 +814,6 @@ <optionspc action="MENUOPT_ADJUST" label="FPS Limiter" value="PREF_FPS_LIMIT_PRESET" scaler="15" displayValue="MENU_DISPLAY_FRAMELIMIT" /> <optionspc action="MENUOPT_ADJUST" label="MO_FOV" value="PREF_EPISODIC_RACECLASS_RACE_3" scaler="10" displayValue="MENU_DISPLAY_SLIDERBAR" /> <optionspc action="MENUOPT_ADJUST" label="LamppostShadows" value="PREF_LAMPPOSTSHADOWS" scaler="2" displayValue="MENU_DISPLAY_ON_OFF" /> - <optionspc action="MENUOPT_ADJUST" label="HeadlightShadow" value="PREF_HEADLIGHTSHADOWS" scaler="2" displayValue="MENU_DISPLAY_ON_OFF" /> <options action="MENUOPT_NONE" label="" value="PREF_NULL" scaler="0" displayValue="MENU_DISPLAY_NONE" /> <optionspc action="MENUOPT_GRAPHICS_ANALYZER" label="MO_ANALYZER" value="PREF_NULL" scaler="1" displayValue="MENU_DISPLAY_NONE" /> <optionspc action="MENUOPT_BENCHMARK" label="MO_BENCHMARK" value="PREF_NULL" scaler="1" displayValue="MENU_DISPLAY_NONE" /> diff --git a/source/consoleshadows.ixx b/source/consoleshadows.ixx index 926f9208..af1a0133 100644 --- a/source/consoleshadows.ixx +++ b/source/consoleshadows.ixx @@ -7,6 +7,7 @@ export module consoleshadows; import common; import settings; import comvars; +import natives; void* fnAE3DE0 = nullptr; void* fnAE3310 = nullptr; @@ -94,11 +95,17 @@ public: CShadows::hbStoreStaticShadow.fun = injector::MakeCALL(pattern.count(2).get(1).get<void*>(9), CShadows::StoreStaticShadowNPC).get(); } - FusionFixSettings.SetCallback("PREF_HEADLIGHTSHADOWS", [](int32_t value) + //FusionFixSettings.SetCallback("PREF_HEADLIGHTSHADOWS", [](int32_t value) + //{ + // bHeadlightShadows = value; + //}); + bHeadlightShadows = FusionFixSettings("PREF_HEADLIGHTSHADOWS"); + + NativeOverride::RegisterPhoneCheat("1111111111", [] { - bHeadlightShadows = value; + bHeadlightShadows = !bHeadlightShadows; + FusionFixSettings.Set("PREF_HEADLIGHTSHADOWS", bHeadlightShadows); }); - bHeadlightShadows = FusionFixSettings("PREF_HEADLIGHTSHADOWS"); pattern = hook::pattern("E8 ? ? ? ? 85 C0 74 29 6A 00"); if (!pattern.empty()) diff --git a/source/shadows.ixx b/source/shadows.ixx index f979a627..d5b06b90 100644 --- a/source/shadows.ixx +++ b/source/shadows.ixx @@ -107,7 +107,7 @@ class Shadows static int __cdecl sub_925DB0(int a1, int a2, int flags) { static auto LamppostShadows = FusionFixSettings.GetRef("PREF_LAMPPOSTSHADOWS"); - if (!LamppostShadows->get() && !bHeadlightShadows) + if (!LamppostShadows->get()) { if (!Natives::IsInteriorScene()) return -1;