mirror/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project synced 2026-08-21 23:00:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix stad-samos regression from refactor (#2796) + change imgui toggle to left-alt and make it customizable (#2848)

Browse Source
This commit is contained in:
ManDude
2023-07-29 02:26:42 +01:00
committed by GitHub
parent 6599eb1c91
commit a9e0e36e64
5 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game/settings/settings.cpp
+11 -9
View File
@@ -8,15 +8,16 @@
namespace game_settings {
void to_json(json& j, const DebugSettings& obj) {
j = json{{"version", obj.version},
{"show_imgui", obj.show_imgui},
{"imgui_font_size", obj.imgui_font_size},
{"monospaced_font", obj.monospaced_font},
{"alternate_style", obj.alternate_style},
{"ignore_hide_imgui", obj.ignore_hide_imgui},
{"text_filters", obj.text_filters},
{"text_check_range", obj.text_check_range},
{"text_max_range", obj.text_max_range}};
json_serialize(version);
json_serialize(show_imgui);
json_serialize(imgui_font_size);
json_serialize(monospaced_font);
json_serialize(alternate_style);
json_serialize(ignore_hide_imgui);
json_serialize(text_filters);
json_serialize(text_check_range);
json_serialize(text_max_range);
json_serialize(hide_imgui_key);
}
void from_json(const json& j, DebugSettings& obj) {
@@ -29,6 +30,7 @@ void from_json(const json& j, DebugSettings& obj) {
json_deserialize_if_exists(text_filters);
json_deserialize_if_exists(text_check_range);
json_deserialize_if_exists(text_max_range);
json_deserialize_if_exists(hide_imgui_key);
}
DebugSettings::DebugSettings() {